summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHesam Rahimi <hesam.rahimi@huawei.com>2020-10-23 15:44:13 -0400
committerDan Timoney <dtimoney@att.com>2021-01-05 10:56:40 -0500
commitb2516afc7464b02e178a71b9b9b573126c0615e9 (patch)
tree68a9711cb4a168a1db96efb193f0aaa85d2c4ff2
parentbf926edb33ca32e5c0c26054383d27312c2f8151 (diff)
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
-rwxr-xr-xadaptors/aai-service/provider/src/main/resources/aai-path.properties2
-rw-r--r--adaptors/aai-service/provider/src/main/resources/aai_schema_v21.xsd5
2 files changed, 7 insertions, 0 deletions
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 6c750e0f1..f38643c0a 100755
--- 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 89049bd7f..afdda3dc5 100644
--- 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>