Merge branch 'master' of https://github.com/stevenvanrossem/son-emu

[osm/vim-emu.git] / emuvim / dcemulator / net.py

diff --git a/emuvim/dcemulator/net.py b/emuvim/dcemulator/net.py
old mode 100644 (file)
new mode 100755 (executable)
index 83ac619..324c4d3
--- a/emuvim/dcemulator/net.py
+++ b/emuvim/dcemulator/net.py
@@ -5,54 +5,54 @@ Distributed Cloud Emulator (dcemulator)
 import logging
 
 from mininet.net import Dockernet
 import logging
 
 from mininet.net import Dockernet

-from mininet.node import Controller, OVSKernelSwitch, Switch, Docker, Host
+from mininet.node import Controller, OVSSwitch, OVSKernelSwitch, Switch, Docker, Host, RemoteController

 from mininet.cli import CLI
 from mininet.cli import CLI

-from mininet.log import setLogLevel, info
+from mininet.log import setLogLevel, info, debug

 from mininet.link import TCLink, Link
 from mininet.link import TCLink, Link

+import networkx as nx
+from monitoring import DCNetworkMonitor

 
 from node import Datacenter, EmulatorCompute
 
 
 
 from node import Datacenter, EmulatorCompute
 
 

-class DCNetwork(object):
+class DCNetwork(Dockernet):

     """
     """

-    Wraps the original Mininet class and provides
+    Wraps the original Mininet/Dockernet class and provides

     methods to add data centers, switches, etc.
 
     This class is used by topology definition scripts.
     """
 
     methods to add data centers, switches, etc.
 
     This class is used by topology definition scripts.
     """
 

-    def __init__(self):
+    def __init__(self, **kwargs):

         self.dcs = {}
         self.dcs = {}

-        self.switches = {}
-        self.links = []
-

         # create a Mininet/Dockernet network
         # create a Mininet/Dockernet network

-        setLogLevel('info')  # set Mininet loglevel
-        self.mnet = Dockernet(controller=Controller, switch=OVSKernelSwitch)
-        self.mnet.addController('c0')
+        # call original Docker.__init__ and setup default controller
+        #Dockernet.__init__(
+        #    self, controller=RemoteController, switch=OVSKernelSwitch, **kwargs)
+        Dockernet.__init__(
+            self, controller=RemoteController, switch=OVSKernelSwitch, **kwargs)
+        self.addController('c0', controller=RemoteController)
+
+        # graph of the complete DC network
+        self.DCNetwork_graph=nx.DiGraph()
+
+        # monitoring agent
+        self.monitor_agent = DCNetworkMonitor(self)

 
 

-    def addDatacenter(self, name):
+
+    def addDatacenter(self, label, metadata={}):

         """
         Create and add a logical cloud data center to the network.
         """
         """
         Create and add a logical cloud data center to the network.
         """

-        if name in self.dcs:
-            raise Exception("Data center name already exists: %s" % name)
-        dc = Datacenter(name)
+        if label in self.dcs:
+            raise Exception("Data center label already exists: %s" % label)
+        dc = Datacenter(label, metadata=metadata)

         dc.net = self  # set reference to network
         dc.net = self  # set reference to network

-        self.dcs[name] = dc
+        self.dcs[label] = dc

         dc.create()  # finally create the data center in our Mininet instance
         dc.create()  # finally create the data center in our Mininet instance

-        logging.info("added data center: %s" % name)
+        logging.info("added data center: %s" % label)

         return dc
 
         return dc
 

-    def addSwitch(self, name):
-        """
-        We can also add additional SDN switches between data centers.
-        """
-        s = self.mnet.addSwitch(name)
-        self.switches[name] = s
-        logging.info("added switch: %s" % name)
-        return s
-

     def addLink(self, node1, node2, **params):
         """
         Able to handle Datacenter objects as link
     def addLink(self, node1, node2, **params):
         """
         Able to handle Datacenter objects as link


@@ -65,16 +65,12 @@ class DCNetwork(object):
         if isinstance( node1, basestring ):
             if node1 in self.dcs:
                 node1 = self.dcs[node1].switch
         if isinstance( node1, basestring ):
             if node1 in self.dcs:
                 node1 = self.dcs[node1].switch

-            elif node1 in self.switches:
-                node1 = self.switches[node1]

         if isinstance( node1, Datacenter ):
             node1 = node1.switch
         # ensure type of node2
         if isinstance( node2, basestring ):
             if node2 in self.dcs:
                 node2 = self.dcs[node2].switch
         if isinstance( node1, Datacenter ):
             node1 = node1.switch
         # ensure type of node2
         if isinstance( node2, basestring ):
             if node2 in self.dcs:
                 node2 = self.dcs[node2].switch

-            elif node2 in self.switches:
-                node2 = self.switches[node2]

         if isinstance( node2, Datacenter ):
             node2 = node2.switch
         # try to give containers a default IP
         if isinstance( node2, Datacenter ):
             node2 = node2.switch
         # try to give containers a default IP


@@ -89,30 +85,37 @@ class DCNetwork(object):
             if not "ip" in params["params2"]:
                 params["params2"]["ip"] = self.getNextIp()
 
             if not "ip" in params["params2"]:
                 params["params2"]["ip"] = self.getNextIp()
 

-        return self.mnet.addLink(node1, node2, **params)  # TODO we need TCLinks with user defined performance here
+        link = Dockernet.addLink(self, node1, node2, **params)  # TODO we need TCLinks with user defined performance here
+
+        # add edge and assigned port number to graph in both directions between node1 and node2
+        self.DCNetwork_graph.add_edge(node1.name, node2.name, \
+                                      {'src_port': node1.ports[link.intf1], 'dst_port': node2.ports[link.intf2]})
+        self.DCNetwork_graph.add_edge(node2.name, node1.name, \
+                                       {'src_port': node2.ports[link.intf2], 'dst_port': node1.ports[link.intf1]})

 
 

-    def removeLink(self, link=None, node1=None, node2=None):
+        return link
+
+    def addDocker( self, label, **params ):

         """
         """

-        Removes a link. Can either be specified by link object,
-        or the nodes the link connects. Wraps Dockernet method.
+        Wrapper for addDocker method to use custom container class.

         """
         """

-        logging.debug("removeLink: n1=%s n2=%s" % (str(node1), str(node2)))
-        return self.mnet.removeLink(link=link, node1=node1, node2=node2)
+        self.DCNetwork_graph.add_node(label)
+        return Dockernet.addDocker(self, label, cls=EmulatorCompute, **params)

 
 

-    def addDocker( self, name, **params ):
+    def removeDocker( self, label, **params ):

         """
         """

-        Wrapper for addDocker method provided by Dockernet.
+        Wrapper for removeDocker method to update graph.

         """
         """

-        return self.mnet.addDocker( name, cls=EmulatorCompute, **params)
+        self.DCNetwork_graph.remove_node(label)
+        return Dockernet.removeDocker(self, label, **params)

 
 

-    def removeDocker( self, name, **params):
+    def addSwitch( self, name, add_to_graph=True, **params ):

         """
         """

-        Wrapper for removeHost. Just to be complete.
+        Wrapper for addSwitch method to store switch also in graph.

         """
         """

-        return self.mnet.removeDocker(name, **params)
-
-    def getNextIp(self):
-        return self.mnet.getNextIp()
+        if add_to_graph:
+            self.DCNetwork_graph.add_node(name)
+        return Dockernet.addSwitch(self, name, protocols='OpenFlow10,OpenFlow12,OpenFlow13', **params)

 
     def getAllContainers(self):
         """
 
     def getAllContainers(self):
         """


@@ -127,10 +130,53 @@ class DCNetwork(object):
         # start
         for dc in self.dcs.itervalues():
             dc.start()
         # start
         for dc in self.dcs.itervalues():
             dc.start()

-        self.mnet.start()
+        Dockernet.start(self)

 
     def stop(self):
 
     def stop(self):

-        self.mnet.stop()
+        Dockernet.stop(self)

 
     def CLI(self):
 
     def CLI(self):

-        CLI(self.mnet)
+        CLI(self)
+
+    # to remove chain do setChain( src, dst, cmd='del-flows')
+    def setChain(self, vnf_src_name, vnf_dst_name, cmd='add-flow'):
+        # get shortest path
+        path = nx.shortest_path(self.DCNetwork_graph, vnf_src_name, vnf_dst_name)
+        logging.info("Path between {0} and {1}: {2}".format(vnf_src_name, vnf_dst_name, path))
+
+        current_hop = vnf_src_name
+        for i in range(0,len(path)):
+            next_hop = path[path.index(current_hop)+1]
+            next_node = self.getNodeByName(next_hop)
+
+            if next_hop == vnf_dst_name:
+                return "path added between {0} and {1}".format(vnf_src_name, vnf_dst_name)
+            elif not isinstance( next_node, OVSSwitch ):
+                logging.info("Next node: {0} is not a switch".format(next_hop))
+                return "Next node: {0} is not a switch".format(next_hop)
+
+
+            switch_inport = self.DCNetwork_graph[current_hop][next_hop]['dst_port']
+            next2_hop = path[path.index(current_hop)+2]
+            switch_outport = self.DCNetwork_graph[next_hop][next2_hop]['src_port']
+
+            logging.info("add flow in switch: {0} in_port: {1} out_port: {2}".format(next_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
+            if isinstance( next_node, OVSSwitch ):
+                match = 'in_port=%s' % switch_inport
+
+                if cmd=='add-flow':
+                    action = 'action=%s' % switch_outport
+                    s = ','
+                    ofcmd = s.join([match,action])
+                elif cmd=='del-flows':
+                    ofcmd = match
+                else:
+                    ofcmd=''
+
+                next_node.dpctl(cmd, ofcmd)
+
+            current_hop = next_hop
+
+        return "destination node: {0} not reached".format(vnf_dst_name)
\ No newline at end of file