From 127d57b450f4614e82218dea0de934e2e73d7ba7 Mon Sep 17 00:00:00 2001
From: Harish Venkata Kajur <vk250x@att.com>
Date: Fri, 17 Jan 2020 23:26:48 -0500
Subject: Fix the xml issue for the is-abstract field

New XML property was added before the closing of
the previous xml property which broke schema service
Also updating the unit tests so when this happens again
the unit tests should fail so this issue shouldn't arise again

Issue-ID: AAI-2593

Change-Id: I949c02aa8325c4235198c284e3ceb7538e389e11
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
---
 aai-schema-service/pom.xml                                        | 4 ++--
 aai-schema-service/src/main/resources/application.properties      | 4 ++--
 aai-schema-service/src/test/resources/application-test.properties | 4 ++--
 aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index 21f414e..9b7de84 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -81,8 +81,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>v16</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list>
+        <schema.version.api.default>v19</schema.version.api.default>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19</schema.version.list>
         <schema.uri.base.path>/aai/schema-service</schema.uri.base.path>
         <!-- End of Default ONAP Schema Properties -->
 
diff --git a/aai-schema-service/src/main/resources/application.properties b/aai-schema-service/src/main/resources/application.properties
index 0fbcfca..ea8934f 100644
--- a/aai-schema-service/src/main/resources/application.properties
+++ b/aai-schema-service/src/main/resources/application.properties
@@ -49,7 +49,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
 
 schema.uri.base.path=/aai/schema-service
 # Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
 # 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
@@ -62,4 +62,4 @@ 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=v16
+schema.version.api.default=v19
diff --git a/aai-schema-service/src/test/resources/application-test.properties b/aai-schema-service/src/test/resources/application-test.properties
index 5f57a30..e80397f 100644
--- a/aai-schema-service/src/test/resources/application-test.properties
+++ b/aai-schema-service/src/test/resources/application-test.properties
@@ -40,7 +40,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
 # Schema Version Related Attributes
 schema.uri.base.path=/aai/schema-service
 # Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
 # 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
@@ -53,4 +53,4 @@ 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=v15
+schema.version.api.default=v19
diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
index 01e4a5a..2a14c5a 100644
--- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
@@ -5378,11 +5378,11 @@
                     <xml-properties>
                         <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
                     </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="isAbstract" name="is-abstract" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="description" value="true, indicate abstract node"/>
                     </xml-properties>
-                </xml-element>
                 </xml-element>
 				<xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
 					<xml-properties>
-- 
cgit 1.2.3-korg