From: akshay.khairnar@t-systems.com Date: Thu, 20 Nov 2025 11:15:50 +0000 (+0100) Subject: update schema service version 1.13.3 and upgrade to v31 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=aai%2Fresources.git 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 --- diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index d6228af6..89b18aa2 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -28,7 +28,7 @@ org.onap.aai.resources resources - 1.17.0-SNAPSHOT + 1.17.1-SNAPSHOT 17 @@ -70,8 +70,8 @@ v11 v12 v12 - v30 - v10,v11,v12,v13,v14,v15,v23,v29,v30 + v31 + v10,v11,v12,v13,v14,v15,v23,v29,v30,v31 /aai ${project.basedir}/src/main/resources/application.properties @@ -180,7 +180,7 @@ onap v12 - v10,v11,v12,v13,v14,v15,v16,v23,v29,v30 + v10,v11,v12,v13,v14,v15,v16,v23,v29,v30,v31 ${project.basedir}/src/main/resources/application.properties diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties index 194ba597..12210b25 100644 --- 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 ebf62696..a0187f84 100644 --- 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 a0a55e3e..8074506c 100644 --- 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 a7534ef4..fd926935 100644 --- 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 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 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 7473868d..950f9417 100644 --- 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 e893a40e..95cfb3c0 100644 --- 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 @@ - + d821d1aa-8a69-47a4-aa63-3dae1742c47c service Network Service diff --git a/pom.xml b/pom.xml index 3d0ed5b5..05dbd5ec 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.resources resources - 1.17.0-SNAPSHOT + 1.17.1-SNAPSHOT aai-resources pom @@ -50,7 +50,7 @@ ${project.version} 1.17.0-SNAPSHOT - 1.13.1 + 1.13.3-SNAPSHOT 3.11.0.3922