From 664753e6041a39c6ff76ae8ffac3d850e7fe2a69 Mon Sep 17 00:00:00 2001
From: sangu_3653 <sangappa.m@huawei.com>
Date: Tue, 5 May 2020 17:12:25 +0530
Subject: [PATCH] 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: CCSDK-2359
Signed-off-by: sangu_3653 <sangappa.m@huawei.com>
Change-Id: I73ffbe503e082059b1bdb637dc4841102d92ca05
---
 aai-service/provider/src/main/resources/aai_schema_v19.xsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/aai-service/provider/src/main/resources/aai_schema_v19.xsd b/aai-service/provider/src/main/resources/aai_schema_v19.xsd
index b07c1e15..4c7fdfaf 100644
--- a/aai-service/provider/src/main/resources/aai_schema_v19.xsd
+++ b/aai-service/provider/src/main/resources/aai_schema_v19.xsd
@@ -10582,7 +10582,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 te-link-attribute",indexedProps="id,labelStart,labelEnd,rangeBitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an label restriction",indexedProps="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{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>
-- 
2.16.6