Create O-RAN-SC extension to TAPI Topology v2.1.3

- adding o-ran-sc-topology-common
- adding o-ran-sc-topology

IssueID: OAM-248
Change-Id: I698fa8610b97665cdcef12f445d9d8539f3bc1c7
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 ed48d35..4a6178c 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
@@ -12,8 +12,8 @@ module o-ran-sc-topology-common {
   contact
     "www.o-ran.org";
   description
-    "This module contains YANG definitions for the O-RAN Topology augmentation 
-     of TAPI Topology used as network model. 
+    "This module contains YANG definitions for the O-RAN Topology augmentation
+     of TAPI Topology used as network model.
 
      Copyright 2022 the O-RAN Software Community.
 
@@ -35,72 +35,71 @@ module o-ran-sc-topology-common {
     reference
       "O-RAN-SC: https://jira.o-ran-sc.org/browse/OAM-248
        O-RAN.WG1.O-RAN-Architecture-Description
-       Chapter: 1.3.1  Definitions";
+       Chapter: 1.3.1\tDefinitions";
   }
 
   // O-RAN functional identity types
 
   identity function-type {
     description
-      "Base identity as abstract function type for by O-RAN Alliance and others 
-       entities. 
-       An unique identification of a (network) function. 
+      "Base identity as abstract function type for by O-RAN Alliance and others
+       entities.
+       An unique identification of a (network) function.
 
        This identity is abstract and MUST NOT be used for alarms.";
-
     reference
       "O-RAN.WG1.O-RAN-Architecture-Description
-       Chapter: 1.3.1  Definitions
+       Chapter: 1.3.1\tDefinitions
        https://jira.o-ran-sc.org/browse/OAM-248";
   }
 
   identity smo {
     base function-type;
     description
-      "An identity corresponding to an 
+      "An identity corresponding to an
        O-RAN Service Management and Orchestration Function (SMO).";
   }
 
   identity non-rt-ric {
     base function-type;
     description
-      "An identity corresponding to an 
-       O-RAN Service Management and Orchestration SMO component corresponding to 
+      "An identity corresponding to an
+       O-RAN Service Management and Orchestration SMO component corresponding to
        a Non-real-time RAN Intelligent Controller Function (Near-RT-RIC).";
   }
 
   identity oam-controller {
     base function-type;
     description
-      "An identity corresponding to an 
-       O-RAN Service Management and Orchestration SMO component corresponding to 
-       an Operation and Maintenance Controller Controller Function 
+      "An identity corresponding to an
+       O-RAN Service Management and Orchestration SMO component corresponding to
+       an Operation and Maintenance Controller Controller Function
        (OAM Controller).";
   }
 
   identity ves-collector {
     base function-type;
     description
-      "An identity corresponding to an 
-       O-RAN Service Management and Orchestration SMO component corresponding to 
-       an (Virtual) Event Streaming Collector Function 
+      "An identity corresponding to an
+       O-RAN Service Management and Orchestration SMO component corresponding to
+       an (Virtual) Event Streaming Collector Function
        (VES Collector).";
   }
 
   identity message-router {
     base function-type;
     description
-      "An identity corresponding to an 
-       O-RAN Service Management and Orchestration SMO component corresponding to 
+      "An identity corresponding to an
+       O-RAN Service Management and Orchestration SMO component corresponding to
        Message Router Function (MR).";
   }
 
   identity transport-node {
     base function-type;
     description
-      "An identity corresponding to a Transport Node Function 
-       (such as  Transponders, Muxponders, ROADM, Wavelength Selected Switch, 
-       Optical Amplifier, Optical Terminal, Optical Repeater, Optical Filter, 
+      "An identity corresponding to a Transport Node Function
+       (such as  Transponders, Muxponders, ROADM, Wavelength Selected Switch,
+       Optical Amplifier, Optical Terminal, Optical Repeater, Optical Filter,
        Optical Multiplexer, Microwave Terminal, Carrier Ethernet Routers, ... .";
   }
 
@@ -115,7 +114,7 @@ module o-ran-sc-topology-common {
     description
       "An identity corresponding to an O-RAN Fronthaul Multiplexer Function.";
   }
-  
+
   identity near-rt-ric {
     base function-type;
     description
@@ -126,7 +125,7 @@ module o-ran-sc-topology-common {
   identity managed-application {
     base function-type;
     description
-      "An identity corresponding to an O-RAN Managed Application Function (MA), 
+      "An identity corresponding to an O-RAN Managed Application Function (MA),
        also called 'xApp'.";
   }
 
@@ -137,15 +136,15 @@ module o-ran-sc-topology-common {
   }
 
   identity o-cu-up {
-    base o-cu-function-type;
+    base function-type;
     description
       "An identity corresponding to an O-RAN Central Unit User Plane Function.";
   }
 
   identity o-cu-cp {
-    base o-cu-function-type;
+    base function-type;
     description
-      "An identity corresponding to an O-RAN Central Unit Control Plane 
+      "An identity corresponding to an O-RAN Central Unit Control Plane
        Function.";
   }
 
@@ -173,25 +172,25 @@ module o-ran-sc-topology-common {
     description
       "An identity corresponding to an User Equipment Function.";
   }
-  
+
   identity o-cloud-ims {
     base function-type;
     description
-      "An identity corresponding to an Infrastructure Management Service 
+      "An identity corresponding to an Infrastructure Management Service
        Function (IMS).";
   }
 
   identity o-cloud-dms {
     base function-type;
     description
-      "An identity corresponding to a 
+      "An identity corresponding to a
        Deployment Management Service Function (DMS).";
   }
 
   // O-RAN interface types
 
   identity interface-type {
-    base if:interface-type
+    base if:interface-type;
     description
       "Base identity for interface types used in RAN, Transport and Core.
        A unique identification of the management interface.

diff --git a/data-model/yang/working/o-ran-sc/o-ran-sc-topology/o-ran-sc-topology.yang b/data-model/yang/working/o-ran-sc/o-ran-sc-topology/o-ran-sc-topology.yang
index bfb4dbe..4400642 100644 (file)
--- a/data-model/yang/working/o-ran-sc/o-ran-sc-topology/o-ran-sc-topology.yang
+++ b/data-model/yang/working/o-ran-sc/o-ran-sc-topology/o-ran-sc-topology.yang
@@ -18,7 +18,7 @@ module o-ran-sc-topology {
   contact
     "www.o-ran.org";
   description
-    "This module contains YANG definitions for the O-RAN Topology augmentation 
+    "This module contains YANG definitions for the O-RAN Topology augmentation
      of TAPI Topology.
 
      Copyright 2022 the O-RAN Software Community.
@@ -96,18 +96,19 @@ module o-ran-sc-topology {
       "Augments the TAPI Topology node Context with the (network) function type";
     leaf function {
       type identityref {
-        base osctc:function-type  ;
+        base osctc:function-type;
       }
       description
         "The type of the (Network) Function.";
     }
   }
+
   augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point" {
     description
       "Augments the TAPI Topology Owned Node Edge Points with the (network) function type";
     leaf function {
       type identityref {
-        base osctc:interface-type  ;
+        base osctc:interface-type;
       }
       description
         "The type of the Node Edge Point interface type.";