integrated creation into the standard session.add_node call, currently requires an extra check due to the need for being able to specify an image

daemon/core/emulator/emudata.py

@@ -79,12 +79,13 @@ class NodeOptions(object):
     Options for creating and updating nodes within core.
     """
 
-    def __init__(self, name=None, model="PC"):
+    def __init__(self, name=None, model="PC", image=None):
         """
         Create a NodeOptions object.
 
         :param str name: name of node, defaults to node class name postfix with its id
         :param str model: defines services for default and physical nodes, defaults to "router"
+        :param str image: image to use for docker nodes
         """
         self.name = name
         self.model = model
@@ -99,6 +100,7 @@ class NodeOptions(object):
         self.alt = None
         self.emulation_id = None
         self.emulation_server = None
+        self.image = image
 
     def set_position(self, x, y):
         """

daemon/core/emulator/session.py

@@ -500,7 +500,10 @@ class Session(object):
 
         # create node
         logging.info("creating node(%s) id(%s) name(%s) start(%s)", node_class.__name__, _id, name, start)
-        node = self.create_node(cls=node_class, _id=_id, name=name, start=start)
+        if _type == NodeTypes.DOCKER:
+            node = self.create_node(cls=node_class, _id=_id, name=name, start=start, image=node_options.image)
+        else:
+            node = self.create_node(cls=node_class, _id=_id, name=name, start=start)
 
         # set node attributes
         node.icon = node_options.icon
@@ -511,7 +514,7 @@ class Session(object):
         self.set_node_position(node, node_options)
 
         # add services to default and physical nodes only
-        if _type in [NodeTypes.DEFAULT, NodeTypes.PHYSICAL]:
+        if _type in [NodeTypes.DEFAULT, NodeTypes.PHYSICAL, NodeTypes.DOCKER]:
             node.type = node_options.model
             logging.debug("set node type: %s", node.type)
             self.services.add_services(node, node.type, node_options.services)

daemon/core/nodes/docker.py

@@ -8,15 +8,16 @@ from core.nodes.base import CoreNode
 
 
 class DockerClient(object):
-    def __init__(self, name):
+    def __init__(self, name, image):
         self.name = name
+        self.image = image
         self.pid = None
         self._addr = {}
 
-    def create_container(self, image):
+    def create_container(self):
         utils.check_cmd("docker run -td --net=none --hostname {name} --name {name} {image} /bin/bash".format(
             name=self.name,
-            image=image
+            image=self.image
         ))
         self.pid = self.get_pid()
         return self.pid
@@ -119,7 +120,7 @@ class DockerNode(CoreNode):
     apitype = NodeTypes.DOCKER.value
     valid_address_types = {"inet", "inet6", "inet6link"}
 
-    def __init__(self, session, _id=None, name=None, nodedir=None, bootsh="boot.sh", start=True):
+    def __init__(self, session, _id=None, name=None, nodedir=None, bootsh="boot.sh", start=True, image=None):
         """
         Create a CoreNode instance.
 
@@ -133,7 +134,9 @@ class DockerNode(CoreNode):
         super(CoreNode, self).__init__(session, _id, name, start=start)
         self.nodedir = nodedir
         self.ctrlchnlname = os.path.abspath(os.path.join(self.session.session_dir, self.name))
-        self.client = DockerClient(self.name)
+        if image is None:
+            image = "ubuntu"
+        self.client = DockerClient(self.name, image)
         self.pid = None
         self.up = False
         self.lock = threading.RLock()
@@ -164,7 +167,7 @@ class DockerNode(CoreNode):
             if self.up:
                 raise ValueError("starting a node that is already up")
             self.makenodedir()
-            self.pid = self.client.create_container("ubuntu:ifconfig")
+            self.pid = self.client.create_container()
             self.up = True
 
     def shutdown(self):