install ryu,networkx

[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..7b238b8
--- a/emuvim/dcemulator/net.py
+++ b/emuvim/dcemulator/net.py
@@ -13,46 +13,35 @@ from mininet.link import TCLink, Link
 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=Controller, switch=OVSKernelSwitch, **kwargs)
+        self.addController('c0')

 
 

-    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 +54,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 +74,13 @@ 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
+        return Dockernet.addLink(self, node1, node2, **params)  # TODO we need TCLinks with user defined performance here

 
 

-    def removeLink(self, link=None, node1=None, node2=None):
-        """
-        Removes a link. Can either be specified by link object,
-        or the nodes the link connects. Wraps Dockernet method.
+    def addDocker( self, label, **params ):

         """
         """

-        logging.debug("removeLink: n1=%s n2=%s" % (str(node1), str(node2)))
-        return self.mnet.removeLink(link=link, node1=node1, node2=node2)
-
-    def addDocker( self, name, **params ):
+        Wrapper for addDocker method to use custom container class.

         """
         """

-        Wrapper for addDocker method provided by Dockernet.
-        """
-        return self.mnet.addDocker( name, cls=EmulatorCompute, **params)
-
-    def removeDocker( self, name, **params):
-        """
-        Wrapper for removeHost. Just to be complete.
-        """
-        return self.mnet.removeDocker(name, **params)
-
-    def getNextIp(self):
-        return self.mnet.getNextIp()
+        return Dockernet.addDocker(self, label, cls=EmulatorCompute, **params)

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


@@ -127,10 +95,10 @@ 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)