Update schema-service dep to 1.6.0 39/98739/1
authorsblimkie <steven.blimkie@amdocs.com>
Thu, 21 Nov 2019 19:56:17 +0000 (14:56 -0500)
committersblimkie <steven.blimkie@amdocs.com>
Thu, 21 Nov 2019 19:56:55 +0000 (14:56 -0500)
Change-Id: Idfabac878db11ccde4859ee04bdf45b560460a88
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
Issue-ID: AAI-2607

19 files changed:
pom.xml
src/test/resources/generatedXml/AAI-ExtVL-resource-40.0.xml
src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml
src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml
src/test/resources/generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml
src/test/resources/generatedXml/AAI-SCP-Test-VSP-resource-1.0.xml
src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml
src/test/resources/generatedXml/AAI-SD-WAN-Test-VSP-resource-1.0.xml
src/test/resources/generatedXml/AAI-ScpTestVsp..asc_heat-int2..module-0-resource-1.xml
src/test/resources/generatedXml/AAI-SdWanTestVsp..DUMMY..module-0-resource-2.xml
src/test/resources/generatedXml/AAI-TEST CR_1-resource-7.0.xml
src/test/resources/generatedXml/AAI-TEST SVC_1-service-1.0.xml
src/test/resources/generatedXml/AAI-Tunnel_XConnTest-resource-2.0.xml
src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml
src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml
src/test/resources/generatedXml/AAI-testcr_1..NetworkCollection..0-resource-1.xml
src/test/resources/response/response.json
src/test/resources/response/responseWithVersionLessThan1.json
src/test/resources/response/validNoVnfConfigurationResponse.json

diff --git a/pom.xml b/pom.xml
index bf85f3e..6f28d95 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
                <javax.ws.rs.version>2.1</javax.ws.rs.version>
                <mvn.jaxb2.version>0.13.2</mvn.jaxb2.version>
                <aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id>
-               <aai-schema.version>1.5.0</aai-schema.version>
+               <aai-schema.version>1.6.0</aai-schema.version>
                <aai.rest.client.version>1.2.1</aai.rest.client.version>
                <sdc.distribution.client.version>1.3.0</sdc.distribution.client.version>
                <xmlunit.version>1.6</xmlunit.version>
index 621b16e..2c98844 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>extVL-invariant-uuid</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index ffd00c2..4133aa3 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>service-invariant-uuid</model-invariant-id>
     <model-type>service</model-type>
     <model-vers>
index 9c8164f..f66e638 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>cd674566-ce17-4262-ae99-d526e7b8d47a</model-invariant-id>
     <model-type>service</model-type>
     <model-vers>
index 6183942..a52b55e 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>cf53c1d6-8708-4b4e-a056-ead7daa57cd5</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index d2ff2eb..7c334bd 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>b2b88a73-5c55-4984-99dd-a35c55935d14</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index ff8f576..1ae605f 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>1c111111-1111-1111-1111-111111111111</model-invariant-id>
     <model-type>service</model-type>
     <model-vers>
index 7d7fce3..3356e72 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>1a111111-1111-1111-1111-111111111111</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index 9a1db38..3558251 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>6f288081-b321-47c9-b038-6de70079a3bf</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index 7fcbf63..754a488 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>6a111111-1111-1111-1111-111111111111</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index e02201f..84f7e97 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>testcr1-invariant-uuid</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index 73cf456..5d3647a 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>service-invariant-uuid</model-invariant-id>
     <model-type>service</model-type>
     <model-vers>
index aca74a6..56f0b0e 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>1b111111-1111-1111-1111-111111111111</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index 14d171c..a939a5d 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>instance-group-0-invariant-id</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index 7d40d56..5652236 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>instance-group-1-invariant-id</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index 9b9dae1..4f6e4d6 100644 (file)
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v16">
+<model xmlns="http://org.onap.aai.inventory/v19">
     <model-invariant-id>test-cr-invariant-uuid</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
index 098edcb..553ba67 100644 (file)
@@ -1 +1 @@
-[{"name":"AAI-29NFOD_S-service-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v16\">\n    <model-invariant-id>29NFOD_S-invariant-id</model-invariant-id>\n    <model-type>service</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>29NFOD_S-version-id</model-version-id>\n            <model-name>29NFOD_S</model-name>\n            <model-version>1.0</model-version>\n            <model-description>29NFOD</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>29NFOD 0-version-id</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>29NFOD 0-invariant-id</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>service-instance-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>service-instance-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"AAI-29NFOD-resource-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v16\">\n    <model-invariant-id>29NFOD 0-invariant-id</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>29NFOD 0-version-id</model-version-id>\n            <model-name>29NFOD</model-name>\n            <model-version>1.0</model-version>\n            <model-description>29NFOD</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements/>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>generic-vnf-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>generic-vnf-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"vnfVendorImageConfigurations","type":"VNFCATALOG","payload":"[{\"application\":\"VM00\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.1\"},{\"application\":\"VM00\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.9\"},{\"application\":\"VM01\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.1\"},{\"application\":\"VM01\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.9\"}]"}]
+[{"name":"AAI-29NFOD_S-service-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v19\">\n    <model-invariant-id>29NFOD_S-invariant-id</model-invariant-id>\n    <model-type>service</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>29NFOD_S-version-id</model-version-id>\n            <model-name>29NFOD_S</model-name>\n            <model-version>1.0</model-version>\n            <model-description>29NFOD</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>29NFOD 0-version-id</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>29NFOD 0-invariant-id</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>service-instance-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>service-instance-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"AAI-29NFOD-resource-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v19\">\n    <model-invariant-id>29NFOD 0-invariant-id</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>29NFOD 0-version-id</model-version-id>\n            <model-name>29NFOD</model-name>\n            <model-version>1.0</model-version>\n            <model-description>29NFOD</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements/>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>generic-vnf-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>generic-vnf-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"vnfVendorImageConfigurations","type":"VNFCATALOG","payload":"[{\"application\":\"VM00\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.1\"},{\"application\":\"VM00\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.9\"},{\"application\":\"VM01\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.1\"},{\"application\":\"VM01\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.9\"}]"}]
index 2ffeff6..c2e267e 100644 (file)
@@ -1 +1 @@
-[{"name":"AAI-29NFOD_S-service-0.1.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v16\">\n    <model-invariant-id>29NFOD_S-invariant-id</model-invariant-id>\n    <model-type>service</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>29NFOD_S-version-id</model-version-id>\n            <model-name>29NFOD_S</model-name>\n            <model-version>0.1</model-version>\n            <model-description>29NFOD</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>29NFOD 0-version-id</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>29NFOD 0-invariant-id</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>service-instance-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>service-instance-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"AAI-29NFOD-resource-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v16\">\n    <model-invariant-id>29NFOD 0-invariant-id</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>29NFOD 0-version-id</model-version-id>\n            <model-name>29NFOD</model-name>\n            <model-version>1.0</model-version>\n            <model-description>29NFOD</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements/>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>generic-vnf-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>generic-vnf-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"vnfVendorImageConfigurations","type":"VNFCATALOG","payload":"[{\"application\":\"VM00\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.1\"},{\"application\":\"VM00\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.9\"},{\"application\":\"VM01\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.1\"},{\"application\":\"VM01\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.9\"}]"}]
+[{"name":"AAI-29NFOD_S-service-0.1.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v19\">\n    <model-invariant-id>29NFOD_S-invariant-id</model-invariant-id>\n    <model-type>service</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>29NFOD_S-version-id</model-version-id>\n            <model-name>29NFOD_S</model-name>\n            <model-version>0.1</model-version>\n            <model-description>29NFOD</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>29NFOD 0-version-id</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>29NFOD 0-invariant-id</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>service-instance-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>service-instance-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"AAI-29NFOD-resource-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v19\">\n    <model-invariant-id>29NFOD 0-invariant-id</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>29NFOD 0-version-id</model-version-id>\n            <model-name>29NFOD</model-name>\n            <model-version>1.0</model-version>\n            <model-description>29NFOD</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements/>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>generic-vnf-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>generic-vnf-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"vnfVendorImageConfigurations","type":"VNFCATALOG","payload":"[{\"application\":\"VM00\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.1\"},{\"application\":\"VM00\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.9\"},{\"application\":\"VM01\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.1\"},{\"application\":\"VM01\",\"application-vendor\":\"29NFOD\",\"application-version\":\"3.16.9\"}]"}]
index 053b6a8..a02f4d6 100644 (file)
@@ -1 +1 @@
-[{"name":"AAI-Vscpaas_Test-service-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v16\">\n    <model-invariant-id>a8db6285-20ca-4fd3-9c85-e267bdb013f9</model-invariant-id>\n    <model-type>service</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>7f7f6fa4-275a-488f-8b3e-691a0765d57e</model-version-id>\n            <model-name>Vscpaas_Test</model-name>\n            <model-version>1.0</model-version>\n            <model-description>Vscpaas_Test</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>2e42bac2-318a-410c-b8ff-3b3a31351be7</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>b2b88a73-5c55-4984-99dd-a35c55935d14</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>service-instance-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>service-instance-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"AAI-ScpTestVsp..asc_heat-int2..module-0-resource-1.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v16\">\n    <model-invariant-id>6f288081-b321-47c9-b038-6de70079a3bf</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>06258c44-ab48-4b4b-a5db-16892f7d1e76</model-version-id>\n            <model-name>ScpTestVsp..asc_heat-int2..module-0</model-name>\n            <model-version>1</model-version>\n            <model-description></model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements>\n                                <model-element>\n                                    <new-data-del-flag>F</new-data-del-flag>\n                                    <cardinality>unbounded</cardinality>\n                                    <model-elements/>\n                                    <relationship-list>\n                                        <relationship>\n                                            <related-to>model-ver</related-to>\n                                            <relationship-data>\n                                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                                <relationship-value>image-version-id</relationship-value>\n                                            </relationship-data>\n                                            <relationship-data>\n                                                <relationship-key>model.model-invariant-id</relationship-key>\n                                                <relationship-value>image-invariant-id</relationship-value>\n                                            </relationship-data>\n                                        </relationship>\n                                    </relationship-list>\n                                </model-element>\n                                <model-element>\n                                    <new-data-del-flag>F</new-data-del-flag>\n                                    <cardinality>unbounded</cardinality>\n                                    <model-elements/>\n                                    <relationship-list>\n                                        <relationship>\n                                            <related-to>model-ver</related-to>\n                                            <relationship-data>\n                                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                                <relationship-value>flavor-version-id</relationship-value>\n                                            </relationship-data>\n                                            <relationship-data>\n                                                <relationship-key>model.model-invariant-id</relationship-key>\n                                                <relationship-value>flavor-invariant-id</relationship-value>\n                                            </relationship-data>\n                                        </relationship>\n                                    </relationship-list>\n                                </model-element>\n                                <model-element>\n                                    <new-data-del-flag>T</new-data-del-flag>\n                                    <cardinality>unbounded</cardinality>\n                                    <model-elements/>\n                                    <relationship-list>\n                                        <relationship>\n                                            <related-to>model-ver</related-to>\n                                            <relationship-data>\n                                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                                <relationship-value>vnfc-version-id</relationship-value>\n                                            </relationship-data>\n                                            <relationship-data>\n                                                <relationship-key>model.model-invariant-id</relationship-key>\n                                                <relationship-value>vnfc-invariant-id</relationship-value>\n                                            </relationship-data>\n                                        </relationship>\n                                    </relationship-list>\n                                </model-element>\n                                <model-element>\n                                    <new-data-del-flag>F</new-data-del-flag>\n                                    <cardinality>unbounded</cardinality>\n                                    <model-elements/>\n                                    <relationship-list>\n                                        <relationship>\n                                            <related-to>model-ver</related-to>\n                                            <relationship-data>\n                                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                                <relationship-value>tenant-version-id</relationship-value>\n                                            </relationship-data>\n                                            <relationship-data>\n                                                <relationship-key>model.model-invariant-id</relationship-key>\n                                                <relationship-value>tenant-invariant-id</relationship-value>\n                                            </relationship-data>\n                                        </relationship>\n                                    </relationship-list>\n                                </model-element>\n                            </model-elements>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>vserver-version-id</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>vserver-invariant-id</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>l3-network-version-id</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>l3-network-invariant-id</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>vf-module-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>vf-module-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"AAI-SCP-Test-VSP-resource-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v16\">\n    <model-invariant-id>b2b88a73-5c55-4984-99dd-a35c55935d14</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>2e42bac2-318a-410c-b8ff-3b3a31351be7</model-version-id>\n            <model-name>SCP-Test-VSP</model-name>\n            <model-version>1.0</model-version>\n            <model-description>SCP Test VSP</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>06258c44-ab48-4b4b-a5db-16892f7d1e76</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>6f288081-b321-47c9-b038-6de70079a3bf</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>generic-vnf-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>generic-vnf-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"}]
+[{"name":"AAI-Vscpaas_Test-service-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v19\">\n    <model-invariant-id>a8db6285-20ca-4fd3-9c85-e267bdb013f9</model-invariant-id>\n    <model-type>service</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>7f7f6fa4-275a-488f-8b3e-691a0765d57e</model-version-id>\n            <model-name>Vscpaas_Test</model-name>\n            <model-version>1.0</model-version>\n            <model-description>Vscpaas_Test</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>2e42bac2-318a-410c-b8ff-3b3a31351be7</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>b2b88a73-5c55-4984-99dd-a35c55935d14</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>service-instance-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>service-instance-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"AAI-ScpTestVsp..asc_heat-int2..module-0-resource-1.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v19\">\n    <model-invariant-id>6f288081-b321-47c9-b038-6de70079a3bf</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>06258c44-ab48-4b4b-a5db-16892f7d1e76</model-version-id>\n            <model-name>ScpTestVsp..asc_heat-int2..module-0</model-name>\n            <model-version>1</model-version>\n            <model-description></model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements>\n                                <model-element>\n                                    <new-data-del-flag>F</new-data-del-flag>\n                                    <cardinality>unbounded</cardinality>\n                                    <model-elements/>\n                                    <relationship-list>\n                                        <relationship>\n                                            <related-to>model-ver</related-to>\n                                            <relationship-data>\n                                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                                <relationship-value>image-version-id</relationship-value>\n                                            </relationship-data>\n                                            <relationship-data>\n                                                <relationship-key>model.model-invariant-id</relationship-key>\n                                                <relationship-value>image-invariant-id</relationship-value>\n                                            </relationship-data>\n                                        </relationship>\n                                    </relationship-list>\n                                </model-element>\n                                <model-element>\n                                    <new-data-del-flag>F</new-data-del-flag>\n                                    <cardinality>unbounded</cardinality>\n                                    <model-elements/>\n                                    <relationship-list>\n                                        <relationship>\n                                            <related-to>model-ver</related-to>\n                                            <relationship-data>\n                                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                                <relationship-value>flavor-version-id</relationship-value>\n                                            </relationship-data>\n                                            <relationship-data>\n                                                <relationship-key>model.model-invariant-id</relationship-key>\n                                                <relationship-value>flavor-invariant-id</relationship-value>\n                                            </relationship-data>\n                                        </relationship>\n                                    </relationship-list>\n                                </model-element>\n                                <model-element>\n                                    <new-data-del-flag>T</new-data-del-flag>\n                                    <cardinality>unbounded</cardinality>\n                                    <model-elements/>\n                                    <relationship-list>\n                                        <relationship>\n                                            <related-to>model-ver</related-to>\n                                            <relationship-data>\n                                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                                <relationship-value>vnfc-version-id</relationship-value>\n                                            </relationship-data>\n                                            <relationship-data>\n                                                <relationship-key>model.model-invariant-id</relationship-key>\n                                                <relationship-value>vnfc-invariant-id</relationship-value>\n                                            </relationship-data>\n                                        </relationship>\n                                    </relationship-list>\n                                </model-element>\n                                <model-element>\n                                    <new-data-del-flag>F</new-data-del-flag>\n                                    <cardinality>unbounded</cardinality>\n                                    <model-elements/>\n                                    <relationship-list>\n                                        <relationship>\n                                            <related-to>model-ver</related-to>\n                                            <relationship-data>\n                                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                                <relationship-value>tenant-version-id</relationship-value>\n                                            </relationship-data>\n                                            <relationship-data>\n                                                <relationship-key>model.model-invariant-id</relationship-key>\n                                                <relationship-value>tenant-invariant-id</relationship-value>\n                                            </relationship-data>\n                                        </relationship>\n                                    </relationship-list>\n                                </model-element>\n                            </model-elements>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>vserver-version-id</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>vserver-invariant-id</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>l3-network-version-id</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>l3-network-invariant-id</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>vf-module-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>vf-module-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"},{"name":"AAI-SCP-Test-VSP-resource-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v19\">\n    <model-invariant-id>b2b88a73-5c55-4984-99dd-a35c55935d14</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>2e42bac2-318a-410c-b8ff-3b3a31351be7</model-version-id>\n            <model-name>SCP-Test-VSP</model-name>\n            <model-version>1.0</model-version>\n            <model-description>SCP Test VSP</model-description>\n            <model-elements>\n                <model-element>\n                    <new-data-del-flag>T</new-data-del-flag>\n                    <cardinality>unbounded</cardinality>\n                    <model-elements>\n                        <model-element>\n                            <new-data-del-flag>T</new-data-del-flag>\n                            <cardinality>unbounded</cardinality>\n                            <model-elements/>\n                            <relationship-list>\n                                <relationship>\n                                    <related-to>model-ver</related-to>\n                                    <relationship-data>\n                                        <relationship-key>model-ver.model-version-id</relationship-key>\n                                        <relationship-value>06258c44-ab48-4b4b-a5db-16892f7d1e76</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>6f288081-b321-47c9-b038-6de70079a3bf</relationship-value>\n                                    </relationship-data>\n                                </relationship>\n                            </relationship-list>\n                        </model-element>\n                    </model-elements>\n                    <relationship-list>\n                        <relationship>\n                            <related-to>model-ver</related-to>\n                            <relationship-data>\n                                <relationship-key>model-ver.model-version-id</relationship-key>\n                                <relationship-value>generic-vnf-version-id</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>generic-vnf-invariant-id</relationship-value>\n                            </relationship-data>\n                        </relationship>\n                    </relationship-list>\n                </model-element>\n            </model-elements>\n        </model-ver>\n    </model-vers>\n</model>"}]