From e4ff951e645d131a5f4793a75c595da66cc6a23c Mon Sep 17 00:00:00 2001
From: nandkishorpatke <nandkishor-laxman.patke@t-systems.com>
Date: Wed, 22 May 2024 14:21:17 +0530
Subject: [AAI] Update aai-schema version to 1.12.4 in resources

- AAI schema addition for 3GPP RAN Network Slice Subnet
- and Slice-Profile Attributes & FeasibilityCheckJob
- Bump aai-schema pom version to 1.12.4
- Update aai-schema default version to v29

Issue-ID: AAI-3843
Change-Id: I2dcf0141163792cdc9bfdcdd2f7b42dc44f4cb5a
Signed-off-by: nandkishorpatke <nandkishor-laxman.patke@t-systems.com>
---
 aai-resources/pom.xml                                               | 6 +++---
 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 +-
 .../src/test/resources/payloads/models/network-service.xml          | 2 +-
 pom.xml                                                             | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index c22ef1c..f39349a 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -74,8 +74,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>v28</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28</schema.version.list>
+        <schema.version.api.default>v29</schema.version.api.default>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29</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>
@@ -208,7 +208,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,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29</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 3355695..cc0c46a 100644
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -79,7 +79,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,v28
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29
 # 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
@@ -92,7 +92,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=v28
+schema.version.api.default=v29
 
 
 #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 f196353..374519e 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/v28/service-design-and-creation/models/model/d821d1aa-8a69-47a4-aa63-3dae1742c47c";
+        String uri = baseUrl + "/aai/v29/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 daddc18..a4b613c 100644
--- a/aai-resources/src/test/resources/application-test.properties
+++ b/aai-resources/src/test/resources/application-test.properties
@@ -59,7 +59,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,v28
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29
 # 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
@@ -72,7 +72,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=v28
+schema.version.api.default=v29
 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 914f2fc..db9b4b4 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,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29
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 3a5c054..ee04def 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 @@
-<model xmlns="http://org.onap.aai.inventory/v28">
+<model xmlns="http://org.onap.aai.inventory/v29">
   <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 1f77925..6f40d88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,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.13.6</aai.common.version>
-        <aai.schema.service.version>1.12.3</aai.schema.service.version>
+        <aai.schema.service.version>1.12.4</aai.schema.service.version>
     </properties>
     <build>
         <pluginManagement>
-- 
cgit 1.2.3-korg