Merge branch 'master' into set-venv

Author: cscarpitta

nets/8r-1c-in-band-isis/.env

@@ -0,0 +1,5 @@
+export WORKSPACE=${HOME}/workspace
+export CONTROL_PLANE=${WORKSPACE}/rose-srv6-control-plane
+
+export NODE_MANAGER_PATH=${CONTROL_PLANE}/srv6_controller/node-manager/
+export NODE_MANAGER_GRPC_PORT=12345

nets/8r-1c-out-band-isis/.env

@@ -0,0 +1,5 @@
+export WORKSPACE=${HOME}/workspace
+export CONTROL_PLANE=${WORKSPACE}/rose-srv6-control-plane
+
+export NODE_MANAGER_PATH=${CONTROL_PLANE}/srv6_controller/node-manager/
+export NODE_MANAGER_GRPC_PORT=12345

nets/8r-1c-srv6-pm/.env

@@ -3,3 +3,7 @@ export ROSE_SRV6_TUTORIAL=${WORKSPACE}/rose-srv6-tutorial
 
 # Configure SRV6_PFPML_PATH
 export SRV6_PFPML_PATH=/opt/srv6-pm-xdp-ebpf/srv6-pfplm
+
+# Node manager params
+export NODE_MANAGER_PATH=${CONTROL_PLANE}/srv6_controller/node-manager/
+export NODE_MANAGER_GRPC_PORT=12345

nets/8r-1c-srv6-pm/isis8d.py

@@ -23,7 +23,9 @@
             # Execute the activation script to activate the venv
             exec(code, {'__file__': venv_path})
 
+from argparse import ArgumentParser
 import shutil
+from dotenv import load_dotenv
 from mininet.topo import Topo
 from mininet.node import Host, OVSBridge
 from mininet.net import Mininet
@@ -38,6 +40,20 @@
 
 PRIVDIR = '/var/priv'
 
+START_NODE_MANAGERS = False
+
+# Load environment variables from .env file
+load_dotenv()
+
+# Get node manager path
+NODE_MANAGER_PATH = os.getenv('NODE_MANAGER_PATH', None)
+if NODE_MANAGER_PATH is not None:
+    NODE_MANAGER_PATH = os.path.join(NODE_MANAGER_PATH,
+                                     'srv6_manager.py')
+# Get gRPC server port
+NODE_MANAGER_GRPC_PORT = os.getenv('NODE_MANAGER_GRPC_PORT', None)
+
+
 class BaseNode(Host):
 
     def __init__(self, name, *args, **kwargs):
@@ -108,6 +124,14 @@ class Router(BaseNode):
     def __init__(self, name, *args, **kwargs):
         BaseNode.__init__(self, name, *args, **kwargs)
 
+    def config(self, **kwargs):
+        # Init steps
+        BaseNode.config(self, **kwargs)
+        # Start node managers
+        if START_NODE_MANAGERS:
+            self.cmd('python %s --grpc-port %s &'
+                     % (NODE_MANAGER_PATH, NODE_MANAGER_GRPC_PORT))
+
 
 class Switch(OVSBridge):
     def __init__(self, name, *args, **kwargs):
@@ -288,8 +312,45 @@ def simpleTest():
     stopAll()
 
 
+def parse_arguments():
+    # Get parser
+    parser = ArgumentParser(
+        description='Emulation of a Mininet topology (8 routers running '
+                    'IS-IS, 1 controller out-of-band'
+    )
+    parser.add_argument(
+        '--start-node-managers', dest='start_node_managers',
+        action='store_true', default=False,
+        help='Define whether to start node manager on routers or not'
+    )
+    # Parse input parameters
+    args = parser.parse_args()
+    # Return the arguments
+    return args
+
 
 if __name__ == '__main__':
+    # Parse command-line arguments
+    args = parse_arguments()
+    # Define whether to start node manager on routers or not 
+    START_NODE_MANAGERS = args.start_node_managers
+    if START_NODE_MANAGERS:
+        if NODE_MANAGER_PATH is None:
+            print('Error: --start-node-managers requires NODE_MANAGER_PATH '
+                'variable')
+            print('NODE_MANAGER_PATH variable not set in .env file\n')
+            exit(-2)
+        if not os.path.exists(NODE_MANAGER_PATH):
+            print('Error: --start-node-managers requires NODE_MANAGER_PATH '
+                'variable')
+            print('NODE_MANAGER_PATH defined in .env file '
+                  'points to a non existing folder\n')
+            exit(-2)
+        if NODE_MANAGER_GRPC_PORT is None:
+            print('Error: --start-node-managers requires '
+                  'NODE_MANAGER_GRPC_PORT variable')
+            print('NODE_MANAGER_GRPC_PORT variable not set in .env file\n')
+            exit(-2)
     # Tell mininet to print useful information
     setLogLevel('info')
     simpleTest()