From ceb00879950bde57cbc454e8d5808a58eb1524bd Mon Sep 17 00:00:00 2001 From: nandkishorpatke Date: Wed, 15 Nov 2023 13:02:21 +0530 Subject: [AAI] Update aai-schema version into v28 for cell and neighbour attributes - Update aai-schema pom version into 1.12.3 - Update aai-schema default version to v28 Issue-ID: AAI-3663 Change-Id: I06f3e7158c94dd1214a122a7d4eb7f88594f49f5 Signed-off-by: nandkishorpatke --- aai-resources/src/main/resources/application.properties | 4 ++-- .../src/test/java/org/onap/aai/rest/ModelDistributionTest.java | 2 +- aai-resources/src/test/resources/application-test.properties | 4 ++-- .../src/test/resources/it/application-keycloak-test.properties | 2 +- aai-resources/src/test/resources/payloads/models/network-service.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'aai-resources/src') diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties index adf899a..094c81c 100644 --- a/aai-resources/src/main/resources/application.properties +++ b/aai-resources/src/main/resources/application.properties @@ -69,7 +69,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,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27 +schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28 # 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 @@ -82,7 +82,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=v27 +schema.version.api.default=v28 #schema.translator.list=schema-service 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 249ef52..0962d43 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 @@ -47,7 +47,7 @@ public class ModelDistributionTest extends AbstractSpringRestTest { @Test public void thatModelsCanBeDistributed() throws Exception { final String MODEL_FILE = "src/test/resources/payloads/models/network-service.xml"; - String uri = baseUrl + "/aai/v27/service-design-and-creation/models/model/d821d1aa-8a69-47a4-aa63-3dae1742c47c"; + String uri = baseUrl + "/aai/v28/service-design-and-creation/models/model/d821d1aa-8a69-47a4-aa63-3dae1742c47c"; headers.setAccept(Collections.singletonList(MediaType.APPLICATION_XML)); headers.setContentType(null); diff --git a/aai-resources/src/test/resources/application-test.properties b/aai-resources/src/test/resources/application-test.properties index e0ec501..cdc528f 100644 --- a/aai-resources/src/test/resources/application-test.properties +++ b/aai-resources/src/test/resources/application-test.properties @@ -56,7 +56,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,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27 +schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28 # 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 @@ -69,7 +69,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=v27 +schema.version.api.default=v28 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 58d4b2a..914f2fc 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,v15,v23,v24,v25,v26,v27 +schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28 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 4411513..3a5c054 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 -- cgit 1.2.3-korg