Initial submission for validation service

Change-Id: I9372430f1ae347373d5a9a0c7a427d7bd393d61e
Issue-ID: LOG-427
Signed-off-by: Prudence Au (prudence.au@amdocs.com)
Signed-off-by: Geora Barsky <georab@amdocs.com>
Signed-off-by: Pierre Rioux <pierre.rioux@amdocs.com>

49 files changed, 6849 insertions, 0 deletions

diff --git a/src/test/resources/model-validation/instance-reader/connector-attributes.json b/src/test/resources/model-validation/instance-reader/connector-attributes.json
new file mode 100644
index 0000000..3a4536f
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/connector-attributes.json
@@ -0,0 +1,399 @@
+{
+    "inventory-response-item": [
+        {
+            "model-name": "WAN Connector v0.1",
+            "connector": {
+                "resource-instance-id": "100559",
+                "resource-version": "1465571381",
+                "persona-model-id": "dc700a83-c507-47d9-b775-1fdfcdd5f9eb",
+                "persona-model-version": "0.1"
+            },
+            "extra-properties": {
+                "metadatum": [
+                    {
+                        "metaname": "vpn-id",
+                        "metaval": "vpn-id value 1",
+                        "resource-version": "1466418452"
+                    },
+                    {
+                        "metaname": "unexpected",
+                        "metaval": "unexpected value 1",
+                        "resource-version": "1466418452"
+                    }
+                ]
+            },
+            "inventory-response-items": {
+                "inventory-response-item": [
+                    {
+                        "virtual-data-center": {
+                            "vdc-id": "15001220",
+                            "vdc-name": "SAN_DIEGO_CA01",
+                            "resource-version": "1465571382"
+                        },
+                        "extra-properties": {},
+                        "inventory-response-items": {
+                            "inventory-response-item": [
+                                {
+                                    "model-name": "vLAN on a Physical Wire",
+                                    "logical-link": {
+                                        "link-name": "sn6ca391ve2-xe-10/2/3.117|sn4ca01pbg",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571381",
+                                        "persona-model-id": "32bee148-2cae-4f3d-a42e-22c9e4f078a2",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                            	"model-name": "pBgf",
+                                                "pserver": {
+                                                    "hostname": "sn4ca01pbg",
+                                                    "in-maint": false,
+                                                    "resource-version": "1470978156"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "VL ELAN",
+                                    "logical-link": {
+                                        "link-name": "sn6ca391ve2-ae6.1322|dbzx0003v",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571381",
+                                        "persona-model-id": "932518e5-4260-4cc4-8038-df604a367f85",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "vDbe",
+                                                "generic-vnf": {
+                                                    "vnf-id": "VAPP-2883",
+                                                    "vnf-name": "dbzx0004v",
+                                                    "vnf-type": "vSRX vDBE-V VNF",
+                                                    "service-id": "12a96a9d-4b4c-4349-a950-fe1159602621",
+                                                    "prov-status": "ACTIVE",
+                                                    "in-maint": false,
+                                                    "is-closed-loop-disabled": false,
+                                                    "resource-version": "1470978155"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "VL ELAN",
+                                    "logical-link": {
+                                        "link-name": "sn6ca392ve2-ae6.1322|dbzx0003v",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571382",
+                                        "persona-model-id": "932518e5-4260-4cc4-8038-df604a367f85",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "vDbe",
+                                                "generic-vnf": {
+                                                    "vnf-id": "VAPP-2883",
+                                                    "vnf-name": "dbzx0004v",
+                                                    "vnf-type": "vSRX vDBE-V VNF",
+                                                    "service-id": "12a96a9d-4b4c-4349-a950-fe1159602621",
+                                                    "prov-status": "ACTIVE",
+                                                    "in-maint": false,
+                                                    "is-closed-loop-disabled": false,
+                                                    "resource-version": "1470978155"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "VL ELAN",
+                                    "logical-link": {
+                                        "link-name": "sn6ca392ve2-ae6.1927|asbg0003v",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571382",
+                                        "persona-model-id": "932518e5-4260-4cc4-8038-df604a367f85",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "vDbe",
+                                                "generic-vnf": {
+                                                    "vnf-id": "VAPP-9320",
+                                                    "vnf-name": "asbg0003v",
+                                                    "vnf-type": "ASBGv No TLS",
+                                                    "service-id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
+                                                    "prov-status": "PROV",
+                                                    "ipv4-oam-address": "135.193.152.168",
+                                                    "in-maint": false,
+                                                    "is-closed-loop-disabled": false,
+                                                    "resource-version": "1470978156"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "vLAN on a Physical Wire",
+                                    "logical-link": {
+                                        "link-name": "sn6ca392ve2-xe-10/2/3.117|sn4ca01pbg",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571382",
+                                        "persona-model-id": "32bee148-2cae-4f3d-a42e-22c9e4f078a2",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "pBgf",
+                                                "pserver": {
+                                                    "hostname": "sn4ca01pbg",
+                                                    "in-maint": false,
+                                                    "resource-version": "1470978156"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "VL ELAN",
+                                    "logical-link": {
+                                        "link-name": "sn6ca391ve2-ae6.1927|asbg0003v",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571381",
+                                        "persona-model-id": "932518e5-4260-4cc4-8038-df604a367f85",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "vDbe",
+                                                "generic-vnf": {
+                                                    "vnf-id": "VAPP-9320",
+                                                    "vnf-name": "asbg0003v",
+                                                    "vnf-type": "ASBGv No TLS",
+                                                    "service-id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
+                                                    "prov-status": "PROV",
+                                                    "ipv4-oam-address": "135.193.152.168",
+                                                    "in-maint": false,
+                                                    "is-closed-loop-disabled": false,
+                                                    "resource-version": "1470978156"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    {
+                        "virtual-data-center": {
+                            "vdc-id": "15001219",
+                            "vdc-name": "ALPHARETTA_GA01",
+                            "resource-version": "1465571380"
+                        },
+                        "extra-properties": {},
+                        "inventory-response-items": {
+                            "inventory-response-item": [
+                                {
+                                    "model-name": "VL ELAN",
+                                    "logical-link": {
+                                        "link-name": "alrga392ve2-ae6.1322|dbzx0004v",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571380",
+                                        "persona-model-id": "932518e5-4260-4cc4-8038-df604a367f85",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "vDbe",
+                                                "generic-vnf": {
+                                                    "vnf-id": "VAPP-1883",
+                                                    "vnf-name": "dbzx0003v",
+                                                    "vnf-type": "vSRX vDBE-V VNF",
+                                                    "service-id": "12a96a9d-4b4c-4349-a950-fe1159602621",
+                                                    "prov-status": "ACTIVE",
+                                                    "in-maint": false,
+                                                    "is-closed-loop-disabled": false,
+                                                    "resource-version": "1470978153"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "VL ELAN",
+                                    "logical-link": {
+                                        "link-name": "alrga391ve2-ae6.1322|dbzx0004v",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571379",
+                                        "persona-model-id": "932518e5-4260-4cc4-8038-df604a367f85",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "vDbe",
+                                                "generic-vnf": {
+                                                    "vnf-id": "VAPP-1883",
+                                                    "vnf-name": "dbzx0003v",
+                                                    "vnf-type": "vSRX vDBE-V VNF",
+                                                    "service-id": "12a96a9d-4b4c-4349-a950-fe1159602621",
+                                                    "prov-status": "ACTIVE",
+                                                    "in-maint": false,
+                                                    "is-closed-loop-disabled": false,
+                                                    "resource-version": "1470978153"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "VL ELAN",
+                                    "logical-link": {
+                                        "link-name": "alrga392ve2-ae6.1927|asbg0004v",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571380",
+                                        "persona-model-id": "932518e5-4260-4cc4-8038-df604a367f85",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "vDbe",
+                                                "generic-vnf": {
+                                                    "vnf-id": "VAPP-5305",
+                                                    "vnf-name": "asbg0004v",
+                                                    "vnf-type": "ASBGv No TLS",
+                                                    "service-id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
+                                                    "prov-status": "PROV",
+                                                    "ipv4-oam-address": "135.190.182.168",
+                                                    "in-maint": false,
+                                                    "is-closed-loop-disabled": false,
+                                                    "resource-version": "1470978152"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "vLAN on a Physical Wire",
+                                    "logical-link": {
+                                        "link-name": "alrga391ve2-xe-10/2/3.117|ar4ga01pbg",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571379",
+                                        "persona-model-id": "32bee148-2cae-4f3d-a42e-22c9e4f078a2",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "pBgf",
+                                                "pserver": {
+                                                    "hostname": "ar4ga01pbg",
+                                                    "in-maint": false,
+                                                    "resource-version": "1470978153"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "VL ELAN",
+                                    "logical-link": {
+                                        "link-name": "alrga391ve2-ae6.1927|asbg0004v",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571380",
+                                        "persona-model-id": "932518e5-4260-4cc4-8038-df604a367f85",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "vDbe",
+                                                "generic-vnf": {
+                                                    "vnf-id": "VAPP-5305",
+                                                    "vnf-name": "asbg0004v",
+                                                    "vnf-type": "ASBGv No TLS",
+                                                    "service-id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
+                                                    "prov-status": "PROV",
+                                                    "ipv4-oam-address": "135.190.182.168",
+                                                    "in-maint": false,
+                                                    "is-closed-loop-disabled": false,
+                                                    "resource-version": "1470978152"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "model-name": "vLAN on a Physical Wire",
+                                    "logical-link": {
+                                        "link-name": "alrga392ve2-xe-10/2/3.117|ar4ga01pbg",
+                                        "link-type": "l2bridge",
+                                        "resource-version": "1465571380",
+                                        "persona-model-id": "32bee148-2cae-4f3d-a42e-22c9e4f078a2",
+                                        "persona-model-version": "1"
+                                    },
+                                    "extra-properties": {},
+                                    "inventory-response-items": {
+                                        "inventory-response-item": [
+                                            {
+                                                "model-name": "pBgf",
+                                                "pserver": {
+                                                    "hostname": "ar4ga01pbg",
+                                                    "in-maint": false,
+                                                    "resource-version": "1470978153"
+                                                },
+                                                "extra-properties": {},
+                                                "inventory-response-items": {}
+                                            }
+                                        ]
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/connector-model-name.json b/src/test/resources/model-validation/instance-reader/connector-model-name.json
new file mode 100644
index 0000000..60e6401
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/connector-model-name.json
@@ -0,0 +1,84 @@
+{
+	"model-name": "Test Connector Model Name",
+	"connector": {
+		"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+		"resource-version": "1467975776",
+		"persona-model-id": "connector-widget-id",
+		"persona-model-version": "v1.0",
+		"widget-model-id": "example-widget-model-id-val-69486",
+		"widget-model-version": "v1.0"
+	},
+	"extra-properties": {
+		
+	},
+	"inventory-response-items": {
+		"inventory-response-item": [
+			{
+				"model-name": "Test VC Model Name",
+				"virtual-data-center": {
+					"vdc-id": "vdc-01",
+					"vdc-name": "example-vdc-name-val-10107",
+					"resource-version": "1467975781"
+				},
+				"extra-properties": {
+					
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"model-name": "Test LL Model Name",
+							"logical-link": {
+								"link-name": "example-link-name-val-23759",
+								"link-type": "example-link-type-val-23759",
+								"speed-value": "example-speed-value-val-23759",
+								"speed-units": "example-speed-units-val-23759",
+								"ip-version": "example-ip-version-val-23759",
+								"routing-protocol": "example-routing-protocol-val-23759",
+								"resource-version": "1467975786",
+								"persona-model-id": "example-persona-model-id-val-23759",
+								"persona-model-version": "example-persona-model-version-val-23759",
+								"widget-model-id": "example-widget-model-id-val-23759",
+								"widget-model-version": "example-widget-model-version-val-23759"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								"inventory-response-item": [
+									{
+										"pserver": {
+											"hostname": "example-hostname-val-79914",
+											"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+											"number-of-cpus": 79914,
+											"disk-in-gigabytes": 79914,
+											"ram-in-megabytes": 79914,
+											"equip-type": "example-equip-type-val-79914",
+											"equip-vendor": "example-equip-vendor-val-79914",
+											"equip-model": "example-equip-model-val-79914",
+											"fqdn": "example-fqdn-val-79914",
+											"pserver-selflink": "example-pserver-selflink-val-79914",
+											"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+											"serial-number": "example-serial-number-val-79914",
+											"pserver-id": "example-pserver-id-val-79914",
+											"internet-topology": "example-internet-topology-val-79914",
+											"in-maint": true,
+											"resource-version": "1467994603",
+											"pserver-name2": "example-pserver-name2-val-79914",
+											"purpose": "example-purpose-val-79914"
+										},
+										"extra-properties": {
+											
+										},
+										"inventory-response-items": {
+											
+										}
+									}
+								]
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
diff --git a/src/test/resources/model-validation/instance-reader/connector-sibling-inventory-items.json b/src/test/resources/model-validation/instance-reader/connector-sibling-inventory-items.json
new file mode 100644
index 0000000..b032966
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/connector-sibling-inventory-items.json
@@ -0,0 +1,118 @@
+{
+	"connector": {
+		"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+		"resource-version": "1467975776",
+		"persona-model-id": "connector-widget-id",
+		"persona-model-version": "v1.0",
+		"widget-model-id": "example-widget-model-id-val-69486",
+		"widget-model-version": "v1.0"
+	},
+	"extra-properties": {
+		
+	},
+	"inventory-response-items": {
+		"inventory-response-item": [
+			{
+				"virtual-data-center": {
+					"vdc-id": "vdc-01",
+					"vdc-name": "example-vdc-name-val-10107",
+					"resource-version": "1467975781"
+				},
+				"extra-properties": {
+					
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"model-name": "Test LL Model Name",
+							"logical-link": {
+								"link-name": "example-link-name-val-23759",
+								"link-type": "example-link-type-val-23759",
+								"speed-value": "example-speed-value-val-23759",
+								"speed-units": "example-speed-units-val-23759",
+								"ip-version": "example-ip-version-val-23759",
+								"routing-protocol": "example-routing-protocol-val-23759",
+								"resource-version": "1467975786",
+								"persona-model-id": "example-persona-model-id-val-23759",
+								"persona-model-version": "example-persona-model-version-val-23759",
+								"widget-model-id": "example-widget-model-id-val-23759",
+								"widget-model-version": "example-widget-model-version-val-23759"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								"inventory-response-item": [
+									{
+										"generic-vnf": {
+											"vnf-id": "generic-vnf-01",
+											"vnf-name": "example-vnf-name-val-3501",
+											"vnf-name2": "example-vnf-name2-val-3501",
+											"vnf-type": "example-vnf-type-val-3501",
+											"regional-resource-zone": "example-regional-resource-zone-val-3501",
+											"prov-status": "example-prov-status-val-3501",
+											"operational-state": "example-operational-state-val-3501",
+											"license-key": "example-license-key-val-3501",
+											"equipment-role": "example-equipment-role-val-3501",
+											"orchestration-status": "example-orchestration-status-val-3501",
+											"heat-stack-id": "example-heat-stack-id-val-3501",
+											"mso-catalog-key": "example-mso-catalog-key-val-3501",
+											"management-option": "example-management-option-val-3501",
+											"ipv4-oam-address": "example-ipv4-oam-address-val-3501",
+											"ipv4-loopback0-address": "example-ipv4-loopback0-address-val-3501",
+											"nm-lan-v6-address": "example-nm-lan-v6-address-val-3501",
+											"management-v6-address": "example-management-v6-address-val-3501",
+											"vcpu": 1817,
+											"vcpu-units": "example-vcpu-units-val-3501",
+											"vmemory": 6020,
+											"vmemory-units": "example-vmemory-units-val-3501",
+											"vdisk": 5281,
+											"vdisk-units": "example-vdisk-units-val-3501",
+											"in-maint": false,
+											"is-closed-loop-disabled": true,
+											"resource-version": "1468321711"
+										},
+										"extra-properties": {
+											
+										},
+										"inventory-response-items": {
+											
+										}
+									},
+									{
+										"pserver": {
+											"hostname": "example-hostname-val-79914",
+											"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+											"number-of-cpus": 79914,
+											"disk-in-gigabytes": 79914,
+											"ram-in-megabytes": 79914,
+											"equip-type": "example-equip-type-val-79914",
+											"equip-vendor": "example-equip-vendor-val-79914",
+											"equip-model": "example-equip-model-val-79914",
+											"fqdn": "example-fqdn-val-79914",
+											"pserver-selflink": "example-pserver-selflink-val-79914",
+											"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+											"serial-number": "example-serial-number-val-79914",
+											"pserver-id": "example-pserver-id-val-79914",
+											"internet-topology": "example-internet-topology-val-79914",
+											"in-maint": true,
+											"resource-version": "1467994603",
+											"pserver-name2": "example-pserver-name2-val-79914",
+											"purpose": "example-purpose-val-79914"
+										},
+										"extra-properties": {
+											
+										},
+										"inventory-response-items": {
+											
+										}
+									}
+								]
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
diff --git a/src/test/resources/model-validation/instance-reader/connector.json b/src/test/resources/model-validation/instance-reader/connector.json
new file mode 100644
index 0000000..1870dc8
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/connector.json
@@ -0,0 +1,82 @@
+{
+	"connector": {
+		"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+		"resource-version": "1467975776",
+		"persona-model-id": "connector-widget-id",
+		"persona-model-version": "v1.0",
+		"widget-model-id": "example-widget-model-id-val-69486",
+		"widget-model-version": "v1.0"
+	},
+	"extra-properties": {
+		
+	},
+	"inventory-response-items": {
+		"inventory-response-item": [
+			{
+				"virtual-data-center": {
+					"vdc-id": "vdc-01",
+					"vdc-name": "example-vdc-name-val-10107",
+					"resource-version": "1467975781"
+				},
+				"extra-properties": {
+					
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"model-name": "Test LL Model Name",
+							"logical-link": {
+								"link-name": "example-link-name-val-23759",
+								"link-type": "example-link-type-val-23759",
+								"speed-value": "example-speed-value-val-23759",
+								"speed-units": "example-speed-units-val-23759",
+								"ip-version": "example-ip-version-val-23759",
+								"routing-protocol": "example-routing-protocol-val-23759",
+								"resource-version": "1467975786",
+								"persona-model-id": "example-persona-model-id-val-23759",
+								"persona-model-version": "example-persona-model-version-val-23759",
+								"widget-model-id": "example-widget-model-id-val-23759",
+								"widget-model-version": "example-widget-model-version-val-23759"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								"inventory-response-item": [
+									{
+										"pserver": {
+											"hostname": "example-hostname-val-79914",
+											"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+											"number-of-cpus": 79914,
+											"disk-in-gigabytes": 79914,
+											"ram-in-megabytes": 79914,
+											"equip-type": "example-equip-type-val-79914",
+											"equip-vendor": "example-equip-vendor-val-79914",
+											"equip-model": "example-equip-model-val-79914",
+											"fqdn": "example-fqdn-val-79914",
+											"pserver-selflink": "example-pserver-selflink-val-79914",
+											"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+											"serial-number": "example-serial-number-val-79914",
+											"pserver-id": "example-pserver-id-val-79914",
+											"internet-topology": "example-internet-topology-val-79914",
+											"in-maint": true,
+											"resource-version": "1467994603",
+											"pserver-name2": "example-pserver-name2-val-79914",
+											"purpose": "example-purpose-val-79914"
+										},
+										"extra-properties": {
+											
+										},
+										"inventory-response-items": {
+											
+										}
+									}
+								]
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
diff --git a/src/test/resources/model-validation/instance-reader/expected-generic-vnf.json b/src/test/resources/model-validation/instance-reader/expected-generic-vnf.json
new file mode 100644
index 0000000..ab5bb10
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/expected-generic-vnf.json
@@ -0,0 +1,36 @@
+{
+	"generic-vnf": {
+		"vnf-id": "generic-vnf-01",
+		"vnf-name": "example-vnf-name-val-3501",
+		"vnf-name2": "example-vnf-name2-val-3501",
+		"vnf-type": "example-vnf-type-val-3501",
+		"regional-resource-zone": "example-regional-resource-zone-val-3501",
+		"prov-status": "example-prov-status-val-3501",
+		"operational-state": "example-operational-state-val-3501",
+		"license-key": "example-license-key-val-3501",
+		"equipment-role": "example-equipment-role-val-3501",
+		"orchestration-status": "example-orchestration-status-val-3501",
+		"heat-stack-id": "example-heat-stack-id-val-3501",
+		"mso-catalog-key": "example-mso-catalog-key-val-3501",
+		"management-option": "example-management-option-val-3501",
+		"ipv4-oam-address": "example-ipv4-oam-address-val-3501",
+		"ipv4-loopback0-address": "example-ipv4-loopback0-address-val-3501",
+		"nm-lan-v6-address": "example-nm-lan-v6-address-val-3501",
+		"management-v6-address": "example-management-v6-address-val-3501",
+		"vcpu": 1817,
+		"vcpu-units": "example-vcpu-units-val-3501",
+		"vmemory": 6020,
+		"vmemory-units": "example-vmemory-units-val-3501",
+		"vdisk": 5281,
+		"vdisk-units": "example-vdisk-units-val-3501",
+		"in-maint": false,
+		"is-closed-loop-disabled": true,
+		"resource-version": "1468321711"
+	},
+	"extra-properties": {
+		
+	},
+	"inventory-response-items": {
+		
+	}
+}
diff --git a/src/test/resources/model-validation/instance-reader/expected-logical-link.json b/src/test/resources/model-validation/instance-reader/expected-logical-link.json
new file mode 100644
index 0000000..90bb7de
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/expected-logical-link.json
@@ -0,0 +1,51 @@
+{
+	"model-name": "Test LL Model Name",
+	"logical-link": {
+		"link-name": "example-link-name-val-23759",
+		"link-type": "example-link-type-val-23759",
+		"speed-value": "example-speed-value-val-23759",
+		"speed-units": "example-speed-units-val-23759",
+		"ip-version": "example-ip-version-val-23759",
+		"routing-protocol": "example-routing-protocol-val-23759",
+		"resource-version": "1467975786",
+		"persona-model-id": "example-persona-model-id-val-23759",
+		"persona-model-version": "example-persona-model-version-val-23759",
+		"widget-model-id": "example-widget-model-id-val-23759",
+		"widget-model-version": "example-widget-model-version-val-23759"
+	},
+	"extra-properties": {
+		
+	},
+	"inventory-response-items": {
+		"inventory-response-item": [
+			{
+				"pserver": {
+					"hostname": "example-hostname-val-79914",
+					"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+					"number-of-cpus": 79914,
+					"disk-in-gigabytes": 79914,
+					"ram-in-megabytes": 79914,
+					"equip-type": "example-equip-type-val-79914",
+					"equip-vendor": "example-equip-vendor-val-79914",
+					"equip-model": "example-equip-model-val-79914",
+					"fqdn": "example-fqdn-val-79914",
+					"pserver-selflink": "example-pserver-selflink-val-79914",
+					"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+					"serial-number": "example-serial-number-val-79914",
+					"pserver-id": "example-pserver-id-val-79914",
+					"internet-topology": "example-internet-topology-val-79914",
+					"in-maint": true,
+					"resource-version": "1467994603",
+					"pserver-name2": "example-pserver-name2-val-79914",
+					"purpose": "example-purpose-val-79914"
+				},
+				"extra-properties": {
+					
+				},
+				"inventory-response-items": {
+					
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/expected-pserver.json b/src/test/resources/model-validation/instance-reader/expected-pserver.json
new file mode 100644
index 0000000..8d4b8c5
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/expected-pserver.json
@@ -0,0 +1,28 @@
+{
+	"pserver": {
+		"hostname": "example-hostname-val-79914",
+		"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+		"number-of-cpus": 79914,
+		"disk-in-gigabytes": 79914,
+		"ram-in-megabytes": 79914,
+		"equip-type": "example-equip-type-val-79914",
+		"equip-vendor": "example-equip-vendor-val-79914",
+		"equip-model": "example-equip-model-val-79914",
+		"fqdn": "example-fqdn-val-79914",
+		"pserver-selflink": "example-pserver-selflink-val-79914",
+		"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+		"serial-number": "example-serial-number-val-79914",
+		"pserver-id": "example-pserver-id-val-79914",
+		"internet-topology": "example-internet-topology-val-79914",
+		"in-maint": true,
+		"resource-version": "1467994603",
+		"pserver-name2": "example-pserver-name2-val-79914",
+		"purpose": "example-purpose-val-79914"
+	},
+	"extra-properties": {
+		
+	},
+	"inventory-response-items": {
+		
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/expected-virtual-data-center-model-name.json b/src/test/resources/model-validation/instance-reader/expected-virtual-data-center-model-name.json
new file mode 100644
index 0000000..e72a52f
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/expected-virtual-data-center-model-name.json
@@ -0,0 +1,66 @@
+{
+	"model-name": "Test VC Model Name",
+	"virtual-data-center": {
+		"vdc-id": "vdc-01",
+		"vdc-name": "example-vdc-name-val-10107",
+		"resource-version": "1467975781"
+	},
+	"extra-properties": {
+		
+	},
+	"inventory-response-items": {
+		"inventory-response-item": [
+			{
+				"model-name": "Test LL Model Name",
+				"logical-link": {
+					"link-name": "example-link-name-val-23759",
+					"link-type": "example-link-type-val-23759",
+					"speed-value": "example-speed-value-val-23759",
+					"speed-units": "example-speed-units-val-23759",
+					"ip-version": "example-ip-version-val-23759",
+					"routing-protocol": "example-routing-protocol-val-23759",
+					"resource-version": "1467975786",
+					"persona-model-id": "example-persona-model-id-val-23759",
+					"persona-model-version": "example-persona-model-version-val-23759",
+					"widget-model-id": "example-widget-model-id-val-23759",
+					"widget-model-version": "example-widget-model-version-val-23759"
+				},
+				"extra-properties": {
+					
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"pserver": {
+								"hostname": "example-hostname-val-79914",
+								"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+								"number-of-cpus": 79914,
+								"disk-in-gigabytes": 79914,
+								"ram-in-megabytes": 79914,
+								"equip-type": "example-equip-type-val-79914",
+								"equip-vendor": "example-equip-vendor-val-79914",
+								"equip-model": "example-equip-model-val-79914",
+								"fqdn": "example-fqdn-val-79914",
+								"pserver-selflink": "example-pserver-selflink-val-79914",
+								"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+								"serial-number": "example-serial-number-val-79914",
+								"pserver-id": "example-pserver-id-val-79914",
+								"internet-topology": "example-internet-topology-val-79914",
+								"in-maint": true,
+								"resource-version": "1467994603",
+								"pserver-name2": "example-pserver-name2-val-79914",
+								"purpose": "example-purpose-val-79914"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/expected-virtual-data-center.json b/src/test/resources/model-validation/instance-reader/expected-virtual-data-center.json
new file mode 100644
index 0000000..7445823
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/expected-virtual-data-center.json
@@ -0,0 +1,65 @@
+{
+	"virtual-data-center": {
+		"vdc-id": "vdc-01",
+		"vdc-name": "example-vdc-name-val-10107",
+		"resource-version": "1467975781"
+	},
+	"extra-properties": {
+		
+	},
+	"inventory-response-items": {
+		"inventory-response-item": [
+			{
+				"model-name": "Test LL Model Name",
+				"logical-link": {
+					"link-name": "example-link-name-val-23759",
+					"link-type": "example-link-type-val-23759",
+					"speed-value": "example-speed-value-val-23759",
+					"speed-units": "example-speed-units-val-23759",
+					"ip-version": "example-ip-version-val-23759",
+					"routing-protocol": "example-routing-protocol-val-23759",
+					"resource-version": "1467975786",
+					"persona-model-id": "example-persona-model-id-val-23759",
+					"persona-model-version": "example-persona-model-version-val-23759",
+					"widget-model-id": "example-widget-model-id-val-23759",
+					"widget-model-version": "example-widget-model-version-val-23759"
+				},
+				"extra-properties": {
+					
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"pserver": {
+								"hostname": "example-hostname-val-79914",
+								"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+								"number-of-cpus": 79914,
+								"disk-in-gigabytes": 79914,
+								"ram-in-megabytes": 79914,
+								"equip-type": "example-equip-type-val-79914",
+								"equip-vendor": "example-equip-vendor-val-79914",
+								"equip-model": "example-equip-model-val-79914",
+								"fqdn": "example-fqdn-val-79914",
+								"pserver-selflink": "example-pserver-selflink-val-79914",
+								"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+								"serial-number": "example-serial-number-val-79914",
+								"pserver-id": "example-pserver-id-val-79914",
+								"internet-topology": "example-internet-topology-val-79914",
+								"in-maint": true,
+								"resource-version": "1467994603",
+								"pserver-name2": "example-pserver-name2-val-79914",
+								"purpose": "example-purpose-val-79914"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/model-instance-mapping-attributes.json_conf b/src/test/resources/model-validation/instance-reader/model-instance-mapping-attributes.json_conf
new file mode 100644
index 0000000..1abe24f
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/model-instance-mapping-attributes.json_conf
@@ -0,0 +1,12 @@
+[
+	{
+		"mappingType": "ATTRIBUTE",
+		"model": {
+			"value": "metadata/metadatum/metaname"
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"value": "$..extra-properties.metadatum[*].metaname"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/model-instance-mapping-root-missing.json_conf b/src/test/resources/model-validation/instance-reader/model-instance-mapping-root-missing.json_conf
new file mode 100644
index 0000000..c8d5591
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/model-instance-mapping-root-missing.json_conf
@@ -0,0 +1,16 @@
+[
+	{
+		"mappingType" : "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["widget"]
+			},
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']"
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/model-instance-mapping-root-unknown.json_conf b/src/test/resources/model-validation/instance-reader/model-instance-mapping-root-unknown.json_conf
new file mode 100644
index 0000000..990d0c7
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/model-instance-mapping-root-unknown.json_conf
@@ -0,0 +1,17 @@
+[
+	{
+		"mappingType" : "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["widget"]
+			},
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']"
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "NOT_KNOWN"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/model-instance-mapping.json_conf b/src/test/resources/model-validation/instance-reader/model-instance-mapping.json_conf
new file mode 100644
index 0000000..917c575
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/model-instance-mapping.json_conf
@@ -0,0 +1,17 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["widget"]
+			},
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']"
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-reader/test-validation-service-beans.xml b/src/test/resources/model-validation/instance-reader/test-validation-service-beans.xml
new file mode 100644
index 0000000..baf07b2
--- /dev/null
+++ b/src/test/resources/model-validation/instance-reader/test-validation-service-beans.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<!-- Used by TestInstanceReader.java -->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<import resource="../../oxm-reader/oxm-reader-beans.xml" />
+
+	<bean id="jsonReader" class="org.onap.aai.validation.reader.JsonReader" />
+
+	<bean id="instanceReader" class="org.onap.aai.validation.modeldriven.validator.InstanceReader">
+		<constructor-arg ref="jsonReader" />
+		<constructor-arg ref="oxmReader" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/aai-environment.properties b/src/test/resources/model-validation/instance-validator/aai-environment.properties
new file mode 100644
index 0000000..c595e7f
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/aai-environment.properties
@@ -0,0 +1,31 @@
+# ============LICENSE_START===================================================
+# Copyright (c) 2018 Amdocs
+# ============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=====================================================
+
+httpProtocol=file
+baseModelURI=src/test/resources/model-validation/instance-validator/all-models.xml
+
+# the following fields are autowired but will never be used
+host=
+port=
+trustStorePath=
+trustStorePassword.x=
+keyStorePath=
+keyStorePassword.x=
+keyManagerFactoryAlgorithm=
+keyStoreType=
+securityProtocol=
+connectionTimeout=
+readTimeout=
diff --git a/src/test/resources/model-validation/instance-validator/all-models.xml b/src/test/resources/model-validation/instance-validator/all-models.xml
new file mode 100644
index 0000000..9acbd2b
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/all-models.xml
@@ -0,0 +1,1370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<models xmlns="http://org.onap.aai.inventory/v7">
+    <model>
+        <model-invariant-id>22382f81-70cb-470d-8ab2-3e1b9fad10df</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>generic-vnf</model-name>
+        <model-id>6dcdbbc8-23b6-42c3-ac9f-2c0a3fe8cfba</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698747</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/43095b8a-8e9c-4a76-8490-6120140f6804/model-elements/model-element/41e6d6e5-aa69-4d33-b9f2-975bf418d1e3/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>43095b8a-8e9c-4a76-8490-6120140f6804</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>41e6d6e5-aa69-4d33-b9f2-975bf418d1e3</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/model-elements/model-element/17e48d38-e055-4158-ae6b-a170e8a647cd/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>0d23052d-8ffe-433e-a25d-da5da027bb7c</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>17e48d38-e055-4158-ae6b-a170e8a647cd</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/a97e8ab3-addd-40ee-9d29-3de505a56374/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>a97e8ab3-addd-40ee-9d29-3de505a56374</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/759ef1e4-3eca-4d55-8a9c-a8be31179f47/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>759ef1e4-3eca-4d55-8a9c-a8be31179f47</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>connector-widget-id</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>connector</model-name>
+        <model-id>connector-model-id</model-id>
+        <model-version>v2.0</model-version>
+        <resource-version>1466689944</resource-version>
+    </model>
+    <model>
+        <model-invariant-id>43095b8a-8e9c-4a76-8490-6120140f6804</model-invariant-id>
+        <model-type>resource</model-type>
+        <model-name>vSbg</model-name>
+        <model-id>b23fb31b-4c21-45f7-9d92-96ed70e63df1</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>41e6d6e5-aa69-4d33-b9f2-975bf418d1e3</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698619</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/22382f81-70cb-470d-8ab2-3e1b9fad10df/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>22382f81-70cb-470d-8ab2-3e1b9fad10df</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/6cf69470-ccbf-4034-a37f-f714c135f05c/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>6cf69470-ccbf-4034-a37f-f714c135f05c</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/059db56c-6d72-4023-9fc3-0db29534ddff/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>059db56c-6d72-4023-9fc3-0db29534ddff</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>523f0645-8182-4c91-9d6a-2f968e923937</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>pserver</model-name>
+        <model-id>c277c968-7e2b-4a88-9094-2b8a55dfb9f4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698757</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/model-elements/model-element/0204aad0-fe13-4f75-b022-f91f245f0e9e/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>0204aad0-fe13-4f75-b022-f91f245f0e9e</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/a79552d6-20dc-4b9e-b4d4-f29a8a2a8447/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>a79552d6-20dc-4b9e-b4d4-f29a8a2a8447</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/41294247-9f7e-4abf-becd-3bbca6945c09/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>41294247-9f7e-4abf-becd-3bbca6945c09</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>99469866-95bb-400e-8786-f83e87696725</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>virtual-data-center</model-name>
+        <model-id>3c70c43f-99ed-4476-82f4-92a30616e512</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698727</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</model-invariant-id>
+        <model-type>resource</model-type>
+        <model-name>ipe</model-name>
+        <model-id>e8f973a5-418a-44f2-9784-159e3e37d708</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698621</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</model-element-uuid>
+                        <new-data-del-flag>F</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698621</resource-version>
+                        <model-elements>
+                            <model-element>
+                                <model-element-uuid>ebc25508-b2e3-4021-b684-269cfd2b63c0</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698621</resource-version>
+                                <model-elements>
+                                    <model-element>
+                                        <model-element-uuid>f610d699-11af-4c13-a918-a89344e4a1bd</model-element-uuid>
+                                        <new-data-del-flag>T</new-data-del-flag>
+                                        <cardinality>unbounded</cardinality>
+                                        <linkage-points/>
+                                        <resource-version>1466698621</resource-version>
+                                        <relationship-list>
+                                            <relationship>
+                                                <related-to>model</related-to>
+                                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/49032ff1-5466-4054-b64b-15395ac10c00/</related-link>
+                                                <relationship-data>
+                                                    <relationship-key>model.model-invariant-id</relationship-key>
+                                                    <relationship-value>49032ff1-5466-4054-b64b-15395ac10c00</relationship-value>
+                                                </relationship-data>
+                                                <related-to-property>
+                                                    <property-key>model.model-name</property-key>
+                                                    <property-value>vlan</property-value>
+                                                </related-to-property>
+                                                <related-to-property>
+                                                    <property-key>model.model-type</property-key>
+                                                    <property-value>widget</property-value>
+                                                </related-to-property>
+                                            </relationship>
+                                        </relationship-list>
+                                    </model-element>
+                                </model-elements>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0a706320-b8e7-4b18-9485-fba156ea00cf/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-invariant-id</relationship-key>
+                                            <relationship-value>0a706320-b8e7-4b18-9485-fba156ea00cf</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>l-interface</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>widget</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                        </model-elements>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/3d9f4b1d-360c-4862-9623-703b150157ce/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-invariant-id</relationship-key>
+                                    <relationship-value>3d9f4b1d-360c-4862-9623-703b150157ce</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>p-interface</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>widget</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/523f0645-8182-4c91-9d6a-2f968e923937/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>523f0645-8182-4c91-9d6a-2f968e923937</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>pserver</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/304ddca5-47cd-49ec-a2d7-1ce17baa5b70/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>304ddca5-47cd-49ec-a2d7-1ce17baa5b70</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/193ec825-44ce-4416-85ac-20a6b6663575/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>193ec825-44ce-4416-85ac-20a6b6663575</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>668464da-6d41-4599-bdbb-2576147b440e</model-invariant-id>
+        <model-type>resource</model-type>
+        <model-name>WAN Connector v0.1</model-name>
+        <model-id>dc700a83-c507-47d9-b775-1fdfcdd5f9eb</model-id>
+        <model-version>0.1</model-version>
+        <model-description>Connects a customer vpn to the border elements of a vendor product</model-description>
+        <resource-version>1466698623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>93a37846-b497-490e-bc97-7d130022d6db</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698622</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>200de3d5-c207-47c2-a507-8846ba1d7068</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698622</resource-version>
+                        <model-elements>
+                            <model-element>
+                                <model-element-uuid>7ccfe6b5-6566-4b44-83d3-b79f5de7a87b</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698622</resource-version>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-invariant-id</relationship-key>
+                                            <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>VL ELAN</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>resource</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                            <model-element>
+                                <model-element-uuid>dfd30146-74f4-49e9-bad6-019d413352ac</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698622</resource-version>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-invariant-id</relationship-key>
+                                            <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>vLAN on a Physical Wire</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>resource</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                        </model-elements>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/99469866-95bb-400e-8786-f83e87696725/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-invariant-id</relationship-key>
+                                    <relationship-value>99469866-95bb-400e-8786-f83e87696725</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>virtual-data-center</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>widget</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/15f47352-28b7-4bbd-9828-393eaf79eeff/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>15f47352-28b7-4bbd-9828-393eaf79eeff</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>connector</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <metadata>
+            <metadatum>
+                <metaname>product</metaname>
+                <metaval>product-value-1</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+            <metadatum>
+                <metaname>vpn-id</metaname>
+                <metaval>vpn-id-value-1</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+        </metadata>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/460c6de2-a92b-4e3b-9ba3-538ce782b2fa/model-elements/model-element/71b825be-febf-45f7-b86a-ca0e3de19c90/model-elements/model-element/986167cb-57d3-4aad-8896-784a22c5289c/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>71b825be-febf-45f7-b86a-ca0e3de19c90</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>986167cb-57d3-4aad-8896-784a22c5289c</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</model-invariant-id>
+        <model-type>service</model-type>
+        <model-name>WAN Bonding v0.1</model-name>
+        <model-id>0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1</model-id>
+        <model-version>0.1</model-version>
+        <model-description>service-instance of the wan object</model-description>
+        <resource-version>1466698623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>71b825be-febf-45f7-b86a-ca0e3de19c90</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698623</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>986167cb-57d3-4aad-8896-784a22c5289c</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698623</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-invariant-id</relationship-key>
+                                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>WAN Connector v0.1</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/46b92144-923a-4d20-b85a-3cbd847668a9/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>46b92144-923a-4d20-b85a-3cbd847668a9</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>service-instance</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <metadata>
+            <metadatum>
+                <metaname>b</metaname>
+                <metaval>product</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+            <metadatum>
+                <metaname>a</metaname>
+                <metaval>vpn-id</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+        </metadata>
+    </model>
+    <model>
+        <model-invariant-id>generic-vnf-widget-id</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>generic-vnf</model-name>
+        <model-id>generic-vnf-model-id</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466624623</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/vMME-resource-id/model-elements/model-element/af4b6df2-65d0-4d10-b25e-02206799e1fa/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>vMME-resource-id</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>af4b6df2-65d0-4d10-b25e-02206799e1fa</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</model-invariant-id>
+        <model-type>resource</model-type>
+        <model-name>pBgf</model-name>
+        <model-id>9038f1d7-61f2-49ef-a61d-ace468d4ab32</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>0204aad0-fe13-4f75-b022-f91f245f0e9e</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698620</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/523f0645-8182-4c91-9d6a-2f968e923937/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>523f0645-8182-4c91-9d6a-2f968e923937</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>pserver</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/ad161a89-ef32-4b2c-b86d-7fbb7a251571/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ad161a89-ef32-4b2c-b86d-7fbb7a251571</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/d0d50aad-bb97-4865-a3bb-72dbf41be50b/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>d0d50aad-bb97-4865-a3bb-72dbf41be50b</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>15f47352-28b7-4bbd-9828-393eaf79eeff</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>connector</model-name>
+        <model-id>4f0dbd2d-b667-4d19-a563-84a764e62fa7</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698717</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>682ae094-0aaa-4381-a55d-bc633c40e4c0</model-invariant-id>
+        <model-type>resource</model-type>
+        <model-name>vLAN on a Physical Wire</model-name>
+        <model-id>32bee148-2cae-4f3d-a42e-22c9e4f078a2</model-id>
+        <model-version>1</model-version>
+        <model-description>An l2-bridge used by a wan connector connects an ipe to a BGF </model-description>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698622</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>d0d50aad-bb97-4865-a3bb-72dbf41be50b</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698622</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-invariant-id</relationship-key>
+                                    <relationship-value>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>pBgf</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>logical-link</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/dfd30146-74f4-49e9-bad6-019d413352ac/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>dfd30146-74f4-49e9-bad6-019d413352ac</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>46b92144-923a-4d20-b85a-3cbd847668a9</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>service-instance</model-name>
+        <model-id>82194af1-3c2c-485a-8f44-420e22a9eaa4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698646</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/460c6de2-a92b-4e3b-9ba3-538ce782b2fa/model-elements/model-element/71b825be-febf-45f7-b86a-ca0e3de19c90/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>71b825be-febf-45f7-b86a-ca0e3de19c90</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>3d9f4b1d-360c-4862-9623-703b150157ce</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>p-interface</model-name>
+        <model-id>479f5f13-51d9-4ccb-bddf-f554f1af0cfc</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698621</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>0d23052d-8ffe-433e-a25d-da5da027bb7c</model-invariant-id>
+        <model-type>resource</model-type>
+        <model-name>vDbe</model-name>
+        <model-id>fe8aac07-ce6c-4f9f-aa0d-b561c77da9e8</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>17e48d38-e055-4158-ae6b-a170e8a647cd</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698618</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/22382f81-70cb-470d-8ab2-3e1b9fad10df/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>22382f81-70cb-470d-8ab2-3e1b9fad10df</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/1d73a0dc-e7f6-4b6d-9450-5dda720d1a7f/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>1d73a0dc-e7f6-4b6d-9450-5dda720d1a7f</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/a1b205ea-17bb-442b-83a3-38b4e0fcb099/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>a1b205ea-17bb-442b-83a3-38b4e0fcb099</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>vMME-resource-id</model-invariant-id>
+        <model-type>resource</model-type>
+        <model-name>vMME</model-name>
+        <model-id>vMME-model-id</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466624623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>af4b6df2-65d0-4d10-b25e-02206799e1fa</model-element-uuid>
+                <new-data-del-flag>true</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466624623</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/generic-vnf-widget-id/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>generic-vnf-widget-id</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+    </model>
+    <model>
+        <model-invariant-id>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>logical-link</model-name>
+        <model-id>8742d5b3-ee98-4165-8bd5-fc012a7885b9</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698737</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>0a706320-b8e7-4b18-9485-fba156ea00cf</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>l-interface</model-name>
+        <model-id>d9131b0d-698f-4297-8699-af0a3ac7ebdc</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698767</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/model-elements/model-element/ebc25508-b2e3-4021-b684-269cfd2b63c0/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ebc25508-b2e3-4021-b684-269cfd2b63c0</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/29ac58b9-37fa-4d6a-9d2e-29f33e1e3b7a/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>29ac58b9-37fa-4d6a-9d2e-29f33e1e3b7a</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/eda1554f-3eff-4195-9185-bcbc4f75826f/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>eda1554f-3eff-4195-9185-bcbc4f75826f</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>49032ff1-5466-4054-b64b-15395ac10c00</model-invariant-id>
+        <model-type>widget</model-type>
+        <model-name>vlan</model-name>
+        <model-id>2febb0bc-b776-45b3-af50-75a578a8a4c4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698621</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/model-elements/model-element/ebc25508-b2e3-4021-b684-269cfd2b63c0/model-elements/model-element/f610d699-11af-4c13-a918-a89344e4a1bd/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ebc25508-b2e3-4021-b684-269cfd2b63c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>f610d699-11af-4c13-a918-a89344e4a1bd</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-invariant-id>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</model-invariant-id>
+        <model-type>resource</model-type>
+        <model-name>VL ELAN</model-name>
+        <model-id>932518e5-4260-4cc4-8038-df604a367f85</model-id>
+        <model-version>1</model-version>
+        <model-description>An l2-bridge used by a wan connector connects an ipe to a SBG or DBE</model-description>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>c44dbdf9-494e-49c1-b462-74e24e837b22</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698621</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>a1b205ea-17bb-442b-83a3-38b4e0fcb099</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698621</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-invariant-id</relationship-key>
+                                    <relationship-value>0d23052d-8ffe-433e-a25d-da5da027bb7c</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>vDbe</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-invariant-id</relationship-key>
+                            <relationship-value>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>logical-link</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/7ccfe6b5-6566-4b44-83d3-b79f5de7a87b/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-invariant-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>7ccfe6b5-6566-4b44-83d3-b79f5de7a87b</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+</models>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/connector-instance-errors.json b/src/test/resources/model-validation/instance-validator/connector-instance-errors.json
new file mode 100644
index 0000000..b932344
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/connector-instance-errors.json
@@ -0,0 +1,113 @@
+{
+	"cambria.partition": "AAI",
+	"event-header": {
+		"id": "20160525162737-61c49d41-5338-4755-af54-06cee9fe4acf",
+		"timestamp": "20160525-16:27:37:353",
+		"source-name": "RO",
+		"domain": "devINT1",
+		"sequence-number": "0",
+		"severity": "NORMAL",
+		"event-type": "AAI-EVENT",
+		"version": "v9",
+		"action": "CREATE",
+		"entity-type": "connector",
+		"top-entity-type": "connector",
+		"entity-link": "https://dummy-host.onap.org:8443/aai/v9/business/connectors/connector/c7611ebe-c324-48f1-8085-94aef0c12fd"
+	},
+	"entity": {
+		"inventory-response-item": [
+			{
+				"connector": {
+					"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+					"resource-version": "1467975776",
+					"persona-model-id": "connector-widget-id",
+					"persona-model-version": "v1.0",
+					"widget-model-id": "example-widget-model-id-val-69486",
+					"widget-model-version": "v1.0"
+				},
+				"extra-properties": {
+			        "metadatum": [
+			          {
+			            "metaname": "vpn-id",
+			            "metaval": "vpn-id-value-1",
+			            "resource-version": "1465990410"
+			          },
+			          {
+			            "metaname": "unexpected",
+			            "metaval": "unexpected-value-1",
+			            "resource-version": "1465990410"
+			          }
+			        ]
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"virtual-data-center": {
+								"vdc-id": "vdc-01",
+								"vdc-name": "example-vdc-name-val-10107",
+								"resource-version": "1467975781"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								"inventory-response-item": [
+									{
+										"logical-link": {
+											"link-name": "example-link-name-val-23759",
+											"link-type": "example-link-type-val-23759",
+											"speed-value": "example-speed-value-val-23759",
+											"speed-units": "example-speed-units-val-23759",
+											"ip-version": "example-ip-version-val-23759",
+											"routing-protocol": "example-routing-protocol-val-23759",
+											"resource-version": "1467975786",
+											"persona-model-id": "example-persona-model-id-val-23759",
+											"persona-model-version": "example-persona-model-version-val-23759",
+											"widget-model-id": "example-widget-model-id-val-23759",
+											"widget-model-version": "example-widget-model-version-val-23759"
+										},
+										"extra-properties": {
+											
+										},
+										"inventory-response-items": {
+											"inventory-response-item": [
+												{
+													"pserver": {
+														"hostname": "example-hostname-val-79914",
+														"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+														"number-of-cpus": 79914,
+														"disk-in-gigabytes": 79914,
+														"ram-in-megabytes": 79914,
+														"equip-type": "example-equip-type-val-79914",
+														"equip-vendor": "example-equip-vendor-val-79914",
+														"equip-model": "example-equip-model-val-79914",
+														"fqdn": "example-fqdn-val-79914",
+														"pserver-selflink": "example-pserver-selflink-val-79914",
+														"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+														"serial-number": "example-serial-number-val-79914",
+														"pserver-id": "example-pserver-id-val-79914",
+														"internet-topology": "example-internet-topology-val-79914",
+														"in-maint": true,
+														"resource-version": "1467994603",
+														"pserver-name2": "example-pserver-name2-val-79914",
+														"purpose": "example-purpose-val-79914"
+													},
+													"extra-properties": {
+														
+													},
+													"inventory-response-items": {
+														
+													}
+												}
+											]
+										}
+									}
+								]
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/connector-instance-multiple-missing-attrs.json b/src/test/resources/model-validation/instance-validator/connector-instance-multiple-missing-attrs.json
new file mode 100644
index 0000000..5b92692
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/connector-instance-multiple-missing-attrs.json
@@ -0,0 +1,50 @@
+{
+	"cambria.partition": "AAI",
+	"event-header": {
+		"id": "20160525162737-61c49d41-5338-4755-af54-06cee9fe4acf",
+		"timestamp": "20160525-16:27:37:353",
+		"source-name": "RO",
+		"domain": "devINT1",
+		"sequence-number": "0",
+		"severity": "NORMAL",
+		"event-type": "AAI-EVENT",
+		"version": "v9",
+		"action": "CREATE",
+		"entity-type": "connector",
+		"top-entity-type": "connector",
+		"entity-link": "https://dummy-host.onap.org:8443/aai/v9/business/connectors/connector/c7611ebe-c324-48f1-8085-94aef0c12fd"
+	},
+	"entity": {
+		"inventory-response-item": [
+			{
+				"connector": {
+					"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+					"resource-version": "1467975776",
+					"persona-model-id": "connector-widget-id",
+					"persona-model-version": "v1.0",
+					"widget-model-id": "example-widget-model-id-val-69486",
+					"widget-model-version": "v1.0"
+				},
+				"extra-properties": {
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"virtual-data-center": {
+								"vdc-id": "vdc-01",
+								"vdc-name": "example-vdc-name-val-10107",
+								"resource-version": "1467975781"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/connector-instance-multiple-unexpected-attrs.json b/src/test/resources/model-validation/instance-validator/connector-instance-multiple-unexpected-attrs.json
new file mode 100644
index 0000000..254433b
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/connector-instance-multiple-unexpected-attrs.json
@@ -0,0 +1,72 @@
+{
+	"cambria.partition": "AAI",
+	"event-header": {
+		"id": "20160525162737-61c49d41-5338-4755-af54-06cee9fe4acf",
+		"timestamp": "20160525-16:27:37:353",
+		"source-name": "RO",
+		"domain": "devINT1",
+		"sequence-number": "0",
+		"severity": "NORMAL",
+		"event-type": "AAI-EVENT",
+		"version": "v9",
+		"action": "CREATE",
+		"entity-type": "connector",
+		"top-entity-type": "connector",
+		"entity-link": "https://dummy-host.onap.org:8443/aai/v9/business/connectors/connector/c7611ebe-c324-48f1-8085-94aef0c12fd"
+	},
+	"entity": {
+		"inventory-response-item": [
+			{
+				"connector": {
+					"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+					"resource-version": "1467975776",
+					"persona-model-id": "connector-widget-id",
+					"persona-model-version": "v1.0",
+					"widget-model-id": "example-widget-model-id-val-69486",
+					"widget-model-version": "v1.0"
+				},
+				"extra-properties": {
+					"metadatum": [
+						{
+							"metaname": "vpn-id",
+							"metaval": "vpn-id-value-1",
+							"resource-version": "1465990410"
+						},
+						{
+							"metaname": "product",
+							"metaval": "product-value-1",
+							"resource-version": "1465990410"
+						},
+						{
+							"metaname": "city",
+							"metaval": "city-value-1",
+							"resource-version": "1465990410"
+						},
+						{
+							"metaname": "state",
+							"metaval": "state-value-1",
+							"resource-version": "1465990410"
+						}
+					]
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"virtual-data-center": {
+								"vdc-id": "vdc-01",
+								"vdc-name": "example-vdc-name-val-10107",
+								"resource-version": "1467975781"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/connector-instance-no-model-id.json b/src/test/resources/model-validation/instance-validator/connector-instance-no-model-id.json
new file mode 100644
index 0000000..8d2664d
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/connector-instance-no-model-id.json
@@ -0,0 +1,111 @@
+{
+	"cambria.partition": "AAI",
+	"event-header": {
+		"id": "20160525162737-61c49d41-5338-4755-af54-06cee9fe4acf",
+		"timestamp": "20160525-16:27:37:353",
+		"source-name": "RO",
+		"domain": "devINT1",
+		"sequence-number": "0",
+		"severity": "NORMAL",
+		"event-type": "AAI-EVENT",
+		"version": "v9",
+		"action": "CREATE",
+		"entity-type": "connector",
+		"top-entity-type": "connector",
+		"entity-link": "https://dummy-host.onap.org:8443/aai/v9/business/connectors/connector/c7611ebe-c324-48f1-8085-94aef0c12fd"
+	},
+	"entity": {
+		"inventory-response-item": [
+			{
+				"connector": {
+					"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+					"resource-version": "1467975776",
+					"widget-model-id": "example-widget-model-id-val-69486",
+					"widget-model-version": "v1.0"
+				},
+				"extra-properties": {
+			        "metadatum": [
+			          {
+			            "metaname": "vpn-id",
+			            "metaval": "vpn-id-value-1",
+			            "resource-version": "1465990410"
+			          },
+			          {
+			            "metaname": "unexpected",
+			            "metaval": "unexpected-value-1",
+			            "resource-version": "1465990410"
+			          }
+			        ]
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"virtual-data-center": {
+								"vdc-id": "vdc-01",
+								"vdc-name": "example-vdc-name-val-10107",
+								"resource-version": "1467975781"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								"inventory-response-item": [
+									{
+										"logical-link": {
+											"link-name": "example-link-name-val-23759",
+											"link-type": "example-link-type-val-23759",
+											"speed-value": "example-speed-value-val-23759",
+											"speed-units": "example-speed-units-val-23759",
+											"ip-version": "example-ip-version-val-23759",
+											"routing-protocol": "example-routing-protocol-val-23759",
+											"resource-version": "1467975786",
+											"persona-model-id": "example-persona-model-id-val-23759",
+											"persona-model-version": "example-persona-model-version-val-23759",
+											"widget-model-id": "example-widget-model-id-val-23759",
+											"widget-model-version": "example-widget-model-version-val-23759"
+										},
+										"extra-properties": {
+											
+										},
+										"inventory-response-items": {
+											"inventory-response-item": [
+												{
+													"pserver": {
+														"hostname": "example-hostname-val-79914",
+														"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+														"number-of-cpus": 79914,
+														"disk-in-gigabytes": 79914,
+														"ram-in-megabytes": 79914,
+														"equip-type": "example-equip-type-val-79914",
+														"equip-vendor": "example-equip-vendor-val-79914",
+														"equip-model": "example-equip-model-val-79914",
+														"fqdn": "example-fqdn-val-79914",
+														"pserver-selflink": "example-pserver-selflink-val-79914",
+														"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+														"serial-number": "example-serial-number-val-79914",
+														"pserver-id": "example-pserver-id-val-79914",
+														"internet-topology": "example-internet-topology-val-79914",
+														"in-maint": true,
+														"resource-version": "1467994603",
+														"pserver-name2": "example-pserver-name2-val-79914",
+														"purpose": "example-purpose-val-79914"
+													},
+													"extra-properties": {
+														
+													},
+													"inventory-response-items": {
+														
+													}
+												}
+											]
+										}
+									}
+								]
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/connector-instance-success.json b/src/test/resources/model-validation/instance-validator/connector-instance-success.json
new file mode 100644
index 0000000..629321c
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/connector-instance-success.json
@@ -0,0 +1,62 @@
+{
+	"cambria.partition": "AAI",
+	"event-header": {
+		"id": "20160525162737-61c49d41-5338-4755-af54-06cee9fe4acf",
+		"timestamp": "20160525-16:27:37:353",
+		"source-name": "RO",
+		"domain": "devINT1",
+		"sequence-number": "0",
+		"severity": "NORMAL",
+		"event-type": "AAI-EVENT",
+		"version": "v9",
+		"action": "CREATE",
+		"entity-type": "connector",
+		"top-entity-type": "connector",
+		"entity-link": "https://dummy-host.onap.org:8443/aai/v9/business/connectors/connector/c7611ebe-c324-48f1-8085-94aef0c12fd"
+	},
+	"entity": {
+		"inventory-response-item": [
+			{
+				"connector": {
+					"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+					"resource-version": "1467975776",
+					"persona-model-id": "connector-widget-id",
+					"persona-model-version": "v1.0",
+					"widget-model-id": "example-widget-model-id-val-69486",
+					"widget-model-version": "v1.0"
+				},
+				"extra-properties": {
+					"metadatum": [
+						{
+							"metaname": "vpn-id",
+							"metaval": "vpn-id-value-1",
+							"resource-version": "1465990410"
+						},
+						{
+							"metaname": "product",
+							"metaval": "product-value-1",
+							"resource-version": "1465990410"
+						}
+					]
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"virtual-data-center": {
+								"vdc-id": "vdc-01",
+								"vdc-name": "example-vdc-name-val-10107",
+								"resource-version": "1467975781"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/connector-instance-unknown-model-id.json b/src/test/resources/model-validation/instance-validator/connector-instance-unknown-model-id.json
new file mode 100644
index 0000000..c293606
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/connector-instance-unknown-model-id.json
@@ -0,0 +1,113 @@
+{
+	"cambria.partition": "AAI",
+	"event-header": {
+		"id": "20160525162737-61c49d41-5338-4755-af54-06cee9fe4acf",
+		"timestamp": "20160525-16:27:37:353",
+		"source-name": "RO",
+		"domain": "devINT1",
+		"sequence-number": "0",
+		"severity": "NORMAL",
+		"event-type": "AAI-EVENT",
+		"version": "v9",
+		"action": "CREATE",
+		"entity-type": "connector",
+		"top-entity-type": "connector",
+		"entity-link": "https://dummy-host.onap.org:8443/aai/v9/business/connectors/connector/c7611ebe-c324-48f1-8085-94aef0c12fd"
+	},
+	"entity": {
+		"inventory-response-item": [
+			{
+				"connector": {
+					"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+					"resource-version": "1467975776",
+					"persona-model-id": "UNKNOWN-MODEL",
+					"persona-model-version": "v1.0",
+					"widget-model-id": "example-widget-model-id-val-69486",
+					"widget-model-version": "v1.0"
+				},
+				"extra-properties": {
+			        "metadatum": [
+			          {
+			            "metaname": "vpn-id",
+			            "metaval": "vpn-id-value-1",
+			            "resource-version": "1465990410"
+			          },
+			          {
+			            "metaname": "unexpected",
+			            "metaval": "unexpected-value-1",
+			            "resource-version": "1465990410"
+			          }
+			        ]
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"virtual-data-center": {
+								"vdc-id": "vdc-01",
+								"vdc-name": "example-vdc-name-val-10107",
+								"resource-version": "1467975781"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								"inventory-response-item": [
+									{
+										"logical-link": {
+											"link-name": "example-link-name-val-23759",
+											"link-type": "example-link-type-val-23759",
+											"speed-value": "example-speed-value-val-23759",
+											"speed-units": "example-speed-units-val-23759",
+											"ip-version": "example-ip-version-val-23759",
+											"routing-protocol": "example-routing-protocol-val-23759",
+											"resource-version": "1467975786",
+											"persona-model-id": "example-persona-model-id-val-23759",
+											"persona-model-version": "example-persona-model-version-val-23759",
+											"widget-model-id": "example-widget-model-id-val-23759",
+											"widget-model-version": "example-widget-model-version-val-23759"
+										},
+										"extra-properties": {
+											
+										},
+										"inventory-response-items": {
+											"inventory-response-item": [
+												{
+													"pserver": {
+														"hostname": "example-hostname-val-79914",
+														"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+														"number-of-cpus": 79914,
+														"disk-in-gigabytes": 79914,
+														"ram-in-megabytes": 79914,
+														"equip-type": "example-equip-type-val-79914",
+														"equip-vendor": "example-equip-vendor-val-79914",
+														"equip-model": "example-equip-model-val-79914",
+														"fqdn": "example-fqdn-val-79914",
+														"pserver-selflink": "example-pserver-selflink-val-79914",
+														"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+														"serial-number": "example-serial-number-val-79914",
+														"pserver-id": "example-pserver-id-val-79914",
+														"internet-topology": "example-internet-topology-val-79914",
+														"in-maint": true,
+														"resource-version": "1467994603",
+														"pserver-name2": "example-pserver-name2-val-79914",
+														"purpose": "example-purpose-val-79914"
+													},
+													"extra-properties": {
+														
+													},
+													"inventory-response-items": {
+														
+													}
+												}
+											]
+										}
+									}
+								]
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/connector-instance.json b/src/test/resources/model-validation/instance-validator/connector-instance.json
new file mode 100644
index 0000000..4fb489e
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/connector-instance.json
@@ -0,0 +1,113 @@
+{
+	"cambria.partition": "AAI",
+	"event-header": {
+		"id": "20160525162737-61c49d41-5338-4755-af54-06cee9fe4acf",
+		"timestamp": "20160525-16:27:37:353",
+		"source-name": "RO",
+		"domain": "devINT1",
+		"sequence-number": "0",
+		"severity": "NORMAL",
+		"event-type": "AAI-EVENT",
+		"version": "v9",
+		"action": "CREATE",
+		"entity-type": "connector",
+		"top-entity-type": "connector",
+		"entity-link": "https://dummy-host.onap.org:8443/aai/v9/business/connectors/connector/c7611ebe-c324-48f1-8085-94aef0c12fd"
+	},
+	"entity": {
+		"inventory-response-item": [
+			{
+				"connector": {
+					"resource-instance-id": "c7611ebe-c324-48f1-8085-94aef0c12fd",
+					"resource-version": "1467975776",
+					"persona-model-id": "connector-widget-id",
+					"persona-model-version": "v1.0",
+					"widget-model-id": "example-widget-model-id-val-69486",
+					"widget-model-version": "v1.0"
+				},
+				"extra-properties": {
+			        "metadatum": [
+			          {
+			            "metaname": "vpn-id",
+			            "metaval": "vpn-id-value-1",
+			            "resource-version": "1465990410"
+			          },
+			          {
+			            "metaname": "product",
+			            "metaval": "product-value-1",
+			            "resource-version": "1465990410"
+			          }
+			        ]
+				},
+				"inventory-response-items": {
+					"inventory-response-item": [
+						{
+							"virtual-data-center": {
+								"vdc-id": "vdc-01",
+								"vdc-name": "example-vdc-name-val-10107",
+								"resource-version": "1467975781"
+							},
+							"extra-properties": {
+								
+							},
+							"inventory-response-items": {
+								"inventory-response-item": [
+									{
+										"logical-link": {
+											"link-name": "example-link-name-val-23759",
+											"link-type": "example-link-type-val-23759",
+											"speed-value": "example-speed-value-val-23759",
+											"speed-units": "example-speed-units-val-23759",
+											"ip-version": "example-ip-version-val-23759",
+											"routing-protocol": "example-routing-protocol-val-23759",
+											"resource-version": "1467975786",
+											"persona-model-id": "example-persona-model-id-val-23759",
+											"persona-model-version": "example-persona-model-version-val-23759",
+											"widget-model-id": "example-widget-model-id-val-23759",
+											"widget-model-version": "example-widget-model-version-val-23759"
+										},
+										"extra-properties": {
+											
+										},
+										"inventory-response-items": {
+											"inventory-response-item": [
+												{
+													"pserver": {
+														"hostname": "example-hostname-val-79914",
+														"ptnii-equip-name": "example-ptnii-equip-name-val-79914",
+														"number-of-cpus": 79914,
+														"disk-in-gigabytes": 79914,
+														"ram-in-megabytes": 79914,
+														"equip-type": "example-equip-type-val-79914",
+														"equip-vendor": "example-equip-vendor-val-79914",
+														"equip-model": "example-equip-model-val-79914",
+														"fqdn": "example-fqdn-val-79914",
+														"pserver-selflink": "example-pserver-selflink-val-79914",
+														"ipv4-oam-address": "example-ipv4-oam-address-val-79914",
+														"serial-number": "example-serial-number-val-79914",
+														"pserver-id": "example-pserver-id-val-79914",
+														"internet-topology": "example-internet-topology-val-79914",
+														"in-maint": true,
+														"resource-version": "1467994603",
+														"pserver-name2": "example-pserver-name2-val-79914",
+														"purpose": "example-purpose-val-79914"
+													},
+													"extra-properties": {
+														
+													},
+													"inventory-response-items": {
+														
+													}
+												}
+											]
+										}
+									}
+								]
+							}
+						}
+					]
+				}
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/connector-widget-id.xml b/src/test/resources/model-validation/instance-validator/connector-widget-id.xml
new file mode 100644
index 0000000..924ce67
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/connector-widget-id.xml
@@ -0,0 +1,79 @@
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<model>
+	<model-name-version-id>connector-widget-id</model-name-version-id>
+	<model-type>widget</model-type>
+	<model-name>connector</model-name>
+	<model-id>connector-model-id</model-id>
+	<model-version>v1.0</model-version>
+	<resource-version>1466417894</resource-version>
+	<model-elements>
+		<model-element>
+			<model-element-uuid>8c0fd413-0d2b-491b-ad14-10c434c359bb</model-element-uuid>
+			<new-data-del-flag>T</new-data-del-flag>
+			<cardinality>unbounded</cardinality>
+			<linkage-points/>
+			<resource-version>1466417894</resource-version>
+			<model-constraints/>
+			<relationship-list>
+				<relationship>
+					<related-to>model</related-to>
+					<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/virtual-data-center-widget-id/</related-link>
+					<relationship-data>
+						<relationship-key>model.model-name-version-id</relationship-key>
+						<relationship-value>virtual-data-center-widget-id</relationship-value>
+					</relationship-data>
+					<related-to-property>
+						<property-key>model.model-name</property-key>
+						<property-value>virtual-data-center</property-value>
+					</related-to-property>
+					<related-to-property>
+						<property-key>model.model-type</property-key>
+						<property-value>widget</property-value>
+					</related-to-property>
+				</relationship>
+			</relationship-list>
+		</model-element>
+	</model-elements>
+	<metadata>
+		<metadatum>
+			<metaname>vpn-id</metaname>
+			<metaval>a</metaval>
+			<resource-version>1466417844</resource-version>
+		</metadatum>
+		<metadatum>
+			<metaname>product</metaname>
+			<metaval>b</metaval>
+			<resource-version>1466417844</resource-version>
+		</metadatum>
+	</metadata>
+	<relationship-list>
+		<relationship>
+			<related-to>model-element</related-to>
+			<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/54629607-160a-4dcf-8c5c-15b8a3756f9a/</related-link>
+			<relationship-data>
+				<relationship-key>model-element.model-element-uuid</relationship-key>
+				<relationship-value>54629607-160a-4dcf-8c5c-15b8a3756f9a</relationship-value>
+			</relationship-data>
+			<relationship-data>
+				<relationship-key>model.model-name-version-id</relationship-key>
+				<relationship-value>wan-connector-service-id</relationship-value>
+			</relationship-data>
+		</relationship>
+	</relationship-list>
+</model>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/instance-validator/model-instance-mapping.json_conf b/src/test/resources/model-validation/instance-validator/model-instance-mapping.json_conf
new file mode 100644
index 0000000..12d39ea
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/model-instance-mapping.json_conf
@@ -0,0 +1,28 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["widget"]
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+ 		}
+ 	},
+ 	{
+		"mappingType": "ATTRIBUTE",
+		"model": {
+			"value": "metadata/metadatum/metaname"
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"value": "$..extra-properties.metadatum[*].metaname"
+		}
+	}
+]
diff --git a/src/test/resources/model-validation/instance-validator/test-validation-service-beans.xml b/src/test/resources/model-validation/instance-validator/test-validation-service-beans.xml
new file mode 100644
index 0000000..82fe160
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/test-validation-service-beans.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<import resource="../../oxm-reader/oxm-reader-beans.xml" />
+
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<!-- PROPERTY AND CONFIGURATION FILES -->
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<context:property-placeholder location="classpath:event-reader.properties"
+		ignore-unresolvable="true" />
+	<context:property-placeholder location="classpath:model-validation/instance-validator/aai-environment.properties"
+		ignore-unresolvable="true" />
+	<context:property-placeholder location="classpath:model-validation/instance-validator/validation-service.properties"
+		ignore-unresolvable="true" />
+
+	<bean id="mappingFile" class="org.apache.commons.io.IOUtils" factory-method="toString">
+		<constructor-arg value="file:src/test/resources/model-validation/instance-validator/model-instance-mapping.json_conf"
+			type="java.io.InputStream" />
+	</bean>
+
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<!-- CONFIG BEANS -->
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<bean id="modelConfig" class="org.onap.aai.validation.config.ModelConfig">
+		<property name="modelCacheExpirySeconds" value="${model.cache.expirySeconds}" />
+	</bean>
+
+	<bean id="restConfig" class="org.onap.aai.validation.config.RestConfig">
+		<property name="host" value="${host}" />
+		<property name="port" value="${port}" />
+		<property name="protocol" value="${httpProtocol}" />
+		<property name="baseModelURI" value="${baseModelURI}" />
+		<property name="trustStorePath" value="${trustStorePath}" />
+		<property name="trustStorePassword" value="${trustStorePassword.x}" />
+		<property name="keyStorePath" value="${keyStorePath}" />
+		<property name="keyStorePassword" value="${keyStorePassword.x}" />
+		<property name="keyManagerFactoryAlgorithm" value="${keyManagerFactoryAlgorithm}" />
+		<property name="keyStoreType" value="${keyStoreType}" />
+		<property name="securityProtocol" value="${securityProtocol}" />
+		<property name="connectionTimeout" value="${connectionTimeout}" />
+		<property name="readTimeout" value="${readTimeout}" />
+	</bean>
+
+	<bean id="eventReaderConfig" class="org.onap.aai.validation.config.EventReaderConfig">
+		<property name="eventDomainPath" value="${event.domain.path}" />
+		<property name="eventActionPath" value="${event.action.path}" />
+		<property name="eventTypePath" value="${event.type.path}" />
+		<property name="entityTypePath" value="${event.entity.type.path}" />
+		<property name="topEntityTypePath" value="${event.entity.type.top.path}" />
+		<property name="entityLinkPath" value="${event.entity.link.path}" />
+		<property name="entityPath" value="${event.entity.path}" />
+		<property name="nestedEntityPath" value="${event.entity.nested.path}" />
+		<property name="entityIdPath" value="${entity.id.path}" />
+		<property name="entityResourceVersionPath" value="${entity.resource.version.path}" />
+	</bean>
+
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<!-- READER BEANS -->
+	<!-- ////////////////////////////////////////////////////////////////// -->
+
+	<bean id="jsonReader" class="org.onap.aai.validation.reader.JsonReader" />
+
+	<bean id="eventReader" class="org.onap.aai.validation.reader.EventReader">
+		<constructor-arg ref="eventReaderConfig" />
+		<constructor-arg ref="jsonReader" />
+		<constructor-arg ref="oxmReader" />
+	</bean>
+
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<!-- IMPLEMENTATION BEANS -->
+	<!-- ////////////////////////////////////////////////////////////////// -->
+
+	<!-- MODEL VALIDATION BEANS -->
+	<bean id="modelCacheManager" class="org.onap.aai.validation.modeldriven.ModelCacheManager">
+		<constructor-arg ref="modelConfig" />
+		<constructor-arg ref="restConfig" />
+	</bean>
+
+	<bean id="modelInstanceMappingReader" class="org.onap.aai.validation.modeldriven.configuration.mapping.ModelInstanceMappingReader">
+		<constructor-arg ref="mappingFile" />
+	</bean>
+
+	<bean id="instanceReader" class="org.onap.aai.validation.modeldriven.validator.InstanceReader">
+		<constructor-arg ref="jsonReader" />
+		<constructor-arg ref="oxmReader" />
+	</bean>
+
+	<bean id="instanceValidator" class="org.onap.aai.validation.modeldriven.validator.ModelDrivenValidator">
+		<constructor-arg ref="modelCacheManager" />
+		<constructor-arg ref="modelInstanceMappingReader" />
+		<constructor-arg ref="instanceReader" />
+		<constructor-arg ref="eventReader" />
+	</bean>
+
+</beans>
diff --git a/src/test/resources/model-validation/instance-validator/validation-service.properties b/src/test/resources/model-validation/instance-validator/validation-service.properties
new file mode 100644
index 0000000..4e1b264
--- /dev/null
+++ b/src/test/resources/model-validation/instance-validator/validation-service.properties
@@ -0,0 +1,29 @@
+# ============LICENSE_START===================================================
+# Copyright (c) 2018 Amdocs
+# ============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=====================================================
+
+topic.publish.enable=true
+topic.publish.retries=3
+topic.consume.enable=true
+topic.consume.polling.interval.seconds=3
+
+event.domain=devINT1
+event.action.exclude=DELETE
+event.type.rule=AAI-EVENT,AAI-DATA-EXPORT-API,GIZMO-EVENT
+event.type.model=AAI-DATA-EXPORT-NQ
+event.type.end=END-EVENT
+
+model.cache.expirySeconds=3
+aai.oxm.version=12
diff --git a/src/test/resources/model-validation/model-parser/all-models.xml b/src/test/resources/model-validation/model-parser/all-models.xml
new file mode 100644
index 0000000..a295a5f
--- /dev/null
+++ b/src/test/resources/model-validation/model-parser/all-models.xml
@@ -0,0 +1,1370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<models xmlns="http://org.onap.aai.inventory/v7">
+    <model>
+        <model-name-version-id>22382f81-70cb-470d-8ab2-3e1b9fad10df</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>generic-vnf</model-name>
+        <model-id>6dcdbbc8-23b6-42c3-ac9f-2c0a3fe8cfba</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698747</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/43095b8a-8e9c-4a76-8490-6120140f6804/model-elements/model-element/41e6d6e5-aa69-4d33-b9f2-975bf418d1e3/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>43095b8a-8e9c-4a76-8490-6120140f6804</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>41e6d6e5-aa69-4d33-b9f2-975bf418d1e3</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/model-elements/model-element/17e48d38-e055-4158-ae6b-a170e8a647cd/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>0d23052d-8ffe-433e-a25d-da5da027bb7c</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>17e48d38-e055-4158-ae6b-a170e8a647cd</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/a97e8ab3-addd-40ee-9d29-3de505a56374/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>a97e8ab3-addd-40ee-9d29-3de505a56374</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/759ef1e4-3eca-4d55-8a9c-a8be31179f47/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>759ef1e4-3eca-4d55-8a9c-a8be31179f47</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>connector-widget-id</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>connector</model-name>
+        <model-id>connector-model-id</model-id>
+        <model-version>v2.0</model-version>
+        <resource-version>1466689944</resource-version>
+    </model>
+    <model>
+        <model-name-version-id>43095b8a-8e9c-4a76-8490-6120140f6804</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>vSbg</model-name>
+        <model-id>b23fb31b-4c21-45f7-9d92-96ed70e63df1</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>41e6d6e5-aa69-4d33-b9f2-975bf418d1e3</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698619</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/22382f81-70cb-470d-8ab2-3e1b9fad10df/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>22382f81-70cb-470d-8ab2-3e1b9fad10df</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/6cf69470-ccbf-4034-a37f-f714c135f05c/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>6cf69470-ccbf-4034-a37f-f714c135f05c</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/059db56c-6d72-4023-9fc3-0db29534ddff/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>059db56c-6d72-4023-9fc3-0db29534ddff</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>523f0645-8182-4c91-9d6a-2f968e923937</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>pserver</model-name>
+        <model-id>c277c968-7e2b-4a88-9094-2b8a55dfb9f4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698757</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/model-elements/model-element/0204aad0-fe13-4f75-b022-f91f245f0e9e/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>0204aad0-fe13-4f75-b022-f91f245f0e9e</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/a79552d6-20dc-4b9e-b4d4-f29a8a2a8447/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>a79552d6-20dc-4b9e-b4d4-f29a8a2a8447</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/41294247-9f7e-4abf-becd-3bbca6945c09/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>41294247-9f7e-4abf-becd-3bbca6945c09</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>99469866-95bb-400e-8786-f83e87696725</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>virtual-data-center</model-name>
+        <model-id>3c70c43f-99ed-4476-82f4-92a30616e512</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698727</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>ipe</model-name>
+        <model-id>e8f973a5-418a-44f2-9784-159e3e37d708</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698621</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</model-element-uuid>
+                        <new-data-del-flag>F</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698621</resource-version>
+                        <model-elements>
+                            <model-element>
+                                <model-element-uuid>ebc25508-b2e3-4021-b684-269cfd2b63c0</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698621</resource-version>
+                                <model-elements>
+                                    <model-element>
+                                        <model-element-uuid>f610d699-11af-4c13-a918-a89344e4a1bd</model-element-uuid>
+                                        <new-data-del-flag>T</new-data-del-flag>
+                                        <cardinality>unbounded</cardinality>
+                                        <linkage-points/>
+                                        <resource-version>1466698621</resource-version>
+                                        <relationship-list>
+                                            <relationship>
+                                                <related-to>model</related-to>
+                                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/49032ff1-5466-4054-b64b-15395ac10c00/</related-link>
+                                                <relationship-data>
+                                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                                    <relationship-value>49032ff1-5466-4054-b64b-15395ac10c00</relationship-value>
+                                                </relationship-data>
+                                                <related-to-property>
+                                                    <property-key>model.model-name</property-key>
+                                                    <property-value>vlan</property-value>
+                                                </related-to-property>
+                                                <related-to-property>
+                                                    <property-key>model.model-type</property-key>
+                                                    <property-value>widget</property-value>
+                                                </related-to-property>
+                                            </relationship>
+                                        </relationship-list>
+                                    </model-element>
+                                </model-elements>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0a706320-b8e7-4b18-9485-fba156ea00cf/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-name-version-id</relationship-key>
+                                            <relationship-value>0a706320-b8e7-4b18-9485-fba156ea00cf</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>l-interface</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>widget</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                        </model-elements>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/3d9f4b1d-360c-4862-9623-703b150157ce/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>3d9f4b1d-360c-4862-9623-703b150157ce</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>p-interface</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>widget</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/523f0645-8182-4c91-9d6a-2f968e923937/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>523f0645-8182-4c91-9d6a-2f968e923937</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>pserver</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/304ddca5-47cd-49ec-a2d7-1ce17baa5b70/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>304ddca5-47cd-49ec-a2d7-1ce17baa5b70</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/193ec825-44ce-4416-85ac-20a6b6663575/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>193ec825-44ce-4416-85ac-20a6b6663575</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>668464da-6d41-4599-bdbb-2576147b440e</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>WAN Connector v0.1</model-name>
+        <model-id>dc700a83-c507-47d9-b775-1fdfcdd5f9eb</model-id>
+        <model-version>0.1</model-version>
+        <model-description>Connects a customer vpn to the border elements of a vendor product</model-description>
+        <resource-version>1466698623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>93a37846-b497-490e-bc97-7d130022d6db</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698622</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>200de3d5-c207-47c2-a507-8846ba1d7068</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698622</resource-version>
+                        <model-elements>
+                            <model-element>
+                                <model-element-uuid>7ccfe6b5-6566-4b44-83d3-b79f5de7a87b</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698622</resource-version>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-name-version-id</relationship-key>
+                                            <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>VL ELAN</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>resource</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                            <model-element>
+                                <model-element-uuid>dfd30146-74f4-49e9-bad6-019d413352ac</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698622</resource-version>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-name-version-id</relationship-key>
+                                            <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>vLAN on a Physical Wire</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>resource</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                        </model-elements>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/99469866-95bb-400e-8786-f83e87696725/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>99469866-95bb-400e-8786-f83e87696725</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>virtual-data-center</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>widget</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/15f47352-28b7-4bbd-9828-393eaf79eeff/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>15f47352-28b7-4bbd-9828-393eaf79eeff</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>connector</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <metadata>
+            <metadatum>
+                <metaname>product</metaname>
+                <metaval>product-value-1</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+            <metadatum>
+                <metaname>vpn-id</metaname>
+                <metaval>vpn-id-value-1</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+        </metadata>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/460c6de2-a92b-4e3b-9ba3-538ce782b2fa/model-elements/model-element/71b825be-febf-45f7-b86a-ca0e3de19c90/model-elements/model-element/986167cb-57d3-4aad-8896-784a22c5289c/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>71b825be-febf-45f7-b86a-ca0e3de19c90</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>986167cb-57d3-4aad-8896-784a22c5289c</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</model-name-version-id>
+        <model-type>service</model-type>
+        <model-name>WAN Bonding v0.1</model-name>
+        <model-id>0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1</model-id>
+        <model-version>0.1</model-version>
+        <model-description>service-instance of the wan object</model-description>
+        <resource-version>1466698623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>71b825be-febf-45f7-b86a-ca0e3de19c90</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698623</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>986167cb-57d3-4aad-8896-784a22c5289c</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698623</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>NetBond WAN Connector v0.1</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/46b92144-923a-4d20-b85a-3cbd847668a9/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>46b92144-923a-4d20-b85a-3cbd847668a9</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>service-instance</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <metadata>
+            <metadatum>
+                <metaname>b</metaname>
+                <metaval>product</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+            <metadatum>
+                <metaname>a</metaname>
+                <metaval>vpn-id</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+        </metadata>
+    </model>
+    <model>
+        <model-name-version-id>generic-vnf-widget-id</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>generic-vnf</model-name>
+        <model-id>generic-vnf-model-id</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466624623</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/vMME-resource-id/model-elements/model-element/af4b6df2-65d0-4d10-b25e-02206799e1fa/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>vMME-resource-id</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>af4b6df2-65d0-4d10-b25e-02206799e1fa</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>pBgf</model-name>
+        <model-id>9038f1d7-61f2-49ef-a61d-ace468d4ab32</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>0204aad0-fe13-4f75-b022-f91f245f0e9e</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698620</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/523f0645-8182-4c91-9d6a-2f968e923937/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>523f0645-8182-4c91-9d6a-2f968e923937</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>pserver</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/ad161a89-ef32-4b2c-b86d-7fbb7a251571/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ad161a89-ef32-4b2c-b86d-7fbb7a251571</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/d0d50aad-bb97-4865-a3bb-72dbf41be50b/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>d0d50aad-bb97-4865-a3bb-72dbf41be50b</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>15f47352-28b7-4bbd-9828-393eaf79eeff</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>connector</model-name>
+        <model-id>4f0dbd2d-b667-4d19-a563-84a764e62fa7</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698717</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>682ae094-0aaa-4381-a55d-bc633c40e4c0</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>vLAN on a Physical Wire</model-name>
+        <model-id>32bee148-2cae-4f3d-a42e-22c9e4f078a2</model-id>
+        <model-version>1</model-version>
+        <model-description>An l2-bridge used by a wan connector connects an ipe to a BGF </model-description>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698622</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>d0d50aad-bb97-4865-a3bb-72dbf41be50b</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698622</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>pBgf</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>logical-link</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/dfd30146-74f4-49e9-bad6-019d413352ac/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>dfd30146-74f4-49e9-bad6-019d413352ac</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>46b92144-923a-4d20-b85a-3cbd847668a9</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>service-instance</model-name>
+        <model-id>82194af1-3c2c-485a-8f44-420e22a9eaa4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698646</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/460c6de2-a92b-4e3b-9ba3-538ce782b2fa/model-elements/model-element/71b825be-febf-45f7-b86a-ca0e3de19c90/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>71b825be-febf-45f7-b86a-ca0e3de19c90</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>3d9f4b1d-360c-4862-9623-703b150157ce</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>p-interface</model-name>
+        <model-id>479f5f13-51d9-4ccb-bddf-f554f1af0cfc</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698621</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>0d23052d-8ffe-433e-a25d-da5da027bb7c</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>vDbe</model-name>
+        <model-id>fe8aac07-ce6c-4f9f-aa0d-b561c77da9e8</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>17e48d38-e055-4158-ae6b-a170e8a647cd</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698618</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/22382f81-70cb-470d-8ab2-3e1b9fad10df/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>22382f81-70cb-470d-8ab2-3e1b9fad10df</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/1d73a0dc-e7f6-4b6d-9450-5dda720d1a7f/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>1d73a0dc-e7f6-4b6d-9450-5dda720d1a7f</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/a1b205ea-17bb-442b-83a3-38b4e0fcb099/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>a1b205ea-17bb-442b-83a3-38b4e0fcb099</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>vMME-resource-id</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>vMME</model-name>
+        <model-id>vMME-model-id</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466624623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>af4b6df2-65d0-4d10-b25e-02206799e1fa</model-element-uuid>
+                <new-data-del-flag>true</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466624623</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/generic-vnf-widget-id/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>generic-vnf-widget-id</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+    </model>
+    <model>
+        <model-name-version-id>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>logical-link</model-name>
+        <model-id>8742d5b3-ee98-4165-8bd5-fc012a7885b9</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698737</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>0a706320-b8e7-4b18-9485-fba156ea00cf</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>l-interface</model-name>
+        <model-id>d9131b0d-698f-4297-8699-af0a3ac7ebdc</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698767</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/model-elements/model-element/ebc25508-b2e3-4021-b684-269cfd2b63c0/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ebc25508-b2e3-4021-b684-269cfd2b63c0</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/29ac58b9-37fa-4d6a-9d2e-29f33e1e3b7a/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>29ac58b9-37fa-4d6a-9d2e-29f33e1e3b7a</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/eda1554f-3eff-4195-9185-bcbc4f75826f/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>eda1554f-3eff-4195-9185-bcbc4f75826f</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>49032ff1-5466-4054-b64b-15395ac10c00</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>vlan</model-name>
+        <model-id>2febb0bc-b776-45b3-af50-75a578a8a4c4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698621</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/model-elements/model-element/ebc25508-b2e3-4021-b684-269cfd2b63c0/model-elements/model-element/f610d699-11af-4c13-a918-a89344e4a1bd/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ebc25508-b2e3-4021-b684-269cfd2b63c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>f610d699-11af-4c13-a918-a89344e4a1bd</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>VL ELAN</model-name>
+        <model-id>932518e5-4260-4cc4-8038-df604a367f85</model-id>
+        <model-version>1</model-version>
+        <model-description>An l2-bridge used by a wan connector connects an ipe to a SBG or DBE</model-description>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>c44dbdf9-494e-49c1-b462-74e24e837b22</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698621</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>a1b205ea-17bb-442b-83a3-38b4e0fcb099</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698621</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>0d23052d-8ffe-433e-a25d-da5da027bb7c</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>vDbe</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>logical-link</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/7ccfe6b5-6566-4b44-83d3-b79f5de7a87b/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>7ccfe6b5-6566-4b44-83d3-b79f5de7a87b</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+</models>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/aai-environment.properties b/src/test/resources/model-validation/model-reader/aai-environment.properties
new file mode 100644
index 0000000..3450105
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/aai-environment.properties
@@ -0,0 +1,30 @@
+# ============LICENSE_START===================================================
+# Copyright (c) 2018 Amdocs
+# ============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=====================================================
+
+httpProtocol=file
+baseModelURI=src/test/resources/model-validation/model-reader/all-models.xml
+
+# the following fields are autowired but will never be used
+host=
+port=
+trustStorePath=
+keyStorePath=
+keyStorePassword.x=
+keyManagerFactoryAlgorithm=
+keyStoreType=
+securityProtocol=
+connectionTimeout=
+readTimeout=
diff --git a/src/test/resources/model-validation/model-reader/all-models.xml b/src/test/resources/model-validation/model-reader/all-models.xml
new file mode 100644
index 0000000..afc5dda
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/all-models.xml
@@ -0,0 +1,1370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<models xmlns="http://org.onap.aai.inventory/v7">
+    <model>
+        <model-name-version-id>22382f81-70cb-470d-8ab2-3e1b9fad10df</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>generic-vnf</model-name>
+        <model-id>6dcdbbc8-23b6-42c3-ac9f-2c0a3fe8cfba</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698747</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/43095b8a-8e9c-4a76-8490-6120140f6804/model-elements/model-element/41e6d6e5-aa69-4d33-b9f2-975bf418d1e3/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>43095b8a-8e9c-4a76-8490-6120140f6804</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>41e6d6e5-aa69-4d33-b9f2-975bf418d1e3</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/model-elements/model-element/17e48d38-e055-4158-ae6b-a170e8a647cd/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>0d23052d-8ffe-433e-a25d-da5da027bb7c</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>17e48d38-e055-4158-ae6b-a170e8a647cd</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/a97e8ab3-addd-40ee-9d29-3de505a56374/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>a97e8ab3-addd-40ee-9d29-3de505a56374</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/759ef1e4-3eca-4d55-8a9c-a8be31179f47/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>759ef1e4-3eca-4d55-8a9c-a8be31179f47</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>connector-widget-id</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>connector</model-name>
+        <model-id>connector-model-id</model-id>
+        <model-version>v2.0</model-version>
+        <resource-version>1466689944</resource-version>
+    </model>
+    <model>
+        <model-name-version-id>43095b8a-8e9c-4a76-8490-6120140f6804</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>vSbg</model-name>
+        <model-id>b23fb31b-4c21-45f7-9d92-96ed70e63df1</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>41e6d6e5-aa69-4d33-b9f2-975bf418d1e3</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698619</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/22382f81-70cb-470d-8ab2-3e1b9fad10df/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>22382f81-70cb-470d-8ab2-3e1b9fad10df</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/6cf69470-ccbf-4034-a37f-f714c135f05c/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>6cf69470-ccbf-4034-a37f-f714c135f05c</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/059db56c-6d72-4023-9fc3-0db29534ddff/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>059db56c-6d72-4023-9fc3-0db29534ddff</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>523f0645-8182-4c91-9d6a-2f968e923937</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>pserver</model-name>
+        <model-id>c277c968-7e2b-4a88-9094-2b8a55dfb9f4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698757</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/model-elements/model-element/0204aad0-fe13-4f75-b022-f91f245f0e9e/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>0204aad0-fe13-4f75-b022-f91f245f0e9e</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/a79552d6-20dc-4b9e-b4d4-f29a8a2a8447/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>a79552d6-20dc-4b9e-b4d4-f29a8a2a8447</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/41294247-9f7e-4abf-becd-3bbca6945c09/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>41294247-9f7e-4abf-becd-3bbca6945c09</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>99469866-95bb-400e-8786-f83e87696725</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>virtual-data-center</model-name>
+        <model-id>3c70c43f-99ed-4476-82f4-92a30616e512</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698727</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>ipe</model-name>
+        <model-id>e8f973a5-418a-44f2-9784-159e3e37d708</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698621</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</model-element-uuid>
+                        <new-data-del-flag>F</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698621</resource-version>
+                        <model-elements>
+                            <model-element>
+                                <model-element-uuid>ebc25508-b2e3-4021-b684-269cfd2b63c0</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698621</resource-version>
+                                <model-elements>
+                                    <model-element>
+                                        <model-element-uuid>f610d699-11af-4c13-a918-a89344e4a1bd</model-element-uuid>
+                                        <new-data-del-flag>T</new-data-del-flag>
+                                        <cardinality>unbounded</cardinality>
+                                        <linkage-points/>
+                                        <resource-version>1466698621</resource-version>
+                                        <relationship-list>
+                                            <relationship>
+                                                <related-to>model</related-to>
+                                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/49032ff1-5466-4054-b64b-15395ac10c00/</related-link>
+                                                <relationship-data>
+                                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                                    <relationship-value>49032ff1-5466-4054-b64b-15395ac10c00</relationship-value>
+                                                </relationship-data>
+                                                <related-to-property>
+                                                    <property-key>model.model-name</property-key>
+                                                    <property-value>vlan</property-value>
+                                                </related-to-property>
+                                                <related-to-property>
+                                                    <property-key>model.model-type</property-key>
+                                                    <property-value>widget</property-value>
+                                                </related-to-property>
+                                            </relationship>
+                                        </relationship-list>
+                                    </model-element>
+                                </model-elements>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0a706320-b8e7-4b18-9485-fba156ea00cf/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-name-version-id</relationship-key>
+                                            <relationship-value>0a706320-b8e7-4b18-9485-fba156ea00cf</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>l-interface</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>widget</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                        </model-elements>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/3d9f4b1d-360c-4862-9623-703b150157ce/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>3d9f4b1d-360c-4862-9623-703b150157ce</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>p-interface</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>widget</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/523f0645-8182-4c91-9d6a-2f968e923937/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>523f0645-8182-4c91-9d6a-2f968e923937</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>pserver</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/304ddca5-47cd-49ec-a2d7-1ce17baa5b70/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>304ddca5-47cd-49ec-a2d7-1ce17baa5b70</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/193ec825-44ce-4416-85ac-20a6b6663575/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>193ec825-44ce-4416-85ac-20a6b6663575</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>668464da-6d41-4599-bdbb-2576147b440e</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>WAN Connector v0.1</model-name>
+        <model-id>dc700a83-c507-47d9-b775-1fdfcdd5f9eb</model-id>
+        <model-version>0.1</model-version>
+        <model-description>Connects a customer vpn to the border elements of a vendor product</model-description>
+        <resource-version>1466698623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>93a37846-b497-490e-bc97-7d130022d6db</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698622</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>200de3d5-c207-47c2-a507-8846ba1d7068</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698622</resource-version>
+                        <model-elements>
+                            <model-element>
+                                <model-element-uuid>7ccfe6b5-6566-4b44-83d3-b79f5de7a87b</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698622</resource-version>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-name-version-id</relationship-key>
+                                            <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>VL ELAN</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>resource</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                            <model-element>
+                                <model-element-uuid>dfd30146-74f4-49e9-bad6-019d413352ac</model-element-uuid>
+                                <new-data-del-flag>T</new-data-del-flag>
+                                <cardinality>unbounded</cardinality>
+                                <linkage-points/>
+                                <resource-version>1466698622</resource-version>
+                                <relationship-list>
+                                    <relationship>
+                                        <related-to>model</related-to>
+                                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/</related-link>
+                                        <relationship-data>
+                                            <relationship-key>model.model-name-version-id</relationship-key>
+                                            <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                                        </relationship-data>
+                                        <related-to-property>
+                                            <property-key>model.model-name</property-key>
+                                            <property-value>vLAN on a Physical Wire</property-value>
+                                        </related-to-property>
+                                        <related-to-property>
+                                            <property-key>model.model-type</property-key>
+                                            <property-value>resource</property-value>
+                                        </related-to-property>
+                                    </relationship>
+                                </relationship-list>
+                            </model-element>
+                        </model-elements>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/99469866-95bb-400e-8786-f83e87696725/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>99469866-95bb-400e-8786-f83e87696725</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>virtual-data-center</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>widget</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/15f47352-28b7-4bbd-9828-393eaf79eeff/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>15f47352-28b7-4bbd-9828-393eaf79eeff</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>connector</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <metadata>
+            <metadatum>
+                <metaname>product</metaname>
+                <metaval>product-value-1</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+            <metadatum>
+                <metaname>vpn-id</metaname>
+                <metaval>vpn-id-value-1</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+        </metadata>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/460c6de2-a92b-4e3b-9ba3-538ce782b2fa/model-elements/model-element/71b825be-febf-45f7-b86a-ca0e3de19c90/model-elements/model-element/986167cb-57d3-4aad-8896-784a22c5289c/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>71b825be-febf-45f7-b86a-ca0e3de19c90</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>986167cb-57d3-4aad-8896-784a22c5289c</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</model-name-version-id>
+        <model-type>service</model-type>
+        <model-name>WAN Bonding v0.1</model-name>
+        <model-id>0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1</model-id>
+        <model-version>0.1</model-version>
+        <model-description>service-instance of the wan object</model-description>
+        <resource-version>1466698623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>71b825be-febf-45f7-b86a-ca0e3de19c90</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698623</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>986167cb-57d3-4aad-8896-784a22c5289c</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698623</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>WAN Connector v0.1</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/46b92144-923a-4d20-b85a-3cbd847668a9/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>46b92144-923a-4d20-b85a-3cbd847668a9</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>service-instance</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <metadata>
+            <metadatum>
+                <metaname>b</metaname>
+                <metaval>product</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+            <metadatum>
+                <metaname>a</metaname>
+                <metaval>vpn-id</metaval>
+                <resource-version>1466698623</resource-version>
+            </metadatum>
+        </metadata>
+    </model>
+    <model>
+        <model-name-version-id>generic-vnf-widget-id</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>generic-vnf</model-name>
+        <model-id>generic-vnf-model-id</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466624623</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/vMME-resource-id/model-elements/model-element/af4b6df2-65d0-4d10-b25e-02206799e1fa/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>vMME-resource-id</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>af4b6df2-65d0-4d10-b25e-02206799e1fa</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>pBgf</model-name>
+        <model-id>9038f1d7-61f2-49ef-a61d-ace468d4ab32</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>0204aad0-fe13-4f75-b022-f91f245f0e9e</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698620</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/523f0645-8182-4c91-9d6a-2f968e923937/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>523f0645-8182-4c91-9d6a-2f968e923937</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>pserver</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/ad161a89-ef32-4b2c-b86d-7fbb7a251571/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ad161a89-ef32-4b2c-b86d-7fbb7a251571</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/d0d50aad-bb97-4865-a3bb-72dbf41be50b/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>d0d50aad-bb97-4865-a3bb-72dbf41be50b</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>15f47352-28b7-4bbd-9828-393eaf79eeff</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>connector</model-name>
+        <model-id>4f0dbd2d-b667-4d19-a563-84a764e62fa7</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698717</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>682ae094-0aaa-4381-a55d-bc633c40e4c0</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>vLAN on a Physical Wire</model-name>
+        <model-id>32bee148-2cae-4f3d-a42e-22c9e4f078a2</model-id>
+        <model-version>1</model-version>
+        <model-description>An l2-bridge used by a wan connector connects an ipe to a BGF </model-description>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698622</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>d0d50aad-bb97-4865-a3bb-72dbf41be50b</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698622</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>pBgf</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>logical-link</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/dfd30146-74f4-49e9-bad6-019d413352ac/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>dfd30146-74f4-49e9-bad6-019d413352ac</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>46b92144-923a-4d20-b85a-3cbd847668a9</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>service-instance</model-name>
+        <model-id>82194af1-3c2c-485a-8f44-420e22a9eaa4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698646</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/460c6de2-a92b-4e3b-9ba3-538ce782b2fa/model-elements/model-element/71b825be-febf-45f7-b86a-ca0e3de19c90/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>460c6de2-a92b-4e3b-9ba3-538ce782b2fa</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>71b825be-febf-45f7-b86a-ca0e3de19c90</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>3d9f4b1d-360c-4862-9623-703b150157ce</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>p-interface</model-name>
+        <model-id>479f5f13-51d9-4ccb-bddf-f554f1af0cfc</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698621</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>0d23052d-8ffe-433e-a25d-da5da027bb7c</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>vDbe</model-name>
+        <model-id>fe8aac07-ce6c-4f9f-aa0d-b561c77da9e8</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>17e48d38-e055-4158-ae6b-a170e8a647cd</model-element-uuid>
+                <new-data-del-flag>F</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698618</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/22382f81-70cb-470d-8ab2-3e1b9fad10df/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>22382f81-70cb-470d-8ab2-3e1b9fad10df</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/1d73a0dc-e7f6-4b6d-9450-5dda720d1a7f/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>1d73a0dc-e7f6-4b6d-9450-5dda720d1a7f</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/a1b205ea-17bb-442b-83a3-38b4e0fcb099/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>a1b205ea-17bb-442b-83a3-38b4e0fcb099</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>vMME-resource-id</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>vMME</model-name>
+        <model-id>vMME-model-id</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466624623</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>af4b6df2-65d0-4d10-b25e-02206799e1fa</model-element-uuid>
+                <new-data-del-flag>true</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466624623</resource-version>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/generic-vnf-widget-id/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>generic-vnf-widget-id</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>generic-vnf</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+    </model>
+    <model>
+        <model-name-version-id>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>logical-link</model-name>
+        <model-id>8742d5b3-ee98-4165-8bd5-fc012a7885b9</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698737</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>c44dbdf9-494e-49c1-b462-74e24e837b22</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>682ae094-0aaa-4381-a55d-bc633c40e4c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>9ce59457-81b7-4f0e-8b72-a044a1be4bdf</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>0a706320-b8e7-4b18-9485-fba156ea00cf</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>l-interface</model-name>
+        <model-id>d9131b0d-698f-4297-8699-af0a3ac7ebdc</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698767</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/model-elements/model-element/ebc25508-b2e3-4021-b684-269cfd2b63c0/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ebc25508-b2e3-4021-b684-269cfd2b63c0</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/29ac58b9-37fa-4d6a-9d2e-29f33e1e3b7a/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>be890aae-cf27-4b6a-aeae-e6fa4b5ee17f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>1ac142fb-2caf-4f59-975e-8ad7631c301e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>311f1cad-b41c-4833-8b9f-0d54d85f9009</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc38d8ae-0993-4426-af79-a7aff4a4b4f3</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>29ac58b9-37fa-4d6a-9d2e-29f33e1e3b7a</relationship-value>
+                </relationship-data>
+            </relationship>
+            <relationship>
+                <related-to>named-query-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/eda1554f-3eff-4195-9185-bcbc4f75826f/</related-link>
+                <relationship-data>
+                    <relationship-key>named-query.named-query-uuid</relationship-key>
+                    <relationship-value>55f38763-9820-4fce-82a1-e0fa3c38ed24</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>dc799ed9-45a5-4323-a2dc-bd1ec3242499</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>97ae5271-9ad9-4815-804d-89af014d5b07</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>7d189446-54de-49db-b786-8e946f0aece5</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>920399b7-21c1-4e81-8fb9-a3b2283a72ba</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>named-query-element.named-query-element-uuid</relationship-key>
+                    <relationship-value>eda1554f-3eff-4195-9185-bcbc4f75826f</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>49032ff1-5466-4054-b64b-15395ac10c00</model-name-version-id>
+        <model-type>widget</model-type>
+        <model-name>vlan</model-name>
+        <model-id>2febb0bc-b776-45b3-af50-75a578a8a4c4</model-id>
+        <model-version>v1.0</model-version>
+        <resource-version>1466698621</resource-version>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/model-elements/model-element/ebc25508-b2e3-4021-b684-269cfd2b63c0/model-elements/model-element/f610d699-11af-4c13-a918-a89344e4a1bd/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>76624fe1-0f28-4e17-ae9f-f0e2bba6d13d</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>b7b48ba6-427b-4d23-ada7-a67ac9e0f84f</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>ebc25508-b2e3-4021-b684-269cfd2b63c0</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>f610d699-11af-4c13-a918-a89344e4a1bd</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+    <model>
+        <model-name-version-id>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</model-name-version-id>
+        <model-type>resource</model-type>
+        <model-name>VL ELAN</model-name>
+        <model-id>932518e5-4260-4cc4-8038-df604a367f85</model-id>
+        <model-version>1</model-version>
+        <model-description>An l2-bridge used by a wan connector connects an ipe to a SBG or DBE</model-description>
+        <resource-version>1466698622</resource-version>
+        <model-elements>
+            <model-element>
+                <model-element-uuid>c44dbdf9-494e-49c1-b462-74e24e837b22</model-element-uuid>
+                <new-data-del-flag>T</new-data-del-flag>
+                <cardinality>unbounded</cardinality>
+                <linkage-points/>
+                <resource-version>1466698621</resource-version>
+                <model-elements>
+                    <model-element>
+                        <model-element-uuid>a1b205ea-17bb-442b-83a3-38b4e0fcb099</model-element-uuid>
+                        <new-data-del-flag>T</new-data-del-flag>
+                        <cardinality>unbounded</cardinality>
+                        <linkage-points/>
+                        <resource-version>1466698621</resource-version>
+                        <relationship-list>
+                            <relationship>
+                                <related-to>model</related-to>
+                                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/</related-link>
+                                <relationship-data>
+                                    <relationship-key>model.model-name-version-id</relationship-key>
+                                    <relationship-value>0d23052d-8ffe-433e-a25d-da5da027bb7c</relationship-value>
+                                </relationship-data>
+                                <related-to-property>
+                                    <property-key>model.model-name</property-key>
+                                    <property-value>vDbe</property-value>
+                                </related-to-property>
+                                <related-to-property>
+                                    <property-key>model.model-type</property-key>
+                                    <property-value>resource</property-value>
+                                </related-to-property>
+                            </relationship>
+                        </relationship-list>
+                    </model-element>
+                </model-elements>
+                <relationship-list>
+                    <relationship>
+                        <related-to>model</related-to>
+                        <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/</related-link>
+                        <relationship-data>
+                            <relationship-key>model.model-name-version-id</relationship-key>
+                            <relationship-value>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</relationship-value>
+                        </relationship-data>
+                        <related-to-property>
+                            <property-key>model.model-name</property-key>
+                            <property-value>logical-link</property-value>
+                        </related-to-property>
+                        <related-to-property>
+                            <property-key>model.model-type</property-key>
+                            <property-value>widget</property-value>
+                        </related-to-property>
+                    </relationship>
+                </relationship-list>
+            </model-element>
+        </model-elements>
+        <relationship-list>
+            <relationship>
+                <related-to>model-element</related-to>
+                <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/7ccfe6b5-6566-4b44-83d3-b79f5de7a87b/</related-link>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+                </relationship-data>
+                <relationship-data>
+                    <relationship-key>model-element.model-element-uuid</relationship-key>
+                    <relationship-value>7ccfe6b5-6566-4b44-83d3-b79f5de7a87b</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model>
+</models>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-1.xml b/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-1.xml
new file mode 100644
index 0000000..e60416c
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-1.xml
@@ -0,0 +1,51 @@
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<model>
+	<model-name-version-id>connector-widget-id</model-name-version-id>
+	<model-type>widget</model-type>
+	<model-name>connector</model-name>
+	<model-id>connector-model-id</model-id>
+	<model-version>v1.0</model-version>
+	<resource-version>1466417894</resource-version>
+	<metadata>
+		<metadatum>
+			<metaname>vpn-id</metaname>
+			<metaval>a</metaval>
+			<resource-version>1466417844</resource-version>
+		</metadatum>
+		<metadatum>
+			<metaname>product</metaname>
+			<metaval>b</metaval>
+			<resource-version>1466417844</resource-version>
+		</metadatum>
+	</metadata>
+	<relationship-list>
+		<relationship>
+			<related-to>model-element</related-to>
+			<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/54629607-160a-4dcf-8c5c-15b8a3756f9a/</related-link>
+			<relationship-data>
+				<relationship-key>model-element.model-element-uuid</relationship-key>
+				<relationship-value>54629607-160a-4dcf-8c5c-15b8a3756f9a</relationship-value>
+			</relationship-data>
+			<relationship-data>
+				<relationship-key>model.model-name-version-id</relationship-key>
+				<relationship-value>wan-connector-service-id</relationship-value>
+			</relationship-data>
+		</relationship>
+	</relationship-list>
+</model>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-2.xml b/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-2.xml
new file mode 100644
index 0000000..924ce67
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-2.xml
@@ -0,0 +1,79 @@
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<model>
+	<model-name-version-id>connector-widget-id</model-name-version-id>
+	<model-type>widget</model-type>
+	<model-name>connector</model-name>
+	<model-id>connector-model-id</model-id>
+	<model-version>v1.0</model-version>
+	<resource-version>1466417894</resource-version>
+	<model-elements>
+		<model-element>
+			<model-element-uuid>8c0fd413-0d2b-491b-ad14-10c434c359bb</model-element-uuid>
+			<new-data-del-flag>T</new-data-del-flag>
+			<cardinality>unbounded</cardinality>
+			<linkage-points/>
+			<resource-version>1466417894</resource-version>
+			<model-constraints/>
+			<relationship-list>
+				<relationship>
+					<related-to>model</related-to>
+					<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/virtual-data-center-widget-id/</related-link>
+					<relationship-data>
+						<relationship-key>model.model-name-version-id</relationship-key>
+						<relationship-value>virtual-data-center-widget-id</relationship-value>
+					</relationship-data>
+					<related-to-property>
+						<property-key>model.model-name</property-key>
+						<property-value>virtual-data-center</property-value>
+					</related-to-property>
+					<related-to-property>
+						<property-key>model.model-type</property-key>
+						<property-value>widget</property-value>
+					</related-to-property>
+				</relationship>
+			</relationship-list>
+		</model-element>
+	</model-elements>
+	<metadata>
+		<metadatum>
+			<metaname>vpn-id</metaname>
+			<metaval>a</metaval>
+			<resource-version>1466417844</resource-version>
+		</metadatum>
+		<metadatum>
+			<metaname>product</metaname>
+			<metaval>b</metaval>
+			<resource-version>1466417844</resource-version>
+		</metadatum>
+	</metadata>
+	<relationship-list>
+		<relationship>
+			<related-to>model-element</related-to>
+			<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/54629607-160a-4dcf-8c5c-15b8a3756f9a/</related-link>
+			<relationship-data>
+				<relationship-key>model-element.model-element-uuid</relationship-key>
+				<relationship-value>54629607-160a-4dcf-8c5c-15b8a3756f9a</relationship-value>
+			</relationship-data>
+			<relationship-data>
+				<relationship-key>model.model-name-version-id</relationship-key>
+				<relationship-value>wan-connector-service-id</relationship-value>
+			</relationship-data>
+		</relationship>
+	</relationship-list>
+</model>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/connector-widget-id.xml b/src/test/resources/model-validation/model-reader/connector-widget-id.xml
new file mode 100644
index 0000000..bd2edfc
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/connector-widget-id.xml
@@ -0,0 +1,107 @@
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<model>
+	<model-name-version-id>connector-widget-id</model-name-version-id>
+	<model-type>widget</model-type>
+	<model-name>connector</model-name>
+	<model-id>connector-model-id</model-id>
+	<model-version>v1.0</model-version>
+	<resource-version>1466417894</resource-version>
+	<model-elements>
+		<model-element>
+			<model-element-uuid>8c0fd413-0d2b-491b-ad14-10c434c359bb</model-element-uuid>
+			<new-data-del-flag>T</new-data-del-flag>
+			<cardinality>unbounded</cardinality>
+			<linkage-points/>
+			<resource-version>1466417894</resource-version>
+			<model-elements>
+				<model-element>
+					<model-element-uuid>6d2dbb11-d509-4e03-8ed9-05bf4aad99d2</model-element-uuid>
+					<new-data-del-flag>T</new-data-del-flag>
+					<cardinality>unbounded</cardinality>
+					<linkage-points/>
+					<resource-version>1466417894</resource-version>
+					<model-constraints/>
+					<relationship-list>
+						<relationship>
+							<related-to>model</related-to>
+							<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/l2-bridge-for-wan-connector-resource-id/</related-link>
+							<relationship-data>
+								<relationship-key>model.model-name-version-id</relationship-key>
+								<relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+							</relationship-data>
+							<related-to-property>
+								<property-key>model.model-name</property-key>
+								<property-value>l2-bridge-for-wan-connector</property-value>
+							</related-to-property>
+							<related-to-property>
+								<property-key>model.model-type</property-key>
+								<property-value>resource</property-value>
+							</related-to-property>
+						</relationship>
+					</relationship-list>
+				</model-element>
+			</model-elements>
+			<model-constraints/>
+			<relationship-list>
+				<relationship>
+					<related-to>model</related-to>
+					<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/virtual-data-center-widget-id/</related-link>
+					<relationship-data>
+						<relationship-key>model.model-name-version-id</relationship-key>
+						<relationship-value>virtual-data-center-widget-id</relationship-value>
+					</relationship-data>
+					<related-to-property>
+						<property-key>model.model-name</property-key>
+						<property-value>virtual-data-center</property-value>
+					</related-to-property>
+					<related-to-property>
+						<property-key>model.model-type</property-key>
+						<property-value>widget</property-value>
+					</related-to-property>
+				</relationship>
+			</relationship-list>
+		</model-element>
+	</model-elements>
+	<metadata>
+		<metadatum>
+			<metaname>vpn-id</metaname>
+			<metaval>a</metaval>
+			<resource-version>1466417844</resource-version>
+		</metadatum>
+		<metadatum>
+			<metaname>product</metaname>
+			<metaval>b</metaval>
+			<resource-version>1466417844</resource-version>
+		</metadatum>
+	</metadata>
+	<relationship-list>
+		<relationship>
+			<related-to>model-element</related-to>
+			<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/54629607-160a-4dcf-8c5c-15b8a3756f9a/</related-link>
+			<relationship-data>
+				<relationship-key>model-element.model-element-uuid</relationship-key>
+				<relationship-value>54629607-160a-4dcf-8c5c-15b8a3756f9a</relationship-value>
+			</relationship-data>
+			<relationship-data>
+				<relationship-key>model.model-name-version-id</relationship-key>
+				<relationship-value>wan-connector-service-id</relationship-value>
+			</relationship-data>
+		</relationship>
+	</relationship-list>
+</model>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/logical-link-widget-id.xml b/src/test/resources/model-validation/model-reader/logical-link-widget-id.xml
new file mode 100644
index 0000000..39c08a3
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/logical-link-widget-id.xml
@@ -0,0 +1,181 @@
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<model>
+    <model-name-version-id>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</model-name-version-id>
+    <model-type>resource</model-type>
+    <model-name>VL ELAN</model-name>
+    <model-id>932518e5-4260-4cc4-8038-df604a367f85</model-id>
+    <model-version>1</model-version>
+    <model-description>An l2-bridge used by a wan connector connects an ipe to a SBG or DBE</model-description>
+    <resource-version>1466698622</resource-version>
+    <model-elements>
+        <model-element>
+            <model-element-uuid>c44dbdf9-494e-49c1-b462-74e24e837b22</model-element-uuid>
+            <new-data-del-flag>T</new-data-del-flag>
+            <cardinality>unbounded</cardinality>
+            <linkage-points/>
+            <resource-version>1466698621</resource-version>
+            <model-elements>
+                <model-element>
+                    <model-element-uuid>ad161a89-ef32-4b2c-b86d-7fbb7a251571</model-element-uuid>
+                    <new-data-del-flag>T</new-data-del-flag>
+                    <cardinality>unbounded</cardinality>
+                    <linkage-points/>
+                    <resource-version>1466698621</resource-version>
+                    <relationship-list>
+                        <relationship>
+                            <related-to>model</related-to>
+                            <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/</related-link>
+                            <relationship-data>
+                                <relationship-key>model.model-name-version-id</relationship-key>
+                                <relationship-value>6614ffae-6e64-4c78-9dea-4d5c0f057ea2</relationship-value>
+                            </relationship-data>
+                            <related-to-property>
+                                <property-key>model.model-name</property-key>
+                                <property-value>pBgf</property-value>
+                            </related-to-property>
+                            <related-to-property>
+                                <property-key>model.model-type</property-key>
+                                <property-value>resource</property-value>
+                            </related-to-property>
+                        </relationship>
+                    </relationship-list>
+                </model-element>
+                <model-element>
+                    <model-element-uuid>a1b205ea-17bb-442b-83a3-38b4e0fcb099</model-element-uuid>
+                    <new-data-del-flag>T</new-data-del-flag>
+                    <cardinality>unbounded</cardinality>
+                    <linkage-points/>
+                    <resource-version>1466698621</resource-version>
+                    <relationship-list>
+                        <relationship>
+                            <related-to>model</related-to>
+                            <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/</related-link>
+                            <relationship-data>
+                                <relationship-key>model.model-name-version-id</relationship-key>
+                                <relationship-value>0d23052d-8ffe-433e-a25d-da5da027bb7c</relationship-value>
+                            </relationship-data>
+                            <related-to-property>
+                                <property-key>model.model-name</property-key>
+                                <property-value>vDbe</property-value>
+                            </related-to-property>
+                            <related-to-property>
+                                <property-key>model.model-type</property-key>
+                                <property-value>resource</property-value>
+                            </related-to-property>
+                        </relationship>
+                    </relationship-list>
+                </model-element>
+                <model-element>
+                    <model-element-uuid>193ec825-44ce-4416-85ac-20a6b6663575</model-element-uuid>
+                    <new-data-del-flag>T</new-data-del-flag>
+                    <cardinality>unbounded</cardinality>
+                    <linkage-points>
+                        <linkage-point>pserver|lag-interface|l-interface</linkage-point>
+                        <linkage-point>pserver|p-interface|l-interface</linkage-point>
+                        <linkage-point>vlan|l-interface</linkage-point>
+                    </linkage-points>
+                    <resource-version>1466698621</resource-version>
+                    <relationship-list>
+                        <relationship>
+                            <related-to>model</related-to>
+                            <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/</related-link>
+                            <relationship-data>
+                                <relationship-key>model.model-name-version-id</relationship-key>
+                                <relationship-value>5ed1c299-4d31-4531-ae43-4bb56f8f10c8</relationship-value>
+                            </relationship-data>
+                            <related-to-property>
+                                <property-key>model.model-name</property-key>
+                                <property-value>ipe</property-value>
+                            </related-to-property>
+                            <related-to-property>
+                                <property-key>model.model-type</property-key>
+                                <property-value>resource</property-value>
+                            </related-to-property>
+                        </relationship>
+                    </relationship-list>
+                </model-element>
+                <model-element>
+                    <model-element-uuid>059db56c-6d72-4023-9fc3-0db29534ddff</model-element-uuid>
+                    <new-data-del-flag>T</new-data-del-flag>
+                    <cardinality>unbounded</cardinality>
+                    <linkage-points/>
+                    <resource-version>1466698621</resource-version>
+                    <relationship-list>
+                        <relationship>
+                            <related-to>model</related-to>
+                            <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/43095b8a-8e9c-4a76-8490-6120140f6804/</related-link>
+                            <relationship-data>
+                                <relationship-key>model.model-name-version-id</relationship-key>
+                                <relationship-value>43095b8a-8e9c-4a76-8490-6120140f6804</relationship-value>
+                            </relationship-data>
+                            <related-to-property>
+                                <property-key>model.model-name</property-key>
+                                <property-value>vSbg</property-value>
+                            </related-to-property>
+                            <related-to-property>
+                                <property-key>model.model-type</property-key>
+                                <property-value>resource</property-value>
+                            </related-to-property>
+                        </relationship>
+                    </relationship-list>
+                </model-element>
+            </model-elements>
+            <relationship-list>
+                <relationship>
+                    <related-to>model</related-to>
+                    <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/</related-link>
+                    <relationship-data>
+                        <relationship-key>model.model-name-version-id</relationship-key>
+                        <relationship-value>fa01ef50-bbb5-49d4-91d1-ebbda9816e01</relationship-value>
+                    </relationship-data>
+                    <related-to-property>
+                        <property-key>model.model-name</property-key>
+                        <property-value>logical-link</property-value>
+                    </related-to-property>
+                    <related-to-property>
+                        <property-key>model.model-type</property-key>
+                        <property-value>widget</property-value>
+                    </related-to-property>
+                </relationship>
+            </relationship-list>
+        </model-element>
+    </model-elements>
+    <relationship-list>
+        <relationship>
+            <related-to>model-element</related-to>
+            <related-link>https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/7ccfe6b5-6566-4b44-83d3-b79f5de7a87b/</related-link>
+            <relationship-data>
+                <relationship-key>model.model-name-version-id</relationship-key>
+                <relationship-value>668464da-6d41-4599-bdbb-2576147b440e</relationship-value>
+            </relationship-data>
+            <relationship-data>
+                <relationship-key>model-element.model-element-uuid</relationship-key>
+                <relationship-value>93a37846-b497-490e-bc97-7d130022d6db</relationship-value>
+            </relationship-data>
+            <relationship-data>
+                <relationship-key>model-element.model-element-uuid</relationship-key>
+                <relationship-value>200de3d5-c207-47c2-a507-8846ba1d7068</relationship-value>
+            </relationship-data>
+            <relationship-data>
+                <relationship-key>model-element.model-element-uuid</relationship-key>
+                <relationship-value>7ccfe6b5-6566-4b44-83d3-b79f5de7a87b</relationship-value>
+            </relationship-data>
+        </relationship>
+    </relationship-list>
+</model>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-1.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-1.json
new file mode 100644
index 0000000..916f898
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-1.json
@@ -0,0 +1,11 @@
+[
+	{
+		"mappingType": "ATTRIBUTE",
+		"model": {
+			"value": "metadata/metadatum/metaname"
+		},
+		"instance": {
+			"value": "$..metadata.metadatum[*].metaname"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-2.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-2.json
new file mode 100644
index 0000000..7bd8829
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-2.json
@@ -0,0 +1,11 @@
+[
+	{
+		"mappingType": "ATTRIBUTE",
+		"model": {
+			"value": "unkown"
+		},
+		"instance": {
+			"value": "$..metadata.metadatum[*].metaname"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-1.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-1.json
new file mode 100644
index 0000000..4d550f0
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-1.json
@@ -0,0 +1,18 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["INVALID_TYPE"]
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-2.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-2.json
new file mode 100644
index 0000000..2c9799e
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-2.json
@@ -0,0 +1,18 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": []
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-3.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-3.json
new file mode 100644
index 0000000..6442d7b
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-3.json
@@ -0,0 +1,17 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']"
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-4.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-4.json
new file mode 100644
index 0000000..4f50042
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-4.json
@@ -0,0 +1,18 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "INVALID_PATH",
+				"valid": ["widget"]
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-5.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-5.json
new file mode 100644
index 0000000..8085cfd
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-5.json
@@ -0,0 +1,17 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"valid": ["widget"]
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-6.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-6.json
new file mode 100644
index 0000000..67be561
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-6.json
@@ -0,0 +1,14 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']"
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-1.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-1.json
new file mode 100644
index 0000000..de11bb2
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-1.json
@@ -0,0 +1,18 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "INVALID_ROOT",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["widget"]
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-2.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-2.json
new file mode 100644
index 0000000..7bc88ae
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-2.json
@@ -0,0 +1,17 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["widget"]
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-with-id.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-with-id.json
new file mode 100644
index 0000000..2c9799e
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-with-id.json
@@ -0,0 +1,18 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": []
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships.json
new file mode 100644
index 0000000..89bcae9
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships.json
@@ -0,0 +1,18 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["widget"]
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+		}
+	}
+]
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/test-validation-service-beans.xml b/src/test/resources/model-validation/model-reader/test-validation-service-beans.xml
new file mode 100644
index 0000000..81dab3e
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/test-validation-service-beans.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder location="classpath:model-validation/model-reader/aai-environment.properties" ignore-unresolvable="true" />
+	<context:property-placeholder location="classpath:model-validation/model-reader/validation-service.properties" ignore-unresolvable="true" />
+
+	<bean id="modelConfig" class="org.onap.aai.validation.config.ModelConfig">
+		<property name="modelCacheExpirySeconds" value="${model.cache.expirySeconds}" />
+	</bean>
+
+	<bean id="restConfig" class="org.onap.aai.validation.config.RestConfig">
+		<property name="host" value="${host}" />
+		<property name="port" value="${port}" />
+		<property name="protocol" value="${httpProtocol}" />
+		<property name="baseModelURI" value="${baseModelURI}" />
+		<property name="trustStorePath" value="${trustStorePath}" />
+		<property name="trustStorePassword" value="${trustStorePassword.x}" />
+		<property name="keyStorePath" value="${keyStorePath}" />
+		<property name="keyStorePassword" value="${keyStorePassword.x}" />
+		<property name="keyManagerFactoryAlgorithm" value="${keyManagerFactoryAlgorithm}" />
+		<property name="keyStoreType" value="${keyStoreType}" />
+		<property name="securityProtocol" value="${securityProtocol}" />
+		<property name="connectionTimeout" value="${connectionTimeout}" />
+		<property name="readTimeout" value="${readTimeout}" />
+	</bean>
+
+	<bean id="modelCacheManager" class="org.onap.aai.validation.modeldriven.ModelCacheManager">
+		<constructor-arg ref="modelConfig" />
+		<constructor-arg ref="restConfig" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/src/test/resources/model-validation/model-reader/validation-service.properties b/src/test/resources/model-validation/model-reader/validation-service.properties
new file mode 100644
index 0000000..4e1b264
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/validation-service.properties
@@ -0,0 +1,29 @@
+# ============LICENSE_START===================================================
+# Copyright (c) 2018 Amdocs
+# ============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=====================================================
+
+topic.publish.enable=true
+topic.publish.retries=3
+topic.consume.enable=true
+topic.consume.polling.interval.seconds=3
+
+event.domain=devINT1
+event.action.exclude=DELETE
+event.type.rule=AAI-EVENT,AAI-DATA-EXPORT-API,GIZMO-EVENT
+event.type.model=AAI-DATA-EXPORT-NQ
+event.type.end=END-EVENT
+
+model.cache.expirySeconds=3
+aai.oxm.version=12
diff --git a/src/test/resources/model-validation/model-reader/virtual-data-center-widget-id.xml b/src/test/resources/model-validation/model-reader/virtual-data-center-widget-id.xml
new file mode 100644
index 0000000..aadee37
--- /dev/null
+++ b/src/test/resources/model-validation/model-reader/virtual-data-center-widget-id.xml
@@ -0,0 +1,72 @@
+<!--
+============LICENSE_START===================================================
+Copyright (c) 2018 Amdocs
+============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=====================================================
+-->
+<model>
+	<model-name-version-id>virtual-data-center-widget-id</model-name-version-id>
+	<model-type>widget</model-type>
+	<model-name>virtual-data-center</model-name>
+	<model-id>vdc-model-id</model-id>
+	<model-version>v1.0</model-version>
+	<resource-version>1466417894</resource-version>
+	<model-elements>
+		<model-element>
+			<model-element-uuid>6d2dbb11-d509-4e03-8ed9-05bf4aad99d2</model-element-uuid>
+			<new-data-del-flag>T</new-data-del-flag>
+			<cardinality>unbounded</cardinality>
+			<linkage-points/>
+			<resource-version>1466417894</resource-version>
+			<model-constraints/>
+			<relationship-list>
+				<relationship>
+					<related-to>model</related-to>
+					<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/l2-bridge-for-wan-connector-resource-id/</related-link>
+					<relationship-data>
+						<relationship-key>model.model-name-version-id</relationship-key>
+						<relationship-value>e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161</relationship-value>
+					</relationship-data>
+					<related-to-property>
+						<property-key>model.model-name</property-key>
+						<property-value>l2-bridge-for-wan-connector</property-value>
+					</related-to-property>
+					<related-to-property>
+						<property-key>model.model-type</property-key>
+						<property-value>resource</property-value>
+					</related-to-property>
+				</relationship>
+			</relationship-list>
+		</model-element>
+	</model-elements>
+	<metadata/>
+	<relationship-list>
+		<relationship>
+			<related-to>model-element</related-to>
+			<related-link>https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/8c0fd413-0d2b-491b-ad14-10c434c359bb/</related-link>
+			<relationship-data>
+				<relationship-key>model-element.model-element-uuid</relationship-key>
+				<relationship-value>8c0fd413-0d2b-491b-ad14-10c434c359bb</relationship-value>
+			</relationship-data>
+			<relationship-data>
+				<relationship-key>model-element.model-element-uuid</relationship-key>
+				<relationship-value>54629607-160a-4dcf-8c5c-15b8a3756f9a</relationship-value>
+			</relationship-data>
+			<relationship-data>
+				<relationship-key>model.model-name-version-id</relationship-key>
+				<relationship-value>wan-connector-service-id</relationship-value>
+			</relationship-data>
+		</relationship>
+	</relationship-list>
+</model>
\ No newline at end of file