X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=emuvim%2Fdcemulator%2Fnet.py;h=7b238b8cdcff82d6f0951e50500ae6696ddd9348;hp=478c587dda2440e530eec3dae0a70daf9b945682;hb=a29c50cffd72de2f5533bb4f294adfe9a0f655d5;hpb=a2ad9ffafff966fbfc17ba1d5782a8ef90807428

diff --git a/emuvim/dcemulator/net.py b/emuvim/dcemulator/net.py
old mode 100644
new mode 100755
index 478c587..7b238b8
--- a/emuvim/dcemulator/net.py
+++ b/emuvim/dcemulator/net.py
@@ -4,55 +4,44 @@ Distributed Cloud Emulator (dcemulator)
 """
 import logging
 
-from mininet.net import Mininet
+from mininet.net import Dockernet
 from mininet.node import Controller, OVSKernelSwitch, Switch, Docker, Host
 from mininet.cli import CLI
 from mininet.log import setLogLevel, info
 from mininet.link import TCLink, Link
 
-from node import Datacenter
+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.
     """
 
-    def __init__(self):
+    def __init__(self, **kwargs):
         self.dcs = {}
-        self.switches = {}
-        self.links = []
-
         # create a Mininet/Dockernet network
-        setLogLevel('info')  # set Mininet loglevel
-        self.mnet = Mininet(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.
         """
-        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
-        self.dcs[name] = dc
+        self.dcs[label] = dc
         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
 
-    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
@@ -65,48 +54,51 @@ class DCNetwork(object):
         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
-            elif node2 in self.switches:
-                node2 = self.switches[node2]
         if isinstance( node2, Datacenter ):
             node2 = node2.switch
-        return self.mnet.addLink(node1, node2, **params)  # TODO we need TCLinks with user defined performance here
-
-    def removeLink(self, link=None, node1=None, node2=None):
+        # try to give containers a default IP
+        if isinstance( node1, Docker ):
+            if not "params1" in params:
+                params["params1"] = {}
+            if not "ip" in params["params1"]:
+                params["params1"]["ip"] = self.getNextIp()
+        if isinstance( node2, Docker ):
+            if not "params2" in params:
+                params["params2"] = {}
+            if not "ip" in params["params2"]:
+                params["params2"]["ip"] = self.getNextIp()
+
+        return Dockernet.addLink(self, node1, node2, **params)  # TODO we need TCLinks with user defined performance here
+
+    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)
+        return Dockernet.addDocker(self, label, cls=EmulatorCompute, **params)
 
-    def addDocker( self, name, **params ):
+    def getAllContainers(self):
         """
-        Wrapper for addDocker method provided by Dockernet.
+        Returns a list with all containers within all data centers.
         """
-        return self.mnet.addDocker( name, **params)
-
-    def removeDocker( self, name, **params):
-        """
-        Wrapper for removeHost. Just to be complete.
-        """
-        return self.mnet.removeDocker(name, **params)
+        all_containers = []
+        for dc in self.dcs.itervalues():
+            all_containers += dc.listCompute()
+        return all_containers
 
     def start(self):
         # start
         for dc in self.dcs.itervalues():
             dc.start()
-        self.mnet.start()
+        Dockernet.start(self)
 
     def stop(self):
-        self.mnet.stop()
+        Dockernet.stop(self)
 
     def CLI(self):
-        CLI(self.mnet)
+        CLI(self)