afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Blake Harnden 2019-06-28 15:41:55 -07:00
parent 0e7464d419
commit 2397cd58ee
6 changed files with 49 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

15
daemon/core/nodes/docker.py
View file

@ -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):