update schema service version 1.13.3 and upgrade to v31

- Updated schema service dependency version 1.13.3
- Applied v31 schema updates to AAI resources
- Bump up aai-resources to 1.17.1

Issue-ID: AAI-4207
Change-Id: I61a01b86e4031c952202782b1fc27055176c73c7
Signed-off-by: akshay.khairnar@t-systems.com <akshay.khairnar@t-systems.com>

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index d6228af..89b18aa 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.17.0-SNAPSHOT</version>
+        <version>1.17.1-SNAPSHOT</version>
     </parent>
     <properties>
         <java.version>17</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>v30</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v23,v29,v30</schema.version.list>
+        <schema.version.api.default>v31</schema.version.api.default>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v23,v29,v30,v31</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>
@@ -180,7 +180,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,v30</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v23,v29,v30,v31</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 194ba59..12210b2 100644 (file)
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -65,7 +65,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,v30
+schema.version.list=v10,v11,v12,v13,v14,v15,v23,v30,v31
 # 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
@@ -78,7 +78,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=v30
+schema.version.api.default=v31
 
 
 #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 ebf6269..a0187f8 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
@@ -87,7 +87,7 @@ public class K6ReadTest {
         .withAccessToHost(true)
         .withTestScript(MountableFile.forClasspathResource("k6/readWithoutRelations.js"))
         .withScriptVar("API_PORT", String.valueOf(port))
-        .withScriptVar("API_VERSION", "v30")
+        .withScriptVar("API_VERSION", "v31")
         .withScriptVar("DURATION_SECONDS", String.valueOf(testDuration))
         .withScriptVar("N_PSERVERS", String.valueOf(nPservers))
         .withCmdOptions("--quiet", "--no-usage-report");
@@ -128,7 +128,7 @@ public class K6ReadTest {
         .withAccessToHost(true)
         .withTestScript(MountableFile.forClasspathResource("k6/writeWithoutRelations.js"))
         .withScriptVar("API_PORT", String.valueOf(port))
-        .withScriptVar("API_VERSION", "v30")
+        .withScriptVar("API_VERSION", "v31")
         .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 a0a55e3..8074506 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/v30/service-design-and-creation/models/model/d821d1aa-8a69-47a4-aa63-3dae1742c47c";
+        String uri = "/aai/v31/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/v30/service-design-and-creation/models/model/" + modelInvariantId;
+        String modelUri = "/aai/v31/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 a7534ef..fd92693 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
@@ -274,7 +274,7 @@ public class ResourcesControllerTest {
         assertEquals("Error writing output performing %1 on %2 (msg=%3) (ec=%4)", serviceException.getText());
         List<String> expected = List.of(
             "PUT",
-            "v30/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf",
+            "v31/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf",
             "Cannot write via this URL",
             "ERR.5.6.3010");
         assertIterableEquals(expected, serviceException.getVariables());
@@ -293,7 +293,7 @@ public class ResourcesControllerTest {
         serviceException = errorResponse.getRequestError().getServiceException();
         expected = List.of(
             "PUT",
-            "v30/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship",
+            "v31/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship",
             "Cannot write via this URL",
             "ERR.5.6.3010");
         assertIterableEquals(expected, serviceException.getVariables());
@@ -394,7 +394,7 @@ public class ResourcesControllerTest {
         assertEquals("Error parsing input performing %1 on %2 (msg=%3) (ec=%4)", policyException.getText());
         List<String> expected = List.of(
             "DELETE",
-            "v30/cloud-infrastructure/pservers/pserver/testData/relationship-list/relationship",
+            "v31/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 7473868..950f941 100644 (file)
--- a/aai-resources/src/test/resources/application-test.properties
+++ b/aai-resources/src/test/resources/application-test.properties
@@ -44,7 +44,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,v30
+schema.version.list=v10,v11,v12,v13,v14,v29,v30,v31
 # 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
@@ -57,7 +57,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=v30
+schema.version.api.default=v31
 schema.translator.list=config
 
 #To expose the Prometheus scraping endpoint in unit test

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 e893a40..95cfb3c 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/v30">
+<model xmlns="http://org.onap.aai.inventory/v31">
   <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 3d0ed5b..05dbd5e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.17.1-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.17.0-SNAPSHOT</aai.common.version>
-        <aai.schema.service.version>1.13.1</aai.schema.service.version>
+        <aai.schema.service.version>1.13.3-SNAPSHOT</aai.schema.service.version>
         <sonar.scanner.version>3.11.0.3922</sonar.scanner.version>
     </properties>
     <build>