aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/resources/generatedXml
diff options
context:
space:
mode:
authorPolavarapu, Chaitanya (cp8128) <cp8128@att.com>2021-02-12 13:32:33 -0500
committerPolavarapu, Chaitanya (cp8128) <cp8128@att.com>2021-02-23 15:54:08 -0500
commit7f592e87a5ba61a8538d6f399f3778b884a9b3ce (patch)
treee08612504770b164d28b70a9008cae04d37738a7 /src/test/resources/generatedXml
parentde97feac66e234a0ebea9bf0774aa01136f3c04f (diff)
Updated pom to remove distribution-management section and corrected aai base image version
Issue-ID: AAI-2996 Change-Id: I28da9ccf5618e180e04e3f29b0440bab5e3ffc3f Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
Diffstat (limited to 'src/test/resources/generatedXml')
-rw-r--r--src/test/resources/generatedXml/AAI-COS_AVPN-service-1.0.xml70
-rw-r--r--src/test/resources/generatedXml/AAI-ExtVL-resource-40.0.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-ExtVL-resource-48.0.xml32
-rw-r--r--src/test/resources/generatedXml/AAI-Fabric Configuration-resource-10.0.xml32
-rw-r--r--src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml4
-rw-r--r--src/test/resources/generatedXml/AAI-Network Cloud VNF MOCK-resource-1.0.xml69
-rw-r--r--src/test/resources/generatedXml/AAI-Network Cloud VNF Service MOCK-service-1.0.xml51
-rw-r--r--src/test/resources/generatedXml/AAI-Network Res 1806-resource-4.0.xml51
-rw-r--r--src/test/resources/generatedXml/AAI-Network Res 1806..NetworkCollection..0-resource-1.xml50
-rw-r--r--src/test/resources/generatedXml/AAI-NetworkCloudVnfMock..NC1_Test_Heat_08152018_base..module-0-resource-1.xml123
-rw-r--r--src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml4
-rw-r--r--src/test/resources/generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-RG_collector_6-15-service-1.0.xml52
-rw-r--r--src/test/resources/generatedXml/AAI-SCP-Test-VSP-resource-1.0.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-SD-WAN-Test-VSP-resource-1.0.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-ScpTestVsp..asc_heat-int2..module-0-resource-1.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-SdWanTestVsp..DUMMY..module-0-resource-2.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-TEST CR_1-resource-7.0.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-TEST SVC_1-service-1.0.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-Tunnel_XConnTest-resource-2.0.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-VLAN Network Receptor Configuration-resource-3.0.xml32
-rw-r--r--src/test/resources/generatedXml/AAI-VRF Entry Configuration-resource-3.0.xml32
-rw-r--r--src/test/resources/generatedXml/AAI-Vscpaas_Test-service-1.0.xml51
-rw-r--r--src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml4
-rw-r--r--src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-oam_group-resource-3.xml123
-rw-r--r--src/test/resources/generatedXml/AAI-testcr_1..NetworkCollection..0-resource-1.xml2
-rw-r--r--src/test/resources/generatedXml/AAI-untr_group-resource-3.xml123
-rw-r--r--src/test/resources/generatedXml/AAI-vDBE-resource-0.5.xml87
-rw-r--r--src/test/resources/generatedXml/AAI-vDBE_srv-service-1.0.xml52
-rw-r--r--src/test/resources/generatedXml/AAI-vdbe0..Vdbe..main..module-0-resource-2.xml141
32 files changed, 1189 insertions, 18 deletions
diff --git a/src/test/resources/generatedXml/AAI-COS_AVPN-service-1.0.xml b/src/test/resources/generatedXml/AAI-COS_AVPN-service-1.0.xml
new file mode 100644
index 0000000..e63b4c3
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-COS_AVPN-service-1.0.xml
@@ -0,0 +1,70 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>4b95b343-a640-4e87-8587-945ac2748eca</model-invariant-id>
+ <model-type>service</model-type>
+ <model-role>Network L1-3</model-role>
+ <model-vers>
+ <model-ver>
+ <model-version-id>a8f6f87c-53bb-481c-9463-37429d75a0db</model-version-id>
+ <model-name>COS_AVPN</model-name>
+ <model-version>1.0</model-version>
+ <model-description>april 25</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>88379cfd-fa0f-4946-8958-acc32640cafc</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>1608eef4-de53-4334-a8d2-ba79cab4bde0</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>8899a168-9b1f-45c8-8bb6-209931a404b3</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>b67a289b-1688-496d-86e8-1583c828be0a</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>service-instance-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>service-instance-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-ExtVL-resource-40.0.xml b/src/test/resources/generatedXml/AAI-ExtVL-resource-40.0.xml
index c4eaff5..c10b29e 100644
--- a/src/test/resources/generatedXml/AAI-ExtVL-resource-40.0.xml
+++ b/src/test/resources/generatedXml/AAI-ExtVL-resource-40.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>extVL-invariant-uuid</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-ExtVL-resource-48.0.xml b/src/test/resources/generatedXml/AAI-ExtVL-resource-48.0.xml
new file mode 100644
index 0000000..c1b211a
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-ExtVL-resource-48.0.xml
@@ -0,0 +1,32 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>379f816b-a7aa-422f-be30-17114ff50b7c</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>3cbb1780-f204-4186-be6d-eb9caa52e1ab</model-version-id>
+ <model-name>ExtVL</model-name>
+ <model-version>48.0</model-version>
+ <model-description>ECOMP generic virtual link (network) base type for all other service-level and global networks</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>l3-network-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>l3-network-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Fabric Configuration-resource-10.0.xml b/src/test/resources/generatedXml/AAI-Fabric Configuration-resource-10.0.xml
new file mode 100644
index 0000000..f3b0d9f
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-Fabric Configuration-resource-10.0.xml
@@ -0,0 +1,32 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>3c5bb7f4-764e-4da3-8d34-8829a2924192</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>293be1bf-aae3-48ca-895a-5d55d0be44df</model-version-id>
+ <model-name>Fabric Configuration</model-name>
+ <model-version>10.0</model-version>
+ <model-description>A fabric Configuration object</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>configuration-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>configuration-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml b/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml
index 3975bbd..8454f51 100644
--- a/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml
+++ b/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>service-invariant-uuid</model-invariant-id>
<model-type>service</model-type>
<model-role>Network L4+</model-role>
@@ -67,4 +67,4 @@
</model-elements>
</model-ver>
</model-vers>
-</model>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Network Cloud VNF MOCK-resource-1.0.xml b/src/test/resources/generatedXml/AAI-Network Cloud VNF MOCK-resource-1.0.xml
new file mode 100644
index 0000000..0b9a613
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-Network Cloud VNF MOCK-resource-1.0.xml
@@ -0,0 +1,69 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>b78ae06b-95f7-493c-963b-c81e110f2dee</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>39daa982-cd8a-4f5e-b676-addae46bb9e6</model-version-id>
+ <model-name>Network Cloud VNF MOCK</model-name>
+ <model-version>1.0</model-version>
+ <model-description>Network Cloud VNF MOCK</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>789420ba-3730-4767-969e-c0b13eb92394</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>ea2360e3-f4b1-4acc-8d23-c8f6b2fdce3a</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>293be1bf-aae3-48ca-895a-5d55d0be44df</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>3c5bb7f4-764e-4da3-8d34-8829a2924192</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>generic-vnf-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>generic-vnf-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Network Cloud VNF Service MOCK-service-1.0.xml b/src/test/resources/generatedXml/AAI-Network Cloud VNF Service MOCK-service-1.0.xml
new file mode 100644
index 0000000..a52368a
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-Network Cloud VNF Service MOCK-service-1.0.xml
@@ -0,0 +1,51 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>60f83fa8-f577-42bf-b295-460acbe977a5</model-invariant-id>
+ <model-type>service</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>4ae2563e-8191-4f12-8141-3471cecfb2e5</model-version-id>
+ <model-name>Network Cloud VNF Service MOCK</model-name>
+ <model-version>1.0</model-version>
+ <model-description>Network Cloud VNF Service MOCK</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>39daa982-cd8a-4f5e-b676-addae46bb9e6</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>b78ae06b-95f7-493c-963b-c81e110f2dee</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>service-instance-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>service-instance-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Network Res 1806-resource-4.0.xml b/src/test/resources/generatedXml/AAI-Network Res 1806-resource-4.0.xml
new file mode 100644
index 0000000..a852aa1
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-Network Res 1806-resource-4.0.xml
@@ -0,0 +1,51 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>831ed8de-e2ca-4310-bc51-cf97ab44547c</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>63b83b75-ed29-42c7-8982-e3575d928b31</model-version-id>
+ <model-name>Network Res 1806</model-name>
+ <model-version>4.0</model-version>
+ <model-description>april 30</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>615a2471-2aea-4c39-a400-4ba3bb0c0034</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>e732025b-8f42-425f-b40c-09e5986b9c4f</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>collection-resource-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>collection-resource-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Network Res 1806..NetworkCollection..0-resource-1.xml b/src/test/resources/generatedXml/AAI-Network Res 1806..NetworkCollection..0-resource-1.xml
new file mode 100644
index 0000000..8c26d2b
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-Network Res 1806..NetworkCollection..0-resource-1.xml
@@ -0,0 +1,50 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>e732025b-8f42-425f-b40c-09e5986b9c4f</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>615a2471-2aea-4c39-a400-4ba3bb0c0034</model-version-id>
+ <model-name>Network Res 1806..NetworkCollection..0</model-name>
+ <model-version>1</model-version>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>3cbb1780-f204-4186-be6d-eb9caa52e1ab</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>379f816b-a7aa-422f-be30-17114ff50b7c</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>instance-group-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>instance-group-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-NetworkCloudVnfMock..NC1_Test_Heat_08152018_base..module-0-resource-1.xml b/src/test/resources/generatedXml/AAI-NetworkCloudVnfMock..NC1_Test_Heat_08152018_base..module-0-resource-1.xml
new file mode 100644
index 0000000..f2bb88c
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-NetworkCloudVnfMock..NC1_Test_Heat_08152018_base..module-0-resource-1.xml
@@ -0,0 +1,123 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>ea2360e3-f4b1-4acc-8d23-c8f6b2fdce3a</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>789420ba-3730-4767-969e-c0b13eb92394</model-version-id>
+ <model-name>NetworkCloudVnfMock..NC1_Test_Heat_08152018_base..module-0</model-name>
+ <model-version>1</model-version>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>image-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>image-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>flavor-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>flavor-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vnfc-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vnfc-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>tenant-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>tenant-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vserver-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vserver-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vf-module-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vf-module-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml b/src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml
index 8722358..f90e14e 100644
--- a/src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml
+++ b/src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>cd674566-ce17-4262-ae99-d526e7b8d47a</model-invariant-id>
<model-type>service</model-type>
<model-role>Network L1-3</model-role>
@@ -49,4 +49,4 @@
</model-elements>
</model-ver>
</model-vers>
-</model>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml b/src/test/resources/generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml
index cb763d0..a05aff3 100644
--- a/src/test/resources/generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml
+++ b/src/test/resources/generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>cf53c1d6-8708-4b4e-a056-ead7daa57cd5</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-RG_collector_6-15-service-1.0.xml b/src/test/resources/generatedXml/AAI-RG_collector_6-15-service-1.0.xml
new file mode 100644
index 0000000..85fa00d
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-RG_collector_6-15-service-1.0.xml
@@ -0,0 +1,52 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>32b61fa7-95e7-4ede-ad9b-2322e26fc623</model-invariant-id>
+ <model-type>service</model-type>
+ <model-role>Network L1-3</model-role>
+ <model-vers>
+ <model-ver>
+ <model-version-id>b8bc7bda-3405-4a56-bf85-cbacc68a2ca0</model-version-id>
+ <model-name>RG_collector_6-15</model-name>
+ <model-version>1.0</model-version>
+ <model-description>RG_collector_6-15</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>63b83b75-ed29-42c7-8982-e3575d928b31</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>831ed8de-e2ca-4310-bc51-cf97ab44547c</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>service-instance-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>service-instance-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-SCP-Test-VSP-resource-1.0.xml b/src/test/resources/generatedXml/AAI-SCP-Test-VSP-resource-1.0.xml
index 947f118..bd04f52 100644
--- a/src/test/resources/generatedXml/AAI-SCP-Test-VSP-resource-1.0.xml
+++ b/src/test/resources/generatedXml/AAI-SCP-Test-VSP-resource-1.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>b2b88a73-5c55-4984-99dd-a35c55935d14</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml b/src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml
index 59e9945..14055c0 100644
--- a/src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml
+++ b/src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>1c111111-1111-1111-1111-111111111111</model-invariant-id>
<model-type>service</model-type>
<model-role>Network L1-3</model-role>
diff --git a/src/test/resources/generatedXml/AAI-SD-WAN-Test-VSP-resource-1.0.xml b/src/test/resources/generatedXml/AAI-SD-WAN-Test-VSP-resource-1.0.xml
index 4043127..21ab1a5 100644
--- a/src/test/resources/generatedXml/AAI-SD-WAN-Test-VSP-resource-1.0.xml
+++ b/src/test/resources/generatedXml/AAI-SD-WAN-Test-VSP-resource-1.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>1a111111-1111-1111-1111-111111111111</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-ScpTestVsp..asc_heat-int2..module-0-resource-1.xml b/src/test/resources/generatedXml/AAI-ScpTestVsp..asc_heat-int2..module-0-resource-1.xml
index 5ff0949..67cb1cd 100644
--- a/src/test/resources/generatedXml/AAI-ScpTestVsp..asc_heat-int2..module-0-resource-1.xml
+++ b/src/test/resources/generatedXml/AAI-ScpTestVsp..asc_heat-int2..module-0-resource-1.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>6f288081-b321-47c9-b038-6de70079a3bf</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-SdWanTestVsp..DUMMY..module-0-resource-2.xml b/src/test/resources/generatedXml/AAI-SdWanTestVsp..DUMMY..module-0-resource-2.xml
index ed8de36..ad5c33b 100644
--- a/src/test/resources/generatedXml/AAI-SdWanTestVsp..DUMMY..module-0-resource-2.xml
+++ b/src/test/resources/generatedXml/AAI-SdWanTestVsp..DUMMY..module-0-resource-2.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>6a111111-1111-1111-1111-111111111111</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-TEST CR_1-resource-7.0.xml b/src/test/resources/generatedXml/AAI-TEST CR_1-resource-7.0.xml
index 0d50ff7..329251e 100644
--- a/src/test/resources/generatedXml/AAI-TEST CR_1-resource-7.0.xml
+++ b/src/test/resources/generatedXml/AAI-TEST CR_1-resource-7.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>testcr1-invariant-uuid</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-TEST SVC_1-service-1.0.xml b/src/test/resources/generatedXml/AAI-TEST SVC_1-service-1.0.xml
index b8c1cc0..eef0edc 100644
--- a/src/test/resources/generatedXml/AAI-TEST SVC_1-service-1.0.xml
+++ b/src/test/resources/generatedXml/AAI-TEST SVC_1-service-1.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>service-invariant-uuid</model-invariant-id>
<model-type>service</model-type>
<model-role>Network L4+</model-role>
diff --git a/src/test/resources/generatedXml/AAI-Tunnel_XConnTest-resource-2.0.xml b/src/test/resources/generatedXml/AAI-Tunnel_XConnTest-resource-2.0.xml
index 4db86bf..e3c1082 100644
--- a/src/test/resources/generatedXml/AAI-Tunnel_XConnTest-resource-2.0.xml
+++ b/src/test/resources/generatedXml/AAI-Tunnel_XConnTest-resource-2.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>1b111111-1111-1111-1111-111111111111</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-VLAN Network Receptor Configuration-resource-3.0.xml b/src/test/resources/generatedXml/AAI-VLAN Network Receptor Configuration-resource-3.0.xml
new file mode 100644
index 0000000..7b75c01
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-VLAN Network Receptor Configuration-resource-3.0.xml
@@ -0,0 +1,32 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>1608eef4-de53-4334-a8d2-ba79cab4bde0</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>88379cfd-fa0f-4946-8958-acc32640cafc</model-version-id>
+ <model-name>VLAN Network Receptor Configuration</model-name>
+ <model-version>3.0</model-version>
+ <model-description>VLAN network receptor configuration object</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>configuration-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>configuration-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-VRF Entry Configuration-resource-3.0.xml b/src/test/resources/generatedXml/AAI-VRF Entry Configuration-resource-3.0.xml
new file mode 100644
index 0000000..378f604
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-VRF Entry Configuration-resource-3.0.xml
@@ -0,0 +1,32 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>b67a289b-1688-496d-86e8-1583c828be0a</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>8899a168-9b1f-45c8-8bb6-209931a404b3</model-version-id>
+ <model-name>VRF Entry Configuration</model-name>
+ <model-version>3.0</model-version>
+ <model-description>VRF Entry configuration object</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>configuration-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>configuration-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-Vscpaas_Test-service-1.0.xml b/src/test/resources/generatedXml/AAI-Vscpaas_Test-service-1.0.xml
new file mode 100644
index 0000000..3833401
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-Vscpaas_Test-service-1.0.xml
@@ -0,0 +1,51 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>a8db6285-20ca-4fd3-9c85-e267bdb013f9</model-invariant-id>
+ <model-type>service</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>7f7f6fa4-275a-488f-8b3e-691a0765d57e</model-version-id>
+ <model-name>Vscpaas_Test</model-name>
+ <model-version>1.0</model-version>
+ <model-description>Vscpaas_Test</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>2e42bac2-318a-410c-b8ff-3b3a31351be7</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>b2b88a73-5c55-4984-99dd-a35c55935d14</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>46b92144-923a-4d20-b85a-3cbd847668a9</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>82194af1-3c2c-485a-8f44-420e22a9eaa4</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model>
diff --git a/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml
index d849d94..2e3f412 100644
--- a/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml
+++ b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>instance-group-0-invariant-id</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
@@ -29,4 +29,4 @@
</model-elements>
</model-ver>
</model-vers>
-</model>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml
index bcd9436..4b3e83c 100644
--- a/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml
+++ b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>instance-group-1-invariant-id</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-oam_group-resource-3.xml b/src/test/resources/generatedXml/AAI-oam_group-resource-3.xml
new file mode 100644
index 0000000..01c2889
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-oam_group-resource-3.xml
@@ -0,0 +1,123 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>53688e73-06a1-4759-96d2-8872e9c6a460</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>d01914ca-dc72-4193-bf71-a3bed67fed8f</model-version-id>
+ <model-name>oam_group</model-name>
+ <model-version>3</model-version>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>image-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>image-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>flavor-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>flavor-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vnfc-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vnfc-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>tenant-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>tenant-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vserver-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vserver-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>instance-group-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>instance-group-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-testcr_1..NetworkCollection..0-resource-1.xml b/src/test/resources/generatedXml/AAI-testcr_1..NetworkCollection..0-resource-1.xml
index 2592886..19ba632 100644
--- a/src/test/resources/generatedXml/AAI-testcr_1..NetworkCollection..0-resource-1.xml
+++ b/src/test/resources/generatedXml/AAI-testcr_1..NetworkCollection..0-resource-1.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v20">
+<model xmlns="http://org.onap.aai.inventory/v23">
<model-invariant-id>test-cr-invariant-uuid</model-invariant-id>
<model-type>resource</model-type>
<model-vers>
diff --git a/src/test/resources/generatedXml/AAI-untr_group-resource-3.xml b/src/test/resources/generatedXml/AAI-untr_group-resource-3.xml
new file mode 100644
index 0000000..f95d5ec
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-untr_group-resource-3.xml
@@ -0,0 +1,123 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>01a007bf-e3c4-4e27-963b-74fabeab08bc</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>82823f08-f935-49aa-a0d8-608a2a2da10c</model-version-id>
+ <model-name>untr_group</model-name>
+ <model-version>3</model-version>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>image-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>image-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>flavor-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>flavor-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vnfc-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vnfc-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>tenant-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>tenant-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vserver-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vserver-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>instance-group-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>instance-group-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-vDBE-resource-0.5.xml b/src/test/resources/generatedXml/AAI-vDBE-resource-0.5.xml
new file mode 100644
index 0000000..bc47559
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-vDBE-resource-0.5.xml
@@ -0,0 +1,87 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>2b6388c7-fec4-45b1-ac66-297ba402ae40</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>92b7bb18-b783-410c-ae59-e94cb597a7aa</model-version-id>
+ <model-name>vDBE</model-name>
+ <model-version>0.5</model-version>
+ <model-description>vDBE</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>73407588-de3e-4448-adf4-f610fd189099</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>63d57475-e7c3-49b2-ab32-90357c0e4f30</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>82823f08-f935-49aa-a0d8-608a2a2da10c</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>01a007bf-e3c4-4e27-963b-74fabeab08bc</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>d01914ca-dc72-4193-bf71-a3bed67fed8f</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>53688e73-06a1-4759-96d2-8872e9c6a460</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>generic-vnf-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>generic-vnf-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-vDBE_srv-service-1.0.xml b/src/test/resources/generatedXml/AAI-vDBE_srv-service-1.0.xml
new file mode 100644
index 0000000..391ca35
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-vDBE_srv-service-1.0.xml
@@ -0,0 +1,52 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>66e7aed9-3257-4069-b0a6-9012aaca821a</model-invariant-id>
+ <model-type>service</model-type>
+ <model-role>Network L1-3</model-role>
+ <model-vers>
+ <model-ver>
+ <model-version-id>29dd9b11-6637-4c48-b47c-6d498584a55e</model-version-id>
+ <model-name>vDBE_srv</model-name>
+ <model-version>1.0</model-version>
+ <model-description>eqeqeq</model-description>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>92b7bb18-b783-410c-ae59-e94cb597a7aa</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>2b6388c7-fec4-45b1-ac66-297ba402ae40</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>service-instance-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>service-instance-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-vdbe0..Vdbe..main..module-0-resource-2.xml b/src/test/resources/generatedXml/AAI-vdbe0..Vdbe..main..module-0-resource-2.xml
new file mode 100644
index 0000000..7e8cc88
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-vdbe0..Vdbe..main..module-0-resource-2.xml
@@ -0,0 +1,141 @@
+<model xmlns="http://org.onap.aai.inventory/v23">
+ <model-invariant-id>63d57475-e7c3-49b2-ab32-90357c0e4f30</model-invariant-id>
+ <model-type>resource</model-type>
+ <model-vers>
+ <model-ver>
+ <model-version-id>73407588-de3e-4448-adf4-f610fd189099</model-version-id>
+ <model-name>vdbe0..Vdbe..main..module-0</model-name>
+ <model-version>2</model-version>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>image-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>image-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>flavor-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>flavor-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vnfc-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vnfc-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>F</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>tenant-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>tenant-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vserver-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vserver-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ <model-element>
+ <new-data-del-flag>T</new-data-del-flag>
+ <cardinality>unbounded</cardinality>
+ <model-elements/>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>l3-network-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>l3-network-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ <relationship-list>
+ <relationship>
+ <related-to>model-ver</related-to>
+ <relationship-data>
+ <relationship-key>model-ver.model-version-id</relationship-key>
+ <relationship-value>vf-module-version-id</relationship-value>
+ </relationship-data>
+ <relationship-data>
+ <relationship-key>model.model-invariant-id</relationship-key>
+ <relationship-value>vf-module-invariant-id</relationship-value>
+ </relationship-data>
+ </relationship>
+ </relationship-list>
+ </model-element>
+ </model-elements>
+ </model-ver>
+ </model-vers>
+</model> \ No newline at end of file