From 4cb59fb229a76eaba1906e333230f8ec34026478 Mon Sep 17 00:00:00 2001
From: hyu2010 <henry.yu1@huawei.com>
Date: Wed, 9 Sep 2020 13:28:37 -0400
Subject: Use network-route to model 3GPP EP_Transport

(1) Add logicalInterfaceId attribute to "network-route"
(2) Add cousin-edge rule between "service-instance" and "network-route"
   (one-to-many relation)
(3) Add cousin-edge rule between allotted-resource and logical-links
   (one-to-many relation). This is needed for the TN NSSI model

Issue-ID: AAI-2920

Signed-off-by: hyu2010 <henry.yu1@huawei.com>
Change-Id: If0efa747bdbcd4a4bc4d73fadde66fe721cbfcb8
Signed-off-by: hyu2010 <henry.yu1@huawei.com>
---
 .../resources/onap/aai_schema/aai_schema_v21.xsd   |  7 ++++++
 .../onap/dbedgerules/v21/DbEdgeRules_v21.json      | 25 ++++++++++++++++++++++
 .../main/resources/onap/oxm/v21/aai_oxm_v21.xml    |  5 +++++
 3 files changed, 37 insertions(+)

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd
index b571bb0..9a79e12 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd
@@ -11265,6 +11265,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="logical-interface-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identity of a logical interface, e.g., VLAN ID.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element name="next-hop" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
index e6001b0..6bf69bf 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
@@ -108,6 +108,18 @@
 			"default": "true",
 			"description": ""
 		},
+		{
+			"from": "allotted-resource",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
 		{
 			"from": "availability-zone",
 			"to": "complex",
@@ -5823,6 +5835,19 @@
 			"prevent-delete": "NONE",
 			"default": "false",
 			"description": ""
+		},
+		{
+			"from": "service-instance",
+			"to": "network-route",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
 		}
+
 	]
 }
diff --git a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
index 44825f2..374482a 100644
--- a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
@@ -8994,6 +8994,11 @@
                     <xml-properties>
                         <xml-property name="description" value="ip-address prefix length."/>
                     </xml-properties>
+                </xml-element>
+				<xml-element java-attribute="logicalInterfaceId" name="logical-interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identity of a logical interface, e.g., VLAN ID."/>
+                    </xml-properties>
                 </xml-element>
 				<xml-element java-attribute="nextHop" name="next-hop" type="java.lang.String">
                     <xml-properties>
-- 
cgit 1.2.3-korg