From fff079b903dad1c1606792bebcfaf1570e30c2a8 Mon Sep 17 00:00:00 2001
From: Rahul_cool <rahul.tamrkar@huawei.com>
Date: Mon, 4 May 2020 22:06:23 +0530
Subject: SOTN-NNI integration test issue fixed

ccsdk adaptor not able to process cVLAN and tpId attribute
Changed tpId to tp-id and cVLAN to cvlan

need cherrypick to frakfurt

Issue-ID: AAI-2593
Signed-off-by: Rahul_cool <rahul.tamrkar@huawei.com>
Change-Id: I2d3a3a9b8ffd27fcda4ffc68bd81300e6bc9f770
---
 aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd | 6 +++---
 aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

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 de0859b..c7f0a29 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
@@ -10711,7 +10711,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tpId,cVLAN,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -10722,14 +10722,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="tpId" type="xs:string" minOccurs="0">
+        <xs:element name="tp-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Termination point ID.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="cVLAN" type="xs:string" minOccurs="0">
+        <xs:element name="cvlan" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.")</annox:annotate>
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 613264c..8a3dc17 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
@@ -9000,12 +9000,12 @@
                         <xml-property name="description" value="Id that identifies the UNI"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tpId" name="tpId" type="java.lang.String">
+                <xml-element java-attribute="tpId" name="tp-id" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Termination point ID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cVLAN" name="cVLAN" type="java.lang.String">
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="The cvlan for the site used for ethernet type connectivity."/>
                     </xml-properties>
@@ -9051,7 +9051,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Instance of an User network interface"/>
-                <xml-property name="indexedProps" value="id,tpId,cVLAN,operational-status,model-invariant-id,model-version-id"/>
+                <xml-property name="indexedProps" value="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id"/>
                 <xml-property name="searchable" value="id"/>
                 <xml-property name="uniqueProps" value="id"/>
                 <xml-property name="container" value="unis"/>
-- 
cgit 1.2.3-korg