X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=emuvim%2Fdcemulator%2Fnode.py;h=6d615b5599938a0ac743acf9f2b16f3a9ee1f7f3;hb=326d06d0db129a0b0f981ee84fc62a9a5e41a3e0;hp=87a5a6e38317c8e20627bb386f0804244d1b496d;hpb=056fd459f46bb9fd2d5a83e6326823e86373ff7d;p=osm%2Fvim-emu.git

diff --git a/emuvim/dcemulator/node.py b/emuvim/dcemulator/node.py
index 87a5a6e..6d615b5 100644
--- a/emuvim/dcemulator/node.py
+++ b/emuvim/dcemulator/node.py
@@ -21,6 +21,7 @@ class EmulatorCompute(Docker):
     def __init__(
             self, name, dimage, **kwargs):
         logging.debug("Create EmulatorCompute instance: %s" % name)
+        self.datacenter = None  # pointer to current DC
 
         # call original Docker.__init__
         Docker.__init__(self, name, dimage, **kwargs)
@@ -50,6 +51,8 @@ class EmulatorCompute(Docker):
         status["memswap_limit"] = self.memswap_limit
         status["state"] = self.dcli.inspect_container(self.dc)["State"]
         status["id"] = self.dcli.inspect_container(self.dc)["Id"]
+        status["datacenter"] = (None if self.datacenter is None
+                                else self.datacenter.label)
         return status
 
 
@@ -61,9 +64,15 @@ class Datacenter(object):
     Will also implement resource bookkeeping in later versions.
     """
 
-    def __init__(self, name):
+    DC_COUNTER = 1
+
+    def __init__(self, label):
         self.net = None  # DCNetwork to which we belong
-        self.name = name
+        # each node (DC) has a short internal name used by Mininet
+        # this is caused by Mininets naming limitations for swtiches etc.
+        self.name = "dc%d" % Datacenter.DC_COUNTER
+        Datacenter.DC_COUNTER += 1
+        self.label = label  # use this for user defined names
         self.switch = None  # first prototype assumes one "bigswitch" per DC
         self.containers = {}  # keep track of running containers
 
@@ -80,7 +89,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))
 
@@ -96,6 +105,9 @@ class Datacenter(object):
         a single container can be connected.
         """
         assert name is not None
+        # no duplications
+        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:
             image = "ubuntu"
@@ -104,14 +116,18 @@ class Datacenter(object):
         # create the container and connect it to the given network
         d = self.net.addDocker("%s" % (name), dimage=image)
         self.net.addLink(d, self.switch, params1=network)
+        # do bookkeeping
         self.containers[name] = d
-        return name  # we might use UUIDs for naming later on
+        d.datacenter = self
+        return d  # we might use UUIDs for naming later on
 
     def stopCompute(self, name):
         """
         Stop and remove a container from this data center.
         """
-        assert name in self.containers
+        assert name is not None
+        if name not in self.containers:
+            raise Exception("Container with name %s not found." % name)
         self.net.removeLink(
             link=None, node1=self.containers[name], node2=self.switch)
         self.net.removeDocker("%s" % (name))
@@ -123,4 +139,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())