Replace test UUIDs with dummy strings

To simplify debugging and manual inspection of XML output files, use
meaningful strings in place of UUIDs in the Junit test properties.

Change-Id: If6721685d36c3959c946bd57a0872cbb1ce188ec
Issue-ID: AAI-1250
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

diff --git a/src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java b/src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java
index 07b93b0..212c221 100644 (file)
--- a/src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java
+++ b/src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java
@@ -87,7 +87,7 @@ public class TestWidget {
     public void testWidgetMethods() {
         Widget widget = new ServiceWidget();
         assertThat(widget.getType(), is(ModelType.WIDGET));
-        assertThat(widget.getWidgetId(), is("82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+        assertThat(widget.getWidgetId(), is("service-instance-invariant-id"));
         assertThat(widget.addWidget(new TenantWidget()), is(true));
         assertThat(widget.memberOf(null), is(false));
         assertThat(widget.memberOf(Collections.emptyList()), is(false));

diff --git a/src/test/resources/artifact-generator.properties b/src/test/resources/artifact-generator.properties
index c1bda81..ba207cf 100644 (file)
--- a/src/test/resources/artifact-generator.properties
+++ b/src/test/resources/artifact-generator.properties
@@ -1,270 +1,267 @@
 #action widget details
-AAI.model-version-id.action=fd7fb09e-d930-41b9-b83f-cfde9df48640
-AAI.model-invariant-id.action=af593b4b-490e-4665-ad74-2f6351c0a7ce
+AAI.model-version-id.action=action-version-id
+AAI.model-invariant-id.action=action-invariant-id
 #action-data widget details
-AAI.model-invariant-id.action-data=9551346c-7d8b-4daf-9926-b93e96e2344a
-AAI.model-version-id.action-data=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd
+AAI.model-invariant-id.action-data=action-data-invariant-id
+AAI.model-version-id.action-data=action-data-version-id
 #allotted-resource widget details
-AAI.model-invariant-id.allotted-resource=f6d6a23d-a1a9-48ff-8419-b6530da2d381
-AAI.model-version-id.allotted-resource=7ad0915f-25c0-4a70-b9bc-185a75f87564
+AAI.model-invariant-id.allotted-resource=allotted-resource-invariant-id
+AAI.model-version-id.allotted-resource=allotted-resource-version-id
 #availability-zone widget details
-AAI.model-version-id.availability-zone=6c092fb1-21b2-456b-9e01-67fb4de1896e
-AAI.model-invariant-id.availability-zone=61b88c01-d819-41c0-8e21-7fd7ba47148e
+AAI.model-version-id.availability-zone=availability-zone-version-id
+AAI.model-invariant-id.availability-zone=availability-zone-invariant-id
 #az-and-dvs-switches widget details
-AAI.model-version-id.az-and-dvs-switches=b2dea88d-78a0-49bf-95c9-5819df08e966
-AAI.model-invariant-id.az-and-dvs-switches=53dc00d4-e6d9-48ec-b6cc-3d3797e9b896
+AAI.model-version-id.az-and-dvs-switches=az-and-dvs-switches-version-id
+AAI.model-invariant-id.az-and-dvs-switches=az-and-dvs-switches-invariant-id
 #class-of-service widget details
-AAI.model-version-id.class-of-service=d2fb27cc-15eb-4c4e-828e-71d41aaecc5b
-AAI.model-invariant-id.class-of-service=18094b19-d16d-4822-8acf-e92c6aefa178
+AAI.model-version-id.class-of-service=class-of-service-version-id
+AAI.model-invariant-id.class-of-service=class-of-service-invariant-id
 #cloud-region widget details
-AAI.model-version-id.cloud-region=2a160989-b202-47dd-874b-4a0f275998f7
-AAI.model-invariant-id.cloud-region=425b2158-e51d-4509-9945-dad4556474a3
+AAI.model-version-id.cloud-region=cloud-region-version-id
+AAI.model-invariant-id.cloud-region=cloud-region-invariant-id
 #complex widget details
-AAI.model-invariant-id.complex=af91c2f7-35fc-43cf-a13d-443f385b2353
-AAI.model-version-id.complex=3a8ab1ee-9220-4fe8-b89c-9251d160ddc2
+AAI.model-invariant-id.complex=complex-invariant-id
+AAI.model-version-id.complex=complex-version-id
 #configuration widget details
-AAI.model-invariant-id.configuration=166c050d-f69d-4305-943e-0bc58c3a26cf
-AAI.model-version-id.configuration=5a175add-57e4-4a5d-8b02-c36f1d69c52b
+AAI.model-invariant-id.configuration=configuration-invariant-id
+AAI.model-version-id.configuration=configuration-version-id
 #connector widget details
-AAI.model-version-id.connector=22104c9f-29fd-462f-be07-96cd6b46dd33
-AAI.model-invariant-id.connector=4c01c948-7607-4d66-8a6c-99c2c2717936
+AAI.model-version-id.connector=connector-version-id
+AAI.model-invariant-id.connector=connector-invariant-id
 #constrained-element-set widget details
-AAI.model-invariant-id.constrained-element-set=c0292b4f-ee97-40cc-8c2e-f967c48f5701
-AAI.model-version-id.constrained-element-set=01102126-9c04-4a89-945b-b131e61e95d7
+AAI.model-invariant-id.constrained-element-set=constrained-element-set-invariant-id
+AAI.model-version-id.constrained-element-set=constrained-element-set-version-id
 #ctag-assignment widget details
-AAI.model-version-id.ctag-assignment=44e5cb1f-0938-41aa-b766-d4595109fe89
-AAI.model-invariant-id.ctag-assignment=fcb8d46b-b656-4ad6-8fa4-22cef74b443f
+AAI.model-version-id.ctag-assignment=ctag-assignment-version-id
+AAI.model-invariant-id.ctag-assignment=ctag-assignment-invariant-id
 #ctag-pool widget details
-AAI.model-invariant-id.ctag-pool=46c51d4e-d67e-4a9c-b1f5-49b1e9c6fcaa
-AAI.model-version-id.ctag-pool=2056c41f-23b9-4de7-9f50-819adad37d76
+AAI.model-invariant-id.ctag-pool=ctag-pool-invariant-id
+AAI.model-version-id.ctag-pool=ctag-pool-version-id
 #customer widget details
-AAI.model-invariant-id.customer=c1d4305f-cdbd-4bbe-9069-a2f4978fd89e
-AAI.model-version-id.customer=d4df5c27-98a1-4812-a8aa-c17f055b7a3f
+AAI.model-invariant-id.customer=customer-invariant-id
+AAI.model-version-id.customer=customer-version-id
 #cvlan-tag-entry widget details
-AAI.model-version-id.cvlan-tag-entry=c3878ffb-8d85-4114-bee6-e4074a9db10b
-AAI.model-invariant-id.cvlan-tag-entry=245cf4b0-7cc5-4eea-bbd9-753e939adcab
+AAI.model-version-id.cvlan-tag-entry=cvlan-tag-entry-version-id
+AAI.model-invariant-id.cvlan-tag-entry=cvlan-tag-entry-invariant-id
 #dvs-switch widget details
-AAI.model-invariant-id.dvs-switch=98fbb471-1f86-428e-bd8a-c8a25de6fa23
-AAI.model-version-id.dvs-switch=4cb44ae8-e3ab-452a-9f95-bcc8a44c55ea
+AAI.model-invariant-id.dvs-switch=dvs-switch-invariant-id
+AAI.model-version-id.dvs-switch=dvs-switch-version-id
 #edge-prop-names widget details
-AAI.model-invariant-id.edge-prop-names=7a08cad4-8759-46a5-8245-095d1ba57ac6
-AAI.model-version-id.edge-prop-names=f0442326-8201-4d0e-857c-74b4ddcbfc9f
+AAI.model-invariant-id.edge-prop-names=edge-prop-names-invariant-id
+AAI.model-version-id.edge-prop-names=edge-prop-names-version-id
 #element-choice-set widget details
-AAI.model-invariant-id.element-choice-set=9a011958-7165-47a3-b872-00951d1f09ae
-AAI.model-version-id.element-choice-set=af27fbfd-598d-44da-aeae-0f9d3a5fcd6a
+AAI.model-invariant-id.element-choice-set=element-choice-set-invariant-id
+AAI.model-version-id.element-choice-set=element-choice-set-version-id
 #entitlement widget details
-AAI.model-version-id.entitlement=7e27ba2e-b7db-4e13-9fae-d142152ef98a
-AAI.model-invariant-id.entitlement=ae75b5a0-d5e1-4f3a-b8fb-37626a753da3
+AAI.model-version-id.entitlement=entitlement-version-id
+AAI.model-invariant-id.entitlement=entitlement-invariant-id
 #flavor widget details
-AAI.model-invariant-id.flavor=bace8d1c-a261-4041-9e37-823117415d0f
-AAI.model-version-id.flavor=36200fb5-f251-4f5d-a520-7c5ad5c2cd4b
+AAI.model-invariant-id.flavor=flavor-invariant-id
+AAI.model-version-id.flavor=flavor-version-id
 #generic-vnf widget details
-AAI.model-version-id.generic-vnf=93a6166f-b3d5-4f06-b4ba-aed48d009ad9
-AAI.model-invariant-id.generic-vnf=acc6edd8-a8d4-4b93-afaa-0994068be14c
+AAI.model-version-id.generic-vnf=generic-vnf-version-id
+AAI.model-invariant-id.generic-vnf=generic-vnf-invariant-id
 #group-assignment widget details
-AAI.model-invariant-id.group-assignment=7cc05f25-7ba2-42b7-a237-c5662a1689e1
-AAI.model-version-id.group-assignment=fe578080-ce19-4604-8760-fc264fbb2565
+AAI.model-invariant-id.group-assignment=group-assignment-invariant-id
+AAI.model-version-id.group-assignment=group-assignment-version-id
 #image widget details
-AAI.model-version-id.image=f6a038c2-820c-42ba-8c2b-375e24e8f932
-AAI.model-invariant-id.image=3f4c7204-739b-4bbb-87a7-8a6856439c90
+AAI.model-version-id.image=image-version-id
+AAI.model-invariant-id.image=image-invariant-id
 #include-node-filter widget details
-AAI.model-invariant-id.include-node-filter=2a2d8ad2-af0a-4e1f-9982-0c899e7dc827
-AAI.model-version-id.include-node-filter=f05f804d-7057-4ffe-bdc5-39f2f0c9c9fd
+AAI.model-invariant-id.include-node-filter=include-node-filter-invariant-id
+AAI.model-version-id.include-node-filter=include-node-filter-version-id
 #instance-group widget details
-AAI.model-version-id.instance-group=8e6ee9dc-9017-444a-83b3-219edb018128
-AAI.model-invariant-id.instance-group=3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd
+AAI.model-version-id.instance-group=instance-group-version-id
+AAI.model-invariant-id.instance-group=instance-group-invariant-id
 #inventory-item widget details
-AAI.model-invariant-id.inventory-item=cd57d844-9017-4078-aa19-926935a3d77c
-AAI.model-version-id.inventory-item=69957f4a-2155-4b95-8d72-d6dd9b88b27b
+AAI.model-invariant-id.inventory-item=inventory-item-invariant-id
+AAI.model-version-id.inventory-item=inventory-item-version-id
 #inventory-item-data widget details
-AAI.model-version-id.inventory-item-data=0e54bb87-bd6e-4a2b-ad1c-6d935b87ae51
-AAI.model-invariant-id.inventory-item-data=87a383ae-cf03-432e-a9de-04e6a622d0fd
+AAI.model-version-id.inventory-item-data=inventory-item-data-version-id
+AAI.model-invariant-id.inventory-item-data=inventory-item-data-invariant-id
 #ipsec-configuration widget details
-AAI.model-invariant-id.ipsec-configuration=aca4c310-cb45-42bd-9f88-73e40ba7b962
-AAI.model-version-id.ipsec-configuration=d949fd10-36bf-408a-ac7a-cad5004d2e0d
+AAI.model-invariant-id.ipsec-configuration=ipsec-configuration-invariant-id
+AAI.model-version-id.ipsec-configuration=ipsec-configuration-version-id
 #key-data widget details
-AAI.model-version-id.key-data=c23ea04d-1a3b-453d-bc49-a6c783a5e92b
-AAI.model-invariant-id.key-data=f5faa464-c2f2-4cc3-89d2-a90452dc3a07
+AAI.model-version-id.key-data=key-data-version-id
+AAI.model-invariant-id.key-data=key-data-invariant-id
 #l3-interface-ipv4-address-list widget details
-AAI.model-version-id.l3-interface-ipv4-address-list=41e76b6f-1e06-4fd4-82cd-81c50fc4574b
-AAI.model-invariant-id.l3-interface-ipv4-address-list=aad85df2-09be-40fa-b867-16415e4e10e2
+AAI.model-version-id.l3-interface-ipv4-address-list=l3-interface-ipv4-address-list-version-id
+AAI.model-invariant-id.l3-interface-ipv4-address-list=l3-interface-ipv4-address-list-invariant-id
 #l3-interface-ipv6-address-list widget details
-AAI.model-invariant-id.l3-interface-ipv6-address-list=82966045-43ee-4982-8307-7e9610866140
-AAI.model-version-id.l3-interface-ipv6-address-list=d040621d-541a-477b-bb1b-a2b61b14e295
+AAI.model-invariant-id.l3-interface-ipv6-address-list=interface-ipv6-address-list-invariant-id
+AAI.model-version-id.l3-interface-ipv6-address-list=l3-interface-ipv6-address-list-version-id
 #l3-network widget details
-AAI.model-version-id.l3-network=9111f20f-e680-4001-b83f-19a2fc23bfc1
-AAI.model-invariant-id.l3-network=3d560d81-57d0-438b-a2a1-5334dba0651a
+AAI.model-version-id.l3-network=l3-network-version-id
+AAI.model-invariant-id.l3-network=l3-network-invariant-id
 #lag-interface widget details
-AAI.model-version-id.lag-interface=ce95f7c3-b61b-4758-ae9e-7e943b1c103d
-AAI.model-invariant-id.lag-interface=e0ee9bde-c1fc-4651-a95d-8e0597bf7d70
+AAI.model-version-id.lag-interface=lag-interface-version-id
+AAI.model-invariant-id.lag-interface=lag-interface-invariant-id
 #lag-link widget details
-AAI.model-version-id.lag-link=d29a087a-af59-4053-a3f8-0f95a92faa75
-AAI.model-invariant-id.lag-link=86ffe6e5-4d0e-4cec-80b5-5c38aa3eff98
+AAI.model-version-id.lag-link=lag-link-version-id
+AAI.model-invariant-id.lag-link=lag-link-invariant-id
 #license widget details
-AAI.model-invariant-id.license=b9a9b337-1f86-42d3-b9f9-f987a089507c
-AAI.model-version-id.license=6889274b-a1dc-40ab-9090-93677e13e2e6
+AAI.model-invariant-id.license=license-invariant-id
+AAI.model-version-id.license=license-version-id
 #license-key-resource widget details
-AAI.model-invariant-id.license-key-resource=9022ebfe-b54f-4911-a6b2-8c3f5ec189b7
-AAI.model-version-id.license-key-resource=24b25f8c-b8bd-4c62-9421-87c12667aac9
+AAI.model-invariant-id.license-key-resource=license-key-resource-invariant-id
+AAI.model-version-id.license-key-resource=license-key-resource-version-id
 #l-interface widget details
-AAI.model-version-id.l-interface=a32613fd-18b9-459e-aab8-fffb3912966a
-AAI.model-invariant-id.l-interface=cea0a982-8d55-4093-921e-418fbccf7060
+AAI.model-version-id.l-interface=l-interface-version-id
+AAI.model-invariant-id.l-interface=l-interface-invariant-id
 #logical-link widget details
-AAI.model-version-id.logical-link=a1481a38-f8ba-4ae4-bdf1-06c2c6af4c54
-AAI.model-invariant-id.logical-link=fe012535-2c31-4a39-a739-612374c638a0
+AAI.model-version-id.logical-link=logical-link-version-id
+AAI.model-invariant-id.logical-link=logical-link-invariant-id
 #metadatum widget details
-AAI.model-invariant-id.metadatum=86dbb63a-265e-4614-993f-6771c30b56a5
-AAI.model-version-id.metadatum=6bae950e-8939-41d3-a6a7-251b03e4c1fc
+AAI.model-invariant-id.metadatum=metadatum-invariant-id
+AAI.model-version-id.metadatum=metadatum-version-id
 #model widget details
-AAI.model-invariant-id.model=06d1418a-5faa-452d-a94b-a2829df5f67b
-AAI.model-version-id.model=1f51c05c-b164-4c27-9c03-5cbb239fd6be
+AAI.model-invariant-id.model=model-invariant-id
+AAI.model-version-id.model=model-version-id
 #model-constraint widget details
-AAI.model-invariant-id.model-constraint=c28966f3-e758-4483-b37b-a90b05d3dd33
-AAI.model-version-id.model-constraint=ad70dd19-f156-4fb5-a865-97b5563b0d37
+AAI.model-invariant-id.model-constraint=model-constraint-invariant-id
+AAI.model-version-id.model-constraint=model-constraint-version-id
 #model-element widget details
-AAI.model-invariant-id.model-element=2076e726-3577-477a-a300-7fa65cd4df11
-AAI.model-version-id.model-element=753e813a-ba9e-4a1d-ab34-b2f6dc6eec0c
+AAI.model-invariant-id.model-element=model-element-invariant-id
+AAI.model-version-id.model-element=model-element-version-id
 #multicast-configuration widget details
-AAI.model-invariant-id.multicast-configuration=ea78c9e3-514d-4a0a-9162-13837fa54c35
-AAI.model-version-id.multicast-configuration=666a06ee-4b57-46df-bacf-908da8f10c3f
+AAI.model-invariant-id.multicast-configuration=multicast-configuration-invariant-id
+AAI.model-version-id.multicast-configuration=multicast-configuration-version-id
 #named-query widget details
-AAI.model-version-id.named-query=5c3b7c33-afa3-4be5-8da7-1a5ac6f99896
-AAI.model-invariant-id.named-query=80b712fd-0ad3-4180-a99c-8c995cf1cc32
+AAI.model-version-id.named-query=named-query-version-id
+AAI.model-invariant-id.named-query=named-query-invariant-id
 #named-query-element widget details
-AAI.model-version-id.named-query-element=204c641a-3494-48c8-979a-86856f5fd32a
-AAI.model-invariant-id.named-query-element=3c504d40-b847-424c-9d25-4fb7e0a3e994
+AAI.model-version-id.named-query-element=named-query-element-version-id
+AAI.model-invariant-id.named-query-element=amed-query-element-invariant-id
 #network-policy widget details
-AAI.model-invariant-id.network-policy=6aa05779-94d7-4d8b-9bee-59ef2ab0c246
-AAI.model-version-id.network-policy=a0ccd9dc-7062-4940-9bcc-e91dd28af510
+AAI.model-invariant-id.network-policy=network-policy-invariant-id
+AAI.model-version-id.network-policy=network-policy-version-id
 #network-profile widget details
-AAI.model-version-id.network-profile=01f45471-4240-498c-a9e1-235dc0b8b4a6
-AAI.model-invariant-id.network-profile=2734b44a-b8a2-40f6-957d-6256589e5d00
+AAI.model-version-id.network-profile=network-profile-version-id
+AAI.model-invariant-id.network-profile=network-profile-invariant-id
 #newvce widget details
-AAI.model-version-id.newvce=7c79e11f-a408-4593-aa86-ba948a1236af
-AAI.model-invariant-id.newvce=4b05ec9c-c55d-4987-83ff-e08d6ddb694f
+AAI.model-version-id.newvce=newvce-version-id
+AAI.model-invariant-id.newvce=newvce-invariant-id
 #oam-network widget details
-AAI.model-invariant-id.oam-network=2851cf01-9c40-4064-87d4-6184a6fcff35
-AAI.model-version-id.oam-network=f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79
+AAI.model-invariant-id.oam-network=oam-network-invariant-id
+AAI.model-version-id.oam-network=oam-network-version-id
 #physical-link widget details
-AAI.model-invariant-id.physical-link=c822d81f-822f-4304-9623-1025b53da568
-AAI.model-version-id.physical-link=9c523936-95b4-4d7f-9f53-6bdfe0cf2c05
+AAI.model-invariant-id.physical-link=physical-link-invariant-id
+AAI.model-version-id.physical-link=physical-link-version-id
 #p-interface widget details
-AAI.model-invariant-id.p-interface=94043c37-4e73-439c-a790-0fdd697924cd
-AAI.model-version-id.p-interface=d2cdb2d0-fc1f-4a57-a89e-591b1c4e3754
+AAI.model-invariant-id.p-interface=p-interface-invariant-id
+AAI.model-version-id.p-interface=p-interface-version-id
 #pnf widget details
-AAI.model-version-id.pnf=e9f1fa7d-c839-418a-9601-03dc0d2ad687
-AAI.model-invariant-id.pnf=862b25a1-262a-4961-bdaa-cdc55d69785a
+AAI.model-version-id.pnf=pnf-version-id
+AAI.model-invariant-id.pnf=pnf-invariant-id
 #port-group widget details
-AAI.model-version-id.port-group=03e8bb6b-b48a-46ae-b5d4-e5af577e6844
-AAI.model-invariant-id.port-group=8ce940fb-55d7-4230-9e7f-a56cc2741f77
+AAI.model-version-id.port-group=port-group-version-id
+AAI.model-invariant-id.port-group=port-group-invariant-id
 #property-constraint widget details
-AAI.model-version-id.property-constraint=81706bbd-981e-4362-ae20-995cbcb2d995
+AAI.model-version-id.property-constraint=property-constraint-version-id
 AAI.model-invariant-id.property-constraint=f4a863c3-6886-470a-a6ae-05723837ea45
 #pserver widget details
-AAI.model-invariant-id.pserver=6d932c8f-463b-4e76-83fb-87acfbaa2e2d
-AAI.model-version-id.pserver=72f0d495-bc27-4653-9e1a-eef76bd34bc9
+AAI.model-invariant-id.pserver=pserver-invariant-id
+AAI.model-version-id.pserver=pserver-version-id
 #related-lookup widget details
-AAI.model-invariant-id.related-lookup=468f6f5b-2996-41bb-b2a3-7cf9613ebb9b
-AAI.model-version-id.related-lookup=0988bab5-bf4f-4938-a419-ab249867d12a
+AAI.model-invariant-id.related-lookup=related-lookup-invariant-id
+AAI.model-version-id.related-lookup=related-lookup-version-id
 #reserved-prop-names widget details
-AAI.model-invariant-id.reserved-prop-names=0c3e0ba3-618c-498d-9127-c8d42b00170f
-AAI.model-version-id.reserved-prop-names=ac49d26d-9163-430e-934a-13b738a04f5c
+AAI.model-invariant-id.reserved-prop-names=reserved-prop-names-invariant-id
+AAI.model-version-id.reserved-prop-names=reserved-prop-names-version-id
 #result-data widget details
-AAI.model-version-id.result-data=4e9b50aa-5227-4f6f-b489-62e6bbc03c79
-AAI.model-invariant-id.result-data=ff656f23-6185-406f-9006-4b26834f3e1c
+AAI.model-version-id.result-data=result-data-version-id
+AAI.model-invariant-id.result-data=result-data-invariant-id
 #route-table-reference widget details
-AAI.model-version-id.route-table-reference=fed7e326-03a7-45ff-a3f2-471470d268c4
-AAI.model-invariant-id.route-table-reference=a8614b63-2636-4c4f-98df-fd448c4241db
+AAI.model-version-id.route-table-reference=route-table-reference-version-id
+AAI.model-invariant-id.route-table-reference=route-table-reference-invariant-id
 #routing-instance widget details
-AAI.model-invariant-id.routing-instance=1c2ded4f-8b01-4193-829c-966847dfec3e
-AAI.model-version-id.routing-instance=3ccbcbc7-d19e-44d5-a52f-7e18aa8d69fa
+AAI.model-invariant-id.routing-instance=routing-instance-invariant-id
+AAI.model-version-id.routing-instance=routing-instance-version-id
 #secondary-filter widget details
-AAI.model-version-id.secondary-filter=1380619d-dd1a-4cec-b755-c6407833e065
-AAI.model-invariant-id.secondary-filter=738ff299-6290-4c00-8998-bd0e96a07b93
+AAI.model-version-id.secondary-filter=secondary-filter-version-id
+AAI.model-invariant-id.secondary-filter=secondary-filter-invariant-id
 #segmentation-assignment widget details
-AAI.model-invariant-id.segmentation-assignment=6e814aee-46e1-4583-a9d4-0049bfd2b59b
-AAI.model-version-id.segmentation-assignment=c5171ae0-44fb-4c04-b482-d56702241a44
+AAI.model-invariant-id.segmentation-assignment=segmentation-assignment-invariant-id
+AAI.model-version-id.segmentation-assignment=segmentation-assignment-version-id
 #service widget details
-AAI.model-version-id.service=ecce2c42-3957-4ae0-9442-54bc6afe27b6
-AAI.model-invariant-id.service=07a3a60b-1b6c-4367-8173-8014386f89e3
+AAI.model-version-id.service=service-version-id
+AAI.model-invariant-id.service=service-invariant-id
 #service-capability widget details
-AAI.model-invariant-id.service-capability=b1a7cc05-d19d-443b-a5d1-733e325c4232
-AAI.model-version-id.service-capability=f9cfec1b-18da-4bba-bd83-4b26cca115cd
+AAI.model-invariant-id.service-capability=service-capability-invariant-id
+AAI.model-version-id.service-capability=service-capability-version-id
 #service-instance widget details
-AAI.model-invariant-id.service-instance=82194af1-3c2c-485a-8f44-420e22a9eaa4
-AAI.model-version-id.service-instance=46b92144-923a-4d20-b85a-3cbd847668a9
+AAI.model-invariant-id.service-instance=service-instance-invariant-id
+AAI.model-version-id.service-instance=service-instance-version-id
 #service-subscription widget details
-AAI.model-invariant-id.service-subscription=2e1a602a-acd8-4f78-94ff-618b802a303b
-AAI.model-version-id.service-subscription=5e68299a-79f2-4bfb-8fbc-2bae877a2459
+AAI.model-invariant-id.service-subscription=service-subscription-invariant-id
+AAI.model-version-id.service-subscription=service-subscription-version-id
 #site-pair widget details
-AAI.model-version-id.site-pair=7106bc02-6552-4fc3-8a56-4f3df9034531
-AAI.model-invariant-id.site-pair=db63f3e6-f8d1-484e-8d5e-191600b7914b
+AAI.model-version-id.site-pair=site-pair-version-id
+AAI.model-invariant-id.site-pair=site-pair-invariant-id
 #site-pair-set widget details
-AAI.model-invariant-id.site-pair-set=5d4dae3e-b402-4bfd-909e-ece12ff75d26
-AAI.model-version-id.site-pair-set=a5c6c1bc-dc38-468e-9459-bb08f87247df
+AAI.model-invariant-id.site-pair-set=site-pair-set-invariant-id
+AAI.model-version-id.site-pair-set=site-pair-set-version-id
 #snapshot widget details
-AAI.model-version-id.snapshot=962a7c8b-687f-4d32-a775-fe098e214bcd
-AAI.model-invariant-id.snapshot=24de00ef-aead-4b52-995b-0adf8d4bd90d
+AAI.model-version-id.snapshot=snapshot-version-id
+AAI.model-invariant-id.snapshot=snapshot-invariant-id
 #sriov-vf widget details
-AAI.model-version-id.sriov-vf=1e8b331f-3d4a-4160-b7aa-f4d5a8916625
-AAI.model-invariant-id.sriov-vf=04b2935f-33c4-40a9-8af0-8b52690042dc
+AAI.model-version-id.sriov-vf=sriov-vf-version-id
+AAI.model-invariant-id.sriov-vf=sriov-vf-invariant-id
 #start-node-filter widget details
-AAI.model-version-id.start-node-filter=aad96fd3-e75f-42fc-9777-3450c36f1168
-AAI.model-invariant-id.start-node-filter=083093a3-e407-447a-ba5d-7583e4d23e1d
+AAI.model-version-id.start-node-filter=start-node-filter-version-id
+AAI.model-invariant-id.start-node-filter=start-node-filter-invariant-id
 #subnet widget details
-AAI.model-version-id.subnet=f902a6bc-6be4-4fe5-8458-a6ec0056b374
-AAI.model-invariant-id.subnet=1b2c9ba7-e449-4831-ba15-3073672f5ef2
+AAI.model-version-id.subnet=subnet-version-id
+AAI.model-invariant-id.subnet=subnet-invariant-id
 #tagged-inventory-item-list widget details
-AAI.model-invariant-id.tagged-inventory-item-list=e78a7eaa-f65d-4919-9c2b-5b258c8c4d7e
-AAI.model-version-id.tagged-inventory-item-list=c246f6e2-e3a1-4697-94c0-5672a7fbbf04
+AAI.model-invariant-id.tagged-inventory-item-list=tagged-inventory-item-list-invariant-id
+AAI.model-version-id.tagged-inventory-item-list=tagged-inventory-item-list-version-id
 #tenant widget details
-AAI.model-invariant-id.tenant=97c26c99-6870-44c1-8a07-1d900d3f4ce6
-AAI.model-version-id.tenant=abcc54bc-bb74-49dc-9043-7f7171707545
+AAI.model-invariant-id.tenant=tenant-invariant-id
+AAI.model-version-id.tenant=tenant-version-id
 #tunnel-xconnect widget details
-AAI.model-invariant-id.tunnel-xconnect=50b9e2fa-005c-4bbe-b651-3251dece4cd8
-AAI.model-version-id.tunnel-xconnect=e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5
+AAI.model-invariant-id.tunnel-xconnect=tunnel-xconnect-invariant-id
+AAI.model-version-id.tunnel-xconnect=tunnel-xconnect-version-id
 #update-node-key widget details
-AAI.model-version-id.update-node-key=6004cfa6-eb6d-4062-971f-b1fde6b74aa0
-AAI.model-invariant-id.update-node-key=fe81c801-f65d-408a-b2b7-a729a18f8154
+AAI.model-version-id.update-node-key=tenant-version-id
+AAI.model-invariant-id.update-node-key=tenant-invariant-id
 #vce widget details
-AAI.model-version-id.vce=b6cf54b5-ec45-43e1-be64-97b4e1513333
-AAI.model-invariant-id.vce=bab6dceb-e7e6-4301-a5e0-a7399b48d792
+AAI.model-version-id.vce=vce-version-id
+AAI.model-invariant-id.vce=vce-invariant-id
 #vf-module widget details
-AAI.model-invariant-id.vf-module=ef86f9c5-2165-44f3-8fc3-96018b609ea5
-AAI.model-version-id.vf-module=c00563ae-812b-4e62-8330-7c4d0f47088a
+AAI.model-invariant-id.vf-module=vf-module-invariant-id
+AAI.model-version-id.vf-module=vf-module-version-id
 #vig-server widget details
-AAI.model-version-id.vig-server=8e8c22f1-fbdf-48ea-844c-8bdeb44e7b16
-AAI.model-invariant-id.vig-server=bed7c3b7-35d0-4cd9-abde-41b20e68b28e
+AAI.model-version-id.vig-server=vig-server-version-id
+AAI.model-invariant-id.vig-server=vig-server-invariant-id
 #virtual-data-center widget details
-AAI.model-invariant-id.virtual-data-center=5150abcf-0c5f-4593-9afe-a19c48fc4824
-AAI.model-version-id.virtual-data-center=6dd43ced-d789-47af-a759-d3abc14e3ac1
+AAI.model-invariant-id.virtual-data-center=virtual-data-center-invariant-id
+AAI.model-version-id.virtual-data-center=virtual-data-center-version-id
 #vlan widget details
-AAI.model-version-id.vlan=257d88a5-a269-4c35-944f-aca04fbdb791
-AAI.model-invariant-id.vlan=d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8
+AAI.model-version-id.vlan=vlan-version-id
+AAI.model-invariant-id.vlan=vlan-invariant-id
 #vnfc widget details
-AAI.model-invariant-id.vnfc=96129eb9-f0de-4e05-8af2-73146473f766
-AAI.model-version-id.vnfc=5761e0a7-c6df-4d8a-9ebd-b8f445054dec
+AAI.model-invariant-id.vnfc=vnfc-invariant-id
+AAI.model-version-id.vnfc=vnfc-version-id
 #vnf-image widget details
-AAI.model-invariant-id.vnf-image=f9a628ff-7aa0-40e2-a93d-02d91c950982
-AAI.model-version-id.vnf-image=c4d3e747-ba4a-4b17-9896-94c6f18c19d3
+AAI.model-invariant-id.vnf-image=vnf-image-invariant-id
+AAI.model-version-id.vnf-image=vnf-image-version-id
 #volume widget details
-AAI.model-version-id.volume=0fbe2e8f-4d91-4415-a772-88387049b38d
-AAI.model-invariant-id.volume=ddd739b4-2b25-46c4-affc-41a32af5cc42
+AAI.model-version-id.volume=volume-version-id
+AAI.model-invariant-id.volume=volume-invariant-id
 #volume-group widget details
-AAI.model-invariant-id.volume-group=fcec1b02-b2d0-4834-aef8-d71be04717dd
-AAI.model-version-id.volume-group=99d44c90-1f61-4418-b9a6-56586bf38c79
+AAI.model-invariant-id.volume-group=volume-group-invariant-id
+AAI.model-version-id.volume-group=volume-group-version-id
 #vpe widget details
-AAI.model-invariant-id.vpe=053ec3a7-5b72-492d-b54d-123805a9b967
-AAI.model-version-id.vpe=203817d3-829c-42d4-942d-2a935478e993
+AAI.model-invariant-id.vpe=vpe-version-id
+AAI.model-version-id.vpe=vpe-version-id
 #vpls-pe widget details
-AAI.model-version-id.vpls-pe=b1566228-6785-4ce1-aea2-053736f80341
-AAI.model-invariant-id.vpls-pe=457ba89b-334c-4fbd-acc4-160ac0e0cdc0
+AAI.model-version-id.vpls-pe=vpls-pe-version-id
+AAI.model-invariant-id.vpls-pe=vpls-pe-invariant-id
 #vpn-binding widget details
-AAI.model-invariant-id.vpn-binding=9e23b675-db2b-488b-b459-57aa9857baa0
-AAI.model-version-id.vpn-binding=21a146e5-9901-448c-9197-723076770119
+AAI.model-invariant-id.vpn-binding=vpn-binding-invariant-id
+AAI.model-version-id.vpn-binding=vpn-binding-version-id
 #vserver widget details
-AAI.model-invariant-id.vserver=ff69d4e0-a8e8-4108-bdb0-dd63217e63c7
-AAI.model-version-id.vserver=8ecb2c5d-7176-4317-a255-26274edfdd53
-#cr widget details
-AAI.model-invariant-id.cr=425b2158-e51d-4509-9945-dad4556474a3
-AAI.model-version-id.cr=2a160989-b202-47dd-874b-4a0f275998f7
+AAI.model-invariant-id.vserver=vserver-invariant-id
+AAI.model-version-id.vserver=vserver-version-id

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 a24167c..2c61f7f 100644 (file)
--- 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
@@ -36,11 +36,11 @@
                             <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-value>service-instance-version-id</relationship-value>
                             </relationship-data>
                             <relationship-data>
                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                <relationship-value>82194af1-3c2c-485a-8f44-420e22a9eaa4</relationship-value>
+                                <relationship-value>service-instance-invariant-id</relationship-value>
                             </relationship-data>
                         </relationship>
                     </relationship-list>
@@ -48,4 +48,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 a9cf0d2..4a4ba76 100644 (file)
--- 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
@@ -17,11 +17,11 @@
                             <related-to>model-ver</related-to>
                             <relationship-data>
                                 <relationship-key>model-ver.model-version-id</relationship-key>
-                                <relationship-value>5a175add-57e4-4a5d-8b02-c36f1d69c52b</relationship-value>
+                                <relationship-value>configuration-version-id</relationship-value>
                             </relationship-data>
                             <relationship-data>
                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                <relationship-value>166c050d-f69d-4305-943e-0bc58c3a26cf</relationship-value>
+                                <relationship-value>configuration-invariant-id</relationship-value>
                             </relationship-data>
                         </relationship>
                     </relationship-list>
@@ -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-SD-WAN-Service-Test-service-1.0.xml b/src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml
index fab91fd..e6ebaa3 100644 (file)
--- 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
@@ -15,7 +15,7 @@
                         <model-element>
                             <new-data-del-flag>T</new-data-del-flag>
                             <cardinality>unbounded</cardinality>
-                            <model-elements />
+                            <model-elements/>
                             <relationship-list>
                                 <relationship>
                                     <related-to>model-ver</related-to>
@@ -33,7 +33,7 @@
                         <model-element>
                             <new-data-del-flag>T</new-data-del-flag>
                             <cardinality>unbounded</cardinality>
-                            <model-elements />
+                            <model-elements/>
                             <relationship-list>
                                 <relationship>
                                     <related-to>model-ver</related-to>
@@ -54,11 +54,11 @@
                             <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-value>service-instance-version-id</relationship-value>
                             </relationship-data>
                             <relationship-data>
                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                <relationship-value>82194af1-3c2c-485a-8f44-420e22a9eaa4</relationship-value>
+                                <relationship-value>service-instance-invariant-id</relationship-value>
                             </relationship-data>
                         </relationship>
                     </relationship-list>

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 4f78ec4..cdd687e 100644 (file)
--- 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
@@ -36,11 +36,11 @@
                             <related-to>model-ver</related-to>
                             <relationship-data>
                                 <relationship-key>model-ver.model-version-id</relationship-key>
-                                <relationship-value>93a6166f-b3d5-4f06-b4ba-aed48d009ad9</relationship-value>
+                                <relationship-value>generic-vnf-version-id</relationship-value>
                             </relationship-data>
                             <relationship-data>
                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                <relationship-value>acc6edd8-a8d4-4b93-afaa-0994068be14c</relationship-value>
+                                <relationship-value>generic-vnf-invariant-id</relationship-value>
                             </relationship-data>
                         </relationship>
                     </relationship-list>
@@ -48,4 +48,4 @@
             </model-elements>
         </model-ver>
     </model-vers>
-</model>
+</model>
\ No newline at end of file

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 d3f28e2..da424c1 100644 (file)
--- 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
@@ -25,11 +25,11 @@
                                             <related-to>model-ver</related-to>
                                             <relationship-data>
                                                 <relationship-key>model-ver.model-version-id</relationship-key>
-                                                <relationship-value>f6a038c2-820c-42ba-8c2b-375e24e8f932</relationship-value>
+                                                <relationship-value>image-version-id</relationship-value>
                                             </relationship-data>
                                             <relationship-data>
                                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                                <relationship-value>3f4c7204-739b-4bbb-87a7-8a6856439c90</relationship-value>
+                                                <relationship-value>image-invariant-id</relationship-value>
                                             </relationship-data>
                                         </relationship>
                                     </relationship-list>
@@ -43,17 +43,17 @@
                                             <related-to>model-ver</related-to>
                                             <relationship-data>
                                                 <relationship-key>model-ver.model-version-id</relationship-key>
-                                                <relationship-value>abcc54bc-bb74-49dc-9043-7f7171707545</relationship-value>
+                                                <relationship-value>flavor-version-id</relationship-value>
                                             </relationship-data>
                                             <relationship-data>
                                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                                <relationship-value>97c26c99-6870-44c1-8a07-1d900d3f4ce6</relationship-value>
+                                                <relationship-value>flavor-invariant-id</relationship-value>
                                             </relationship-data>
                                         </relationship>
                                     </relationship-list>
                                 </model-element>
                                 <model-element>
-                                    <new-data-del-flag>F</new-data-del-flag>
+                                    <new-data-del-flag>T</new-data-del-flag>
                                     <cardinality>unbounded</cardinality>
                                     <model-elements/>
                                     <relationship-list>
@@ -61,17 +61,17 @@
                                             <related-to>model-ver</related-to>
                                             <relationship-data>
                                                 <relationship-key>model-ver.model-version-id</relationship-key>
-                                                <relationship-value>36200fb5-f251-4f5d-a520-7c5ad5c2cd4b</relationship-value>
+                                                <relationship-value>vnfc-version-id</relationship-value>
                                             </relationship-data>
                                             <relationship-data>
                                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                                <relationship-value>bace8d1c-a261-4041-9e37-823117415d0f</relationship-value>
+                                                <relationship-value>vnfc-invariant-id</relationship-value>
                                             </relationship-data>
                                         </relationship>
                                     </relationship-list>
                                 </model-element>
                                 <model-element>
-                                    <new-data-del-flag>T</new-data-del-flag>
+                                    <new-data-del-flag>F</new-data-del-flag>
                                     <cardinality>unbounded</cardinality>
                                     <model-elements/>
                                     <relationship-list>
@@ -79,11 +79,11 @@
                                             <related-to>model-ver</related-to>
                                             <relationship-data>
                                                 <relationship-key>model-ver.model-version-id</relationship-key>
-                                                <relationship-value>5761e0a7-c6df-4d8a-9ebd-b8f445054dec</relationship-value>
+                                                <relationship-value>tenant-version-id</relationship-value>
                                             </relationship-data>
                                             <relationship-data>
                                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                                <relationship-value>96129eb9-f0de-4e05-8af2-73146473f766</relationship-value>
+                                                <relationship-value>tenant-invariant-id</relationship-value>
                                             </relationship-data>
                                         </relationship>
                                     </relationship-list>
@@ -94,11 +94,11 @@
                                     <related-to>model-ver</related-to>
                                     <relationship-data>
                                         <relationship-key>model-ver.model-version-id</relationship-key>
-                                        <relationship-value>8ecb2c5d-7176-4317-a255-26274edfdd53</relationship-value>
+                                        <relationship-value>vserver-version-id</relationship-value>
                                     </relationship-data>
                                     <relationship-data>
                                         <relationship-key>model.model-invariant-id</relationship-key>
-                                        <relationship-value>ff69d4e0-a8e8-4108-bdb0-dd63217e63c7</relationship-value>
+                                        <relationship-value>vserver-invariant-id</relationship-value>
                                     </relationship-data>
                                 </relationship>
                             </relationship-list>
@@ -109,11 +109,11 @@
                             <related-to>model-ver</related-to>
                             <relationship-data>
                                 <relationship-key>model-ver.model-version-id</relationship-key>
-                                <relationship-value>c00563ae-812b-4e62-8330-7c4d0f47088a</relationship-value>
+                                <relationship-value>vf-module-version-id</relationship-value>
                             </relationship-data>
                             <relationship-data>
                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                <relationship-value>ef86f9c5-2165-44f3-8fc3-96018b609ea5</relationship-value>
+                                <relationship-value>vf-module-invariant-id</relationship-value>
                             </relationship-data>
                         </relationship>
                     </relationship-list>
@@ -121,4 +121,4 @@
             </model-elements>
         </model-ver>
     </model-vers>
-</model>
+</model>
\ No newline at end of file

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 3c61f97..56990d3 100644 (file)
--- a/src/test/resources/generatedXml/AAI-Tunnel_XConnTest-resource-2.0.xml
+++ b/src/test/resources/generatedXml/AAI-Tunnel_XConnTest-resource-2.0.xml
@@ -39,11 +39,11 @@
                                     <related-to>model-ver</related-to>
                                     <relationship-data>
                                         <relationship-key>model-ver.model-version-id</relationship-key>
-                                        <relationship-value>e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5</relationship-value>
+                                        <relationship-value>tunnel-xconnect-version-id</relationship-value>
                                     </relationship-data>
                                     <relationship-data>
                                         <relationship-key>model.model-invariant-id</relationship-key>
-                                        <relationship-value>50b9e2fa-005c-4bbe-b651-3251dece4cd8</relationship-value>
+                                        <relationship-value>tunnel-xconnect-invariant-id</relationship-value>
                                     </relationship-data>
                                 </relationship>
                             </relationship-list>
@@ -54,11 +54,11 @@
                             <related-to>model-ver</related-to>
                             <relationship-data>
                                 <relationship-key>model-ver.model-version-id</relationship-key>
-                                <relationship-value>7ad0915f-25c0-4a70-b9bc-185a75f87564</relationship-value>
+                                <relationship-value>allotted-resource-version-id</relationship-value>
                             </relationship-data>
                             <relationship-data>
                                 <relationship-key>model.model-invariant-id</relationship-key>
-                                <relationship-value>f6d6a23d-a1a9-48ff-8419-b6530da2d381</relationship-value>
+                                <relationship-value>allotted-resource-invariant-id</relationship-value>
                             </relationship-data>
                         </relationship>
                     </relationship-list>
@@ -66,4 +66,4 @@
             </model-elements>
         </model-ver>
     </model-vers>
-</model>
+</model>
\ No newline at end of file

diff --git a/src/test/resources/response/response.json b/src/test/resources/response/response.json
index 489b80f..6dddad7 100644 (file)
--- a/src/test/resources/response/response.json
+++ b/src/test/resources/response/response.json
@@ -1 +1 @@
-[{"name":"AAI-29NFOD_S-service-1.0.xml","type":"MODEL","payload":"<model xmlns=\"http://org.onap.aai.inventory/v14\">\n    <model-invariant-id>4da8d1e8-f59a-4370-84ea-c6de836821fc</model-invariant-id>\n    <model-type>service</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>a76ed81f-23d2-4e69-8972-eb1c69855e64</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>3f283439-4e0e-4a6a-9b31-da5d0cb05b52</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>bc3622d2-a645-4806-80f2-96b04a866bbf</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>46b92144-923a-4d20-b85a-3cbd847668a9</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>82194af1-3c2c-485a-8f44-420e22a9eaa4</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/v14\">\n    <model-invariant-id>bc3622d2-a645-4806-80f2-96b04a866bbf</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>3f283439-4e0e-4a6a-9b31-da5d0cb05b52</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>93a6166f-b3d5-4f06-b4ba-aed48d009ad9</relationship-value>\n                            </relationship-data>\n                            <relationship-data>\n                                <relationship-key>model.model-invariant-id</relationship-key>\n                                <relationship-value>acc6edd8-a8d4-4b93-afaa-0994068be14c</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/v14\">\n    <model-invariant-id>4da8d1e8-f59a-4370-84ea-c6de836821fc</model-invariant-id>\n    <model-type>service</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>a76ed81f-23d2-4e69-8972-eb1c69855e64</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>3f283439-4e0e-4a6a-9b31-da5d0cb05b52</relationship-value>\n                                    </relationship-data>\n                                    <relationship-data>\n                                        <relationship-key>model.model-invariant-id</relationship-key>\n                                        <relationship-value>bc3622d2-a645-4806-80f2-96b04a866bbf</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/v14\">\n    <model-invariant-id>bc3622d2-a645-4806-80f2-96b04a866bbf</model-invariant-id>\n    <model-type>resource</model-type>\n    <model-vers>\n        <model-ver>\n            <model-version-id>3f283439-4e0e-4a6a-9b31-da5d0cb05b52</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\"}]"}]