From 4123742b13636c1564440c82d8ea8cd6c1734a12 Mon Sep 17 00:00:00 2001
From: "Forsyth, James (jf2512)" <jf2512@att.com>
Date: Tue, 3 Mar 2020 15:54:29 -0500
Subject: Add service-function attribute to service-instance

Issue-ID: AAI-2823
Change-Id: Ied5708415bfd4572237c9a4ce627fe8c90e9c11c
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
---
 aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd | 7 +++++++
 aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml       | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
index eaa28a1..99bb375 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
@@ -4236,6 +4236,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:communication-service-profiles" minOccurs="0"/>
         <xs:element ref="tns:service-profiles" minOccurs="0"/>
         <xs:element ref="tns:slice-profiles" minOccurs="0"/>
+        <xs:element name="service-function" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing function of the service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
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 f5f243d..1262983 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
@@ -3130,6 +3130,11 @@
                 <xml-element java-attribute="communicationServiceProfiles" name="communication-service-profiles" type="inventory.aai.onap.org.v19.CommunicationServiceProfiles"/>
                 <xml-element java-attribute="serviceProfiles" name="service-profiles" type="inventory.aai.onap.org.v19.ServiceProfiles"/>
                 <xml-element java-attribute="sliceProfiles" name="slice-profiles" type="inventory.aai.onap.org.v19.SliceProfiles"/>
+		<xml-element java-attribute="serviceFunction" name="service-function" type="java.lang.String">
+                  <xml-properties>
+                    <xml-property name="description" value="String capturing function of the service."/>
+                  </xml-properties>
+                </xml-element>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Instance of a service"/>
-- 
cgit 1.2.3-korg