Add nodes, function and protocols for N1, N2 and N3 interfacing

- a new revision steatement added for ...-common-...
- new function-type identities:
  - access-and-mobility-management-function
  - user-plane-function
- new interface-type identities:
  - n1, n2, n3
- new LAYER_PROTOCOL_QUALIFIER identities
  - nas
  - radio

Issue-ID: OAM-255
Change-Id: I91df27a31ca5f935f6554483f920a0de06afedf9
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>

diff --git a/data-model/yang/working/o-ran-sc/o-ran-sc-topology/o-ran-sc-topology-common.yang b/data-model/yang/working/o-ran-sc/o-ran-sc-topology/o-ran-sc-topology-common.yang
index 931257e..036e4af 100644 (file)
--- a/data-model/yang/working/o-ran-sc/o-ran-sc-topology/o-ran-sc-topology-common.yang
+++ b/data-model/yang/working/o-ran-sc/o-ran-sc-topology/o-ran-sc-topology-common.yang
@@ -6,7 +6,6 @@ module o-ran-sc-topology-common {
   import ietf-interfaces {
     prefix if;
   }
-
   import tapi-common {
     prefix tapi-common;
   }
@@ -33,6 +32,12 @@ module o-ran-sc-topology-common {
      See the License for the specific language governing permissions and
      limitations under the License.";
 
+  revision 2022-03-06 {
+    description
+      "Initial revision";
+    reference
+      "O-RAN-SC: https://jira.o-ran-sc.org/browse/OAM-255";
+  }
   revision 2022-02-05 {
     description
       "Initial revision";
@@ -125,11 +130,23 @@ module o-ran-sc-topology-common {
       "An identity corresponding to an O-RAN Fronthaul Multiplexer Function.";
   }
 
+  identity access-and-mobility-management-function {
+    base function-type;
+    description
+      "An identity corresponding to a 3GPP 5G-Core Access and mobility Management Function (AMF).";
+  }
+
+  identity user-plane-function {
+    base function-type;
+    description
+      "An identity corresponding to a3GPP 5G-Core User Plane Function (UPF).";
+  }
+
   identity near-rt-ric {
     base function-type;
     description
       "An identity corresponding to an O-RAN Near real-time RAN intelligent
-       controller Function (NEar-RT-RIC).";
+       controller Function (Near-RT-RIC).";
   }
 
   identity managed-application {
@@ -225,6 +242,30 @@ module o-ran-sc-topology-common {
       "An identity for the e2 interface as defined by O-RAN Alliance.";
   }
 
+  identity n1 {
+    base interface-type;
+    description
+      "An identity for the n1 interface as defined by 3GPP.";
+    reference
+      "3GPP TS 23.501 System architecture for the 5G System (5GS)";
+  }
+
+  identity n2 {
+    base interface-type;
+    description
+      "An identity for the n1 interface as defined by 3GPP.";
+    reference
+      "3GPP TS 23.501 System architecture for the 5G System (5GS)";
+  }
+
+  identity n3 {
+    base interface-type;
+    description
+      "An identity for the n1 interface as defined by 3GPP.";
+    reference
+      "3GPP TS 23.501 System architecture for the 5G System (5GS)";
+  }
+
   identity o1 {
     base interface-type;
     description
@@ -255,13 +296,14 @@ module o-ran-sc-topology-common {
   }
 
   // O-RAN-SC LAYER_PROTOCOL_QUALIFIER
+
   identity LAYER_PROTOCOL_QUALIFIER {
     base tapi-common:LAYER_PROTOCOL_QUALIFIER;
     description
       "Base identity for layer protocol qualifiers used in RAN, Transport and Core.
-       A unique identification of layer protocol qualifiers. 
-       Typically the layer protocol qualifier is used to identify the interface 
-       protocol, like VES or NETCONF. 
+       A unique identification of layer protocol qualifiers.
+       Typically the layer protocol qualifier is used to identify the interface
+       protocol, like VES or NETCONF.
        This identity is abstract and MUST NOT be used as a value.";
   }
 
@@ -270,7 +312,7 @@ module o-ran-sc-topology-common {
     description
       "An identity for an unknown qualifier.";
   }
-  
+
   identity file {
     base LAYER_PROTOCOL_QUALIFIER;
     description
@@ -283,12 +325,26 @@ module o-ran-sc-topology-common {
       "An identity for an generic remote procedure call (gRPC) protocol qualifier.";
   }
 
+  identity nas {
+    base LAYER_PROTOCOL_QUALIFIER;
+    description
+      "An identity for a Non-access stratum protocol qualifier.";
+    reference
+      "3GPP TS 24.301\tNon-Access-Stratum (NAS) protocol for Evolved Packet System (EPS); Stage 3";
+  }
+
   identity netconf {
     base LAYER_PROTOCOL_QUALIFIER;
     description
       "An identity for a NETCONF protocol qualifier.";
   }
 
+  identity radio {
+    base LAYER_PROTOCOL_QUALIFIER;
+    description
+      "An identity for a Radio protocol qualifier.";
+  }
+
   identity rest {
     base LAYER_PROTOCOL_QUALIFIER;
     description
@@ -312,5 +368,4 @@ module o-ran-sc-topology-common {
     description
       "An identity for an O-RAN Fronthaul based protocol qualifier.";
   }
-
 }