X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=emuvim%2Fdcemulator%2Fnode.py;h=0e6eae8816e7fae5338070d9fcb19922631f4252;hb=726a45874fda781f19d1bc1c21b18ba8526e2c19;hp=de64d6980860f0862da4d659cdfe498084e096ba;hpb=bd44f4aedca9d48d150939cd76d7cefe7e386aa2;p=osm%2Fvim-emu.git diff --git a/emuvim/dcemulator/node.py b/emuvim/dcemulator/node.py index de64d69..0e6eae8 100644 --- 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)) @@ -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())