Fixes for version v21 of AAI

- Adding the path for the newly introduced (i.e. in v21) network-route
resource in aai-schema, to the properties file.
- Adding tunnel-termination-points and te-link-attributes back into aai
schema.

Issue-ID: CCSDK-2393
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
(cherry picked from commit 3c5e96dd5a0c72fd76c887a46c95528126ed1d22)
Change-Id: Idcbba8f3ce36a4d9de5d5eac7cebcf53ad1a8827

diff --git a/adaptors/aai-service/provider/src/main/resources/aai-path.properties b/adaptors/aai-service/provider/src/main/resources/aai-path.properties
index 6c750e0..f38643c 100755 (executable)
--- a/adaptors/aai-service/provider/src/main/resources/aai-path.properties
+++ b/adaptors/aai-service/provider/src/main/resources/aai-path.properties
@@ -353,3 +353,5 @@ lan-port-configs = /aai/v21/network/lan-port-configs
 lan-port-config = /aai/v21/network/lan-port-configs/lan-port-config/{lan-port-config-id}
 zones = /aai/v21/network/zones
 zone = /aai/v21/network/zones/zone/{zone-id}
+network-routes = /aai/v21/network/network-routes
+network-route = /aai/v21/network/network-routes/network-route/{route-id}

diff --git a/adaptors/aai-service/provider/src/main/resources/aai_schema_v21.xsd b/adaptors/aai-service/provider/src/main/resources/aai_schema_v21.xsd
index 89049bd..afdda3d 100644 (file)
--- a/adaptors/aai-service/provider/src/main/resources/aai_schema_v21.xsd
+++ b/adaptors/aai-service/provider/src/main/resources/aai_schema_v21.xsd
@@ -13205,6 +13205,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:devices" minOccurs="0"/>
         <xs:element ref="tns:wan-port-configs" minOccurs="0"/>
         <xs:element ref="tns:ext-aai-networks" minOccurs="0"/>
+        <xs:element ref="tns:label-restrictions" minOccurs="0"/>
+        <xs:element ref="tns:unis" minOccurs="0"/>
+        <xs:element ref="tns:te-link-attributes" minOccurs="0"/>
+        <xs:element ref="tns:interlayer-attachments" minOccurs="0"/>
+        <xs:element ref="tns:tunnel-termination-points" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>