Merge "ADD N1, N2 N3 interfacing to topology generation"

diff --git a/code/network-topology-instance-generator/model/python/tapi_node_fronthaul_gateway.py b/code/network-topology-instance-generator/model/python/tapi_node_fronthaul_gateway.py
index ca2e4a6..6d82c57 100644 (file)
--- a/code/network-topology-instance-generator/model/python/tapi_node_fronthaul_gateway.py
+++ b/code/network-topology-instance-generator/model/python/tapi_node_fronthaul_gateway.py
@@ -22,7 +22,7 @@ from model.python.tapi_node_edge_point import TapiNodeEdgePoint
 
 class TapiNodeFronthaulGateway(TapiNode):
     """
-    Class representing a O-RAN Fronthaul Gateway as TAPI Node.
+    Class representing an O-RAN Fronthaul Gateway as TAPI Node.
     """
 
     # constructor

diff --git a/code/network-topology-instance-generator/model/python/tapi_node_o_cu_cp.py b/code/network-topology-instance-generator/model/python/tapi_node_o_cu_cp.py
index c0525ee..5eff7c9 100644 (file)
--- a/code/network-topology-instance-generator/model/python/tapi_node_o_cu_cp.py
+++ b/code/network-topology-instance-generator/model/python/tapi_node_o_cu_cp.py
@@ -22,7 +22,7 @@ from model.python.tapi_node_edge_point import TapiNodeEdgePoint
 
 class TapiNodeOCuCp(TapiNode):
     """
-    Class representing a O-RAN Centralized Unit as TAPI Node.
+    Class representing an O-RAN Centralized Unit as TAPI Node.
     """
     # constructor
 
@@ -38,6 +38,15 @@ class TapiNodeOCuCp(TapiNode):
         }
         self.add(TapiNodeEdgePoint(nep_configuration))
 
+        # add N2 Consumer interface
+        nep_configuration = {
+            "parent": self.identifier(),
+            "nodeEdgePoint": {
+                "interface": "n2", "cep":[{"protocol": "NAS", "role": "consumer"}]
+            }
+        }
+        self.add(TapiNodeEdgePoint(nep_configuration))
+
         # add O1/OAM NetConf Provider interface
         nep_configuration = {
             "parent": self.identifier(),

diff --git a/code/network-topology-instance-generator/model/python/tapi_node_o_cu_up.py b/code/network-topology-instance-generator/model/python/tapi_node_o_cu_up.py
index 81d781e..4086fac 100644 (file)
--- a/code/network-topology-instance-generator/model/python/tapi_node_o_cu_up.py
+++ b/code/network-topology-instance-generator/model/python/tapi_node_o_cu_up.py
@@ -22,7 +22,7 @@ from model.python.tapi_node_edge_point import TapiNodeEdgePoint
 
 class TapiNodeOCuUp(TapiNode):
     """
-    Class representing a O-RAN Centralized Unit as TAPI Node.
+    Class representing an O-RAN Centralized Unit as TAPI Node.
     """
     # constructor
 
@@ -38,6 +38,15 @@ class TapiNodeOCuUp(TapiNode):
         }
         self.add(TapiNodeEdgePoint(nep_configuration))
 
+        # add N3 Consumer interface
+        nep_configuration = {
+            "parent": self.identifier(),
+            "nodeEdgePoint": {
+                "interface": "n3", "cep":[{"protocol": "NAS", "role": "consumer"}]
+            }
+        }
+        self.add(TapiNodeEdgePoint(nep_configuration))
+
         # add O1/OAM NetConf Provider interface
         nep_configuration = {
             "parent": self.identifier(),

diff --git a/code/network-topology-instance-generator/model/python/tapi_node_o_du.py b/code/network-topology-instance-generator/model/python/tapi_node_o_du.py
index d458ed1..f544409 100644 (file)
--- a/code/network-topology-instance-generator/model/python/tapi_node_o_du.py
+++ b/code/network-topology-instance-generator/model/python/tapi_node_o_du.py
@@ -22,7 +22,7 @@ from model.python.tapi_node_edge_point import TapiNodeEdgePoint
 
 class TapiNodeODu(TapiNode):
     """
-    Class representing a O-RAN Distributed Unit as TAPI Node.
+    Class representing an O-RAN Distributed Unit as TAPI Node.
     """
     # constructor
 

diff --git a/code/network-topology-instance-generator/model/python/tapi_node_o_ru.py b/code/network-topology-instance-generator/model/python/tapi_node_o_ru.py
index d5993fc..3551785 100644 (file)
--- a/code/network-topology-instance-generator/model/python/tapi_node_o_ru.py
+++ b/code/network-topology-instance-generator/model/python/tapi_node_o_ru.py
@@ -22,7 +22,7 @@ from model.python.tapi_node_edge_point import TapiNodeEdgePoint
 
 class TapiNodeORu(TapiNode):
     """
-    Class representing a O-RAN Radio Unit as TAPI Node.
+    Class representing an O-RAN Radio Unit as TAPI Node.
     """
 
     # constructor
@@ -44,7 +44,7 @@ class TapiNodeORu(TapiNode):
         nep_configuration = {
             "parent": self.identifier(),
             "nodeEdgePoint": {
-                "interface": "uu", "cep":[{"protocol": "unknown", "role": "provider"}]
+                "interface": "uu", "cep":[{"protocol": "radio", "role": "provider"}]
             }
         }
         self.add(TapiNodeEdgePoint(nep_configuration))