X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Femuvim%2Fdcemulator%2Fnet.py;h=54d578db4b9e7ae891565d576464fced7f66c585;hb=6b1d9b990bb02fc14ecaace75ef2492b21d7e819;hp=c3c3c03e86adaf34b2a9cc9ccebc18f03cb03100;hpb=8675d09a5488f60a856145f92380db6066200484;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py
index c3c3c03..54d578d 100755
--- a/src/emuvim/dcemulator/net.py
+++ b/src/emuvim/dcemulator/net.py
@@ -8,6 +8,9 @@ import site
 import time
 from subprocess import Popen
 import os
+import re
+
+
 
 from mininet.net import Dockernet
 from mininet.node import Controller, DefaultController, OVSSwitch, OVSKernelSwitch, Docker, RemoteController
@@ -26,7 +29,7 @@ class DCNetwork(Dockernet):
     This class is used by topology definition scripts.
     """
 
-    def __init__(self, controller=RemoteController,
+    def __init__(self, controller=RemoteController, monitor=False,
                  dc_emulation_max_cpu=1.0,  # fraction of overall CPU time for emulation
                  dc_emulation_max_mem=512,  # emulation max mem in MB
                  **kwargs):
@@ -55,7 +58,10 @@ class DCNetwork(Dockernet):
         self.DCNetwork_graph = nx.MultiDiGraph()
 
         # monitoring agent
-        self.monitor_agent = DCNetworkMonitor(self)
+        if monitor:
+            self.monitor_agent = DCNetworkMonitor(self)
+        else:
+            self.monitor_agent = None
 
         # initialize resource model registrar
         self.rm_registrar = ResourceModelRegistrar(
@@ -124,16 +130,35 @@ class DCNetwork(Dockernet):
             if "id" in params["params2"]:
                 node2_port_id = params["params2"]["id"]
 
+
+
         # add edge and assigned port number to graph in both directions between node1 and node2
         # port_id: id given in descriptor (if available, otherwise same as port)
         # port: portnumber assigned by Dockernet
 
-        self.DCNetwork_graph.add_edge(node1.name, node2.name,
-                                      attr_dict={'src_port_id': node1_port_id, 'src_port': node1.ports[link.intf1],
-                                       'dst_port_id': node2_port_id, 'dst_port': node2.ports[link.intf2]})
-        self.DCNetwork_graph.add_edge(node2.name, node1.name,
-                                      attr_dict={'src_port_id': node2_port_id, 'src_port': node2.ports[link.intf2],
-                                        'dst_port_id': node1_port_id, 'dst_port': node1.ports[link.intf1]})
+        attr_dict = {}
+        # possible weight metrics allowed by TClink class:
+        weight_metrics = ['bw', 'delay', 'jitter', 'loss']
+        edge_attributes = [p for p in params if p in weight_metrics]
+        for attr in edge_attributes:
+            # if delay: strip ms (need number as weight in graph)
+            match = re.search('([0-9]*\.?[0-9]+)', params[attr])
+            if match:
+                attr_number = match.group(1)
+            else:
+                attr_number = None
+            attr_dict[attr] = attr_number
+
+
+        attr_dict2 = {'src_port_id': node1_port_id, 'src_port': node1.ports[link.intf1],
+                     'dst_port_id': node2_port_id, 'dst_port': node2.ports[link.intf2]}
+        attr_dict2.update(attr_dict)
+        self.DCNetwork_graph.add_edge(node1.name, node2.name, attr_dict=attr_dict2)
+
+        attr_dict2 = {'src_port_id': node2_port_id, 'src_port': node2.ports[link.intf2],
+                     'dst_port_id': node1_port_id, 'dst_port': node1.ports[link.intf1]}
+        attr_dict2.update(attr_dict)
+        self.DCNetwork_graph.add_edge(node2.name, node1.name, attr_dict=attr_dict2)
 
         return link
 
@@ -175,17 +200,23 @@ class DCNetwork(Dockernet):
         Dockernet.start(self)
 
     def stop(self):
-        # stop Ryu controller
+
+        # stop the monitor agent
+        if self.monitor_agent is not None:
+            self.monitor_agent.stop()
+
+        # stop emulator net
         Dockernet.stop(self)
+
+        # stop Ryu controller
         self.stopRyu()
-        # stop the monitor agent
-        self.monitor_agent.stop()
+
 
     def CLI(self):
         CLI(self)
 
     # to remove chain do setChain( src, dst, cmd='del-flows')
-    def setChain(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None, cmd='add-flow'):
+    def setChain(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None, cmd='add-flow', weight=None):
 
         #check if port is specified (vnf:port)
         if vnf_src_interface is None:
@@ -228,7 +259,7 @@ class DCNetwork(Dockernet):
         # get shortest path
         #path = nx.shortest_path(self.DCNetwork_graph, vnf_src_name, vnf_dst_name)
         try:
-            path = nx.shortest_path(self.DCNetwork_graph, src_sw, dst_sw)
+            path = nx.shortest_path(self.DCNetwork_graph, src_sw, dst_sw, weight=weight)
         except:
             logging.info("No path could be found between {0} and {1}".format(vnf_src_name, vnf_dst_name))
             return "No path could be found between {0} and {1}".format(vnf_src_name, vnf_dst_name)
@@ -273,7 +304,9 @@ class DCNetwork(Dockernet):
 
             #logging.info("add flow in switch: {0} in_port: {1} out_port: {2}".format(current_node.name, switch_inport, switch_outport))
             # set of entry via ovs-ofctl
-            # TODO use rest API of ryu to set flow entries to correct witch dpid
+            # TODO use rest API of ryu to set flow entries to correct dpid
+            # TODO this only sets port in to out, no match, so this will give trouble when multiple services are deployed...
+            # TODO need multiple matches to do this (VLAN tags)
             if isinstance( current_node, OVSSwitch ):
                 match = 'in_port=%s' % switch_inport