[AAI] Update aai-schema version to 1.12.7 in Resources

- Bump aai-schema pom version to 1.12.7
- Update aai-schema default version to v30
- Increase version to 1.15.4-SNAPSHOT

Issue-ID: AAI-4075
Change-Id: I29df327fdb8e4c7b4b2745b55fc0494102f9127b
Signed-off-by: vani.kv <vani.kv@accenture.com>

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 07c8729..6692e75 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.resources</groupId>
         <artifactId>resources</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
     </parent>
     <properties>
         <java.version>11</java.version>
@@ -70,8 +70,8 @@
         <schema.version.app.root.start>v11</schema.version.app.root.start>
         <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
         <schema.version.edge.label.start>v12</schema.version.edge.label.start>
-        <schema.version.api.default>v29</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v23,v29</schema.version.list>
+        <schema.version.api.default>v30</schema.version.api.default>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v23,v29,v30</schema.version.list>
         <schema.uri.base.path>/aai</schema.uri.base.path>
         <!-- <schema.translator.list>config</schema.translator.list> -->
         <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file>
@@ -184,7 +184,7 @@
             <properties>
                 <schema.source.name>onap</schema.source.name>
                 <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
-                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v23,v29</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v23,v29,v30</schema.version.list>
                 <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file>
             </properties>
         </profile>

diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties
index ee5a0ec..f0ef368 100644 (file)
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -80,7 +80,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
 
 schema.uri.base.path=/aai
 # Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v23,v29
+schema.version.list=v10,v11,v12,v13,v14,v15,v23,v30
 # Specifies from which version should the depth parameter to default to zero
 schema.version.depth.start=v10
 # Specifies from which version should the related link be displayed in response payload
@@ -93,7 +93,7 @@ schema.version.namespace.change.start=v12
 # Specifies from which version should the client start seeing the edge label in payload
 schema.version.edge.label.start=v12
 # Specifies the version that the application should default to
-schema.version.api.default=v29
+schema.version.api.default=v30
 
 
 #schema.translator.list=schema-service

diff --git a/aai-resources/src/test/java/org/onap/aai/it/performance/K6ReadTest.java b/aai-resources/src/test/java/org/onap/aai/it/performance/K6ReadTest.java
index f176ccc..6d7a393 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/it/performance/K6ReadTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/it/performance/K6ReadTest.java
@@ -89,7 +89,7 @@ public class K6ReadTest {
         .withAccessToHost(true)
         .withTestScript(MountableFile.forClasspathResource("k6/readWithoutRelations.js"))
         .withScriptVar("API_PORT", String.valueOf(port))
-        .withScriptVar("API_VERSION", "v29")
+        .withScriptVar("API_VERSION", "v30")
         .withScriptVar("DURATION_SECONDS", String.valueOf(testDuration))
         .withScriptVar("N_PSERVERS", String.valueOf(nPservers))
         .withCmdOptions("--quiet", "--no-usage-report");
@@ -130,7 +130,7 @@ public class K6ReadTest {
         .withAccessToHost(true)
         .withTestScript(MountableFile.forClasspathResource("k6/writeWithoutRelations.js"))
         .withScriptVar("API_PORT", String.valueOf(port))
-        .withScriptVar("API_VERSION", "v29")
+        .withScriptVar("API_VERSION", "v30")
         .withScriptVar("DURATION_SECONDS", String.valueOf(testDuration))
         .withScriptVar("N_PSERVERS", String.valueOf(nPservers))
         .withCmdOptions("--quiet", "--no-usage-report");

diff --git a/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
index 1ba8652..a0a55e3 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
@@ -64,7 +64,7 @@ public class ModelDistributionTest {
     @Test
     @Order(1)
     public void thatModelsCanBeDistributed() throws Exception {
-        String uri = "/aai/v29/service-design-and-creation/models/model/d821d1aa-8a69-47a4-aa63-3dae1742c47c";
+        String uri = "/aai/v30/service-design-and-creation/models/model/d821d1aa-8a69-47a4-aa63-3dae1742c47c";
 
         webClient.get()
                 .uri(uri)
@@ -117,7 +117,7 @@ public class ModelDistributionTest {
         final String UPDATE_MODEL_FILE = "src/test/resources/payloads/models/model-version.xml";
         String modelInvariantId = "d821d1aa-8a69-47a4-aa63-3dae1742c47c";
         String modelVersionId = "8b713350-90fc-44b1-8c6e-a2b3973aa9d3";
-        String modelUri = "/aai/v29/service-design-and-creation/models/model/" + modelInvariantId;
+        String modelUri = "/aai/v30/service-design-and-creation/models/model/" + modelInvariantId;
         String modelVersionUri = modelUri + "/model-vers/model-ver/" + modelVersionId;
         webClient.get()
                 .uri(modelUri)

diff --git a/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
index a724b51..da7c064 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
@@ -358,7 +358,7 @@ public class ResourcesControllerTest {
         assertEquals("Error writing output performing %1 on %2 (msg=%3) (ec=%4)", serviceException.getText());
         List<String> expected = List.of(
             "PUT",
-            "v29/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf",
+            "v30/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf",
             "Cannot write via this URL",
             "ERR.5.6.3010");
         assertIterableEquals(expected, serviceException.getVariables());
@@ -377,7 +377,7 @@ public class ResourcesControllerTest {
         serviceException = errorResponse.getRequestError().getServiceException();
         expected = List.of(
             "PUT",
-            "v29/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship",
+            "v30/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship",
             "Cannot write via this URL",
             "ERR.5.6.3010");
         assertIterableEquals(expected, serviceException.getVariables());
@@ -483,7 +483,7 @@ public class ResourcesControllerTest {
         assertEquals("Error parsing input performing %1 on %2 (msg=%3) (ec=%4)", policyException.getText());
         List<String> expected = List.of(
             "DELETE",
-            "v29/cloud-infrastructure/pservers/pserver/testData/relationship-list/relationship",
+            "v30/cloud-infrastructure/pservers/pserver/testData/relationship-list/relationship",
             "Error parsing input performing %1 on %2:You must supply a relationship",
             "ERR.5.1.3102");
         assertIterableEquals(expected, policyException.getVariables());

diff --git a/aai-resources/src/test/resources/application-test.properties b/aai-resources/src/test/resources/application-test.properties
index 17dc34f..2118d04 100644 (file)
--- a/aai-resources/src/test/resources/application-test.properties
+++ b/aai-resources/src/test/resources/application-test.properties
@@ -55,7 +55,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
 # Schema Version Related Attributes
 schema.uri.base.path=/aai
 # Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v29
+schema.version.list=v10,v11,v12,v13,v14,v29,v30
 # Specifies from which version should the depth parameter to default to zero
 schema.version.depth.start=v10
 # Specifies from which version should the related link be displayed in response payload
@@ -68,7 +68,7 @@ schema.version.namespace.change.start=v12
 # Specifies from which version should the client start seeing the edge label in payload
 schema.version.edge.label.start=v12
 # Specifies the version that the application should default to
-schema.version.api.default=v29
+schema.version.api.default=v30
 schema.translator.list=config
 
 #To expose the Prometheus scraping endpoint in unit test

diff --git a/aai-resources/src/test/resources/it/application-keycloak-test.properties b/aai-resources/src/test/resources/it/application-keycloak-test.properties
index 7a86d1a..6fff1c1 100644 (file)
--- a/aai-resources/src/test/resources/it/application-keycloak-test.properties
+++ b/aai-resources/src/test/resources/it/application-keycloak-test.properties
@@ -14,4 +14,4 @@ keycloak.bearer-only=true
 
 multi.tenancy.enabled=true
 spring.profiles.active=production,keycloak
-schema.version.list=v10,v11,v12,v13,v14,v29
+schema.version.list=v10,v11,v12,v13,v14,v29,v30

diff --git a/aai-resources/src/test/resources/payloads/models/network-service.xml b/aai-resources/src/test/resources/payloads/models/network-service.xml
index 977c186..e893a40 100644 (file)
--- a/aai-resources/src/test/resources/payloads/models/network-service.xml
+++ b/aai-resources/src/test/resources/payloads/models/network-service.xml
@@ -1,4 +1,4 @@
-<model xmlns="http://org.onap.aai.inventory/v29">
+<model xmlns="http://org.onap.aai.inventory/v30">
   <model-invariant-id>d821d1aa-8a69-47a4-aa63-3dae1742c47c</model-invariant-id>
   <model-type>service</model-type>
   <model-role>Network Service</model-role>

diff --git a/pom.xml b/pom.xml
index 6cea609..1cc88dc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.4-SNAPSHOT</version>
     <name>aai-resources</name>
     <packaging>pom</packaging>
     <modules>
@@ -50,7 +50,7 @@
         <!-- GMaven plugin uses this property to figure out the name of the docker tag -->
         <aai.project.version>${project.version}</aai.project.version>
         <aai.common.version>1.15.3</aai.common.version>
-        <aai.schema.service.version>1.12.6</aai.schema.service.version>
+        <aai.schema.service.version>1.12.7</aai.schema.service.version>
     </properties>
     <build>
         <pluginManagement>