From 45973a4c967e589dd119da9990047257f695f424 Mon Sep 17 00:00:00 2001 From: "vani.kv" Date: Tue, 10 Dec 2024 17:05:59 +0530 Subject: [PATCH] [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 --- aai-resources/pom.xml | 8 ++++---- aai-resources/src/main/resources/application.properties | 4 ++-- .../src/test/java/org/onap/aai/it/performance/K6ReadTest.java | 4 ++-- .../src/test/java/org/onap/aai/rest/ModelDistributionTest.java | 4 ++-- .../java/org/onap/aai/rest/resources/ResourcesControllerTest.java | 6 +++--- aai-resources/src/test/resources/application-test.properties | 4 ++-- .../src/test/resources/it/application-keycloak-test.properties | 2 +- .../src/test/resources/payloads/models/network-service.xml | 2 +- pom.xml | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 07c87292..6692e757 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -28,7 +28,7 @@ org.onap.aai.resources resources - 1.15.3-SNAPSHOT + 1.15.4-SNAPSHOT 11 @@ -70,8 +70,8 @@ v11 v12 v12 - v29 - v10,v11,v12,v13,v14,v15,v23,v29 + v30 + v10,v11,v12,v13,v14,v15,v23,v29,v30 /aai ${project.basedir}/src/main/resources/application.properties @@ -184,7 +184,7 @@ onap v12 - v10,v11,v12,v13,v14,v15,v16,v23,v29 + v10,v11,v12,v13,v14,v15,v16,v23,v29,v30 ${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 ee5a0ec1..f0ef368a 100644 --- 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 f176ccc0..6d7a3934 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 @@ -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 1ba8652e..a0a55e3e 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/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 a724b51b..da7c0647 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 @@ -358,7 +358,7 @@ public class ResourcesControllerTest { assertEquals("Error writing output performing %1 on %2 (msg=%3) (ec=%4)", serviceException.getText()); List 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 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 17dc34fd..2118d045 100644 --- 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 7a86d1ae..6fff1c1c 100644 --- 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 977c186e..e893a40e 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 6cea6096..1cc88dcb 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.resources resources - 1.15.3-SNAPSHOT + 1.15.4-SNAPSHOT aai-resources pom @@ -50,7 +50,7 @@ ${project.version} 1.15.3 - 1.12.6 + 1.12.7 -- 2.16.6