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

initial lxd based node working from simple scripts

Browse source
This commit is contained in:
Blake Harnden 2019-07-02 07:48:43 -07:00
parent 2397cd58ee
commit e83b38d96a
8 changed files with 483 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
daemon/core/emulator/enumerations.py
View file

@ -82,6 +82,7 @@ class NodeTypes(Enum):
CONTROL_NET = 13
EMANE_NET = 14
DOCKER = 15
LXC = 16
class Rj45Models(Enum):

4
daemon/core/emulator/session.py
View file

@ -500,7 +500,7 @@ class Session(object):
# create node
logging.info("creating node(%s) id(%s) name(%s) start(%s)", node_class.__name__, _id, name, start)
if _type == NodeTypes.DOCKER:
if _type in [NodeTypes.DOCKER, NodeTypes.LXC]:
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)
@ -514,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, NodeTypes.DOCKER]:
if _type in [NodeTypes.DEFAULT, NodeTypes.PHYSICAL, NodeTypes.DOCKER, NodeTypes.LXC]:
node.type = node_options.model
logging.debug("set node type: %s", node.type)
self.services.add_services(node, node.type, node_options.services)