From 45daf29ffd6230da5b2df1507c9c47b14180227c Mon Sep 17 00:00:00 2001
From: Rahul_cool <rahul.tamrkar@huawei.com>
Date: Fri, 17 Apr 2020 17:47:22 +0530
Subject: sotn nni integration test issue fix

1. te-link-attribute resource  unable to query issue fix
2.logical-link relationship with  te-link-attribute update
3.label-restriction relationship with  te-link-attribute update
4.interlayer-attachment relationship with p-interface update

Issue-ID: AAI-2593
Signed-off-by: Rahul_cool <rahul.tamrkar@huawei.com>
Change-Id: I227a8af5ebbe2897d82f56fab0d8acef59fda9b4
(cherry picked from commit 90904124f3b392d3bb9b7cdd1a611bbc54f654b3)
---
 .../src/main/resources/onap/oxm/v19/aai_oxm_v19.xml     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'aai-schema/src/main/resources/onap/oxm/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 076cc2e..9284501 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
@@ -9148,11 +9148,6 @@
                         <xml-property name="description" value="Id that identifies the TE link attribute"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isAbstract" name="is-abstract" type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="description" value="Indicate wheather link is abstract or native"/>
-                    </xml-properties>
-                </xml-element>
                 <xml-element java-attribute="linkProtectionType" name="link-protection-type" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Indicate desired protection type of the link e.g, unprotected, shared or 1+1"/>
@@ -9178,6 +9173,12 @@
                         <xml-property name="description" value="The value of available bandwidth."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="isAbstract" name="is-abstract" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicate wheather link is abstract or native"/>
+                    </xml-properties>
+                </xml-element>
+
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Store the link to get more information for this object."/>
@@ -9219,7 +9220,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Instance of an te-link-attribute"/>
-                <xml-property name="indexedProps" value="id,linkProtectionType,accessType,operational-status,model-invariant-id,model-version-id"/>
+                <xml-property name="indexedProps" value="id,link-protection-type,access-type,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="te-link-attributes"/>
@@ -9326,8 +9327,8 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Instance of an te-link-attribute"/>
-                <xml-property name="indexedProps" value="id,labelStart,labelEnd,rangeBitmap,operational-status,model-invariant-id,model-version-id"/>
+                <xml-property name="description" value="Instance of an label restriction"/>
+                <xml-property name="indexedProps" value="id,label-start,label-end,range-bitmap,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="label-restrictions"/>
-- 
cgit 1.2.3-korg