first basic in-datacenter link management

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

diff --git a/emuvim/dcemulator/node.py b/emuvim/dcemulator/node.py
index 3111735..71267ff 100644 (file)
--- a/emuvim/dcemulator/node.py
+++ b/emuvim/dcemulator/node.py
@@ -12,6 +12,8 @@ class Datacenter(object):
     """
     Represents a logical data center to which compute resources
     (Docker containers) can be added at runtime.
+
+    Will also implement resource bookkeeping in later versions.
     """
 
     def __init__(self, name):
@@ -40,11 +42,14 @@ class Datacenter(object):
         pass
 
     def addCompute(self, name):
-        #TODO remove mnet shortcut to have a clean API
+        """
+        Create a new container as compute resource and connect it to this
+        data center.
+        """
         #TODO connect container to DC's swtich
-        self.net.mnet.addDocker("%s.%s" % (self.name, name), dimage="ubuntu")
+        d1 = self.net.addDocker("%s.%s" % (self.name, name), dimage="ubuntu")
+        l1 = self.net.addLink(d1, self.switch)
 
     def removeCompute(self, name):
-        #TODO remove mnet shortcut to have a clean API
         #TODO disconnect container to DC's swtich
-        self.net.mnet.removeDocker("%s.%s" % (self.name, name))
+        self.net.removeDocker("%s.%s" % (self.name, name))