From fdbcaf6e50a68d8a16166c2e40fb95d981e54bb6 Mon Sep 17 00:00:00 2001
From: Rahul_cool <rahul.tamrkar@huawei.com>
Date: Mon, 4 May 2020 22:17:07 +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

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

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
index 6a6ab11..5fdb080 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
@@ -10973,7 +10973,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>
@@ -10984,14 +10984,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/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
index 2e61b38..503ea2f 100644
--- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
@@ -8927,12 +8927,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>
@@ -8978,7 +8978,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