Merge pull request #1 from mpeuster/master

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

diff --git a/emuvim/dcemulator/node.py b/emuvim/dcemulator/node.py
index 0d96033..0e6eae8 100644 (file)
--- a/emuvim/dcemulator/node.py
+++ b/emuvim/dcemulator/node.py
@@ -83,7 +83,7 @@ class Datacenter(object):
         TODO: This will be changed in the future to support multiple networks
         per data center
         """
-        self.switch = self.net.mnet.addSwitch(
+        self.switch = self.net.addSwitch(
             "%s.s1" % self.name, dpid=hex(self._get_next_dc_dpid())[2:])
         logging.debug("created data center switch: %s" % str(self.switch))
 
@@ -100,7 +100,7 @@ class Datacenter(object):
         """
         assert name is not None
         # no duplications
-        if name in self.containers:
+        if name in [c.name for c in self.net.getAllContainers()]:
             raise Exception("Container with name %s already exists." % name)
         # set default parameter
         if image is None:
@@ -113,7 +113,7 @@ class Datacenter(object):
         # do bookkeeping
         self.containers[name] = d
         d.datacenter = self
-        return name  # we might use UUIDs for naming later on
+        return d  # we might use UUIDs for naming later on
 
     def stopCompute(self, name):
         """
@@ -133,4 +133,4 @@ class Datacenter(object):
         Return a list of all running containers assigned to this
         data center.
         """
-        return self.containers.itervalues()
+        return list(self.containers.itervalues())