From 28d74254cf55b0683d6ac72e297dd25b803a29d5 Mon Sep 17 00:00:00 2001
From: "mark.j.leonard" <mark.j.leonard@gmail.com>
Date: Tue, 24 Jul 2018 12:45:57 +0100
Subject: Update expected results to v14 namespace

The aai-schema version has changed from v13 to v14. Unit tests which
compare actual results with expected results are updated not to fail.

Change-Id: I464eec917d5062e21a5f9c41155fe86ca1e073b9
Issue-ID: AAI-1400
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
---
 src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml  | 4 ++--
 .../generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml   | 4 ++--
 .../resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml    | 4 ++--
 src/test/resources/response/response.json                             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

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 5653c8a..a24167c 100644
--- a/src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml	
+++ b/src/test/resources/generatedXml/AAI-Port Mirror_Test-service-1.0.xml	
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v13">
+<model xmlns="http://org.onap.aai.inventory/v14">
     <model-invariant-id>cd674566-ce17-4262-ae99-d526e7b8d47a</model-invariant-id>
     <model-type>service</model-type>
     <model-vers>
@@ -48,4 +48,4 @@
             </model-elements>
         </model-ver>
     </model-vers>
-</model>
\ No newline at end of file
+</model>
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 9418205..a9cf0d2 100644
--- a/src/test/resources/generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml	
+++ b/src/test/resources/generatedXml/AAI-Port Mirroring Configuration-resource-35.0.xml	
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v13">
+<model xmlns="http://org.onap.aai.inventory/v14">
     <model-invariant-id>cf53c1d6-8708-4b4e-a056-ead7daa57cd5</model-invariant-id>
     <model-type>resource</model-type>
     <model-vers>
@@ -29,4 +29,4 @@
             </model-elements>
         </model-ver>
     </model-vers>
-</model>
\ No newline at end of file
+</model>
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 d4b0556..8ca25c3 100644
--- a/src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml
+++ b/src/test/resources/generatedXml/AAI-SD-WAN-Service-Test-service-1.0.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v13">
+<model xmlns="http://org.onap.aai.inventory/v14">
     <model-invariant-id>1c111111-1111-1111-1111-111111111111</model-invariant-id>
     <model-type>service</model-type>
     <model-vers>
@@ -29,4 +29,4 @@
             </model-elements>
         </model-ver>
     </model-vers>
-</model>
\ No newline at end of file
+</model>
diff --git a/src/test/resources/response/response.json b/src/test/resources/response/response.json
index e2a0951..489b80f 100644
--- 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/v13\">\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/v13\">\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\"}]"}]
\ No newline at end of file
+[{"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\"}]"}]
-- 
cgit 1.2.3-korg