fix for docker/lxd based nodes to use remote servers and example for lxd
This commit is contained in:
parent
7afaff8cbb
commit
b7dd8ddb66
4 changed files with 74 additions and 3 deletions
|
@ -782,6 +782,7 @@ class Session(object):
|
||||||
name=name,
|
name=name,
|
||||||
start=start,
|
start=start,
|
||||||
image=node_options.image,
|
image=node_options.image,
|
||||||
|
server=server,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
node = self.create_node(
|
node = self.create_node(
|
||||||
|
|
|
@ -89,7 +89,17 @@ class DockerClient(object):
|
||||||
class DockerNode(CoreNode):
|
class DockerNode(CoreNode):
|
||||||
apitype = NodeTypes.DOCKER.value
|
apitype = NodeTypes.DOCKER.value
|
||||||
|
|
||||||
def __init__(self, session, _id=None, name=None, nodedir=None, bootsh="boot.sh", start=True, image=None):
|
def __init__(
|
||||||
|
self,
|
||||||
|
session,
|
||||||
|
_id=None,
|
||||||
|
name=None,
|
||||||
|
nodedir=None,
|
||||||
|
bootsh="boot.sh",
|
||||||
|
start=True,
|
||||||
|
server=None,
|
||||||
|
image=None
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Create a DockerNode instance.
|
Create a DockerNode instance.
|
||||||
|
|
||||||
|
@ -99,12 +109,16 @@ class DockerNode(CoreNode):
|
||||||
:param str nodedir: node directory
|
:param str nodedir: node directory
|
||||||
:param str bootsh: boot shell to use
|
:param str bootsh: boot shell to use
|
||||||
:param bool start: start flag
|
:param bool start: start flag
|
||||||
|
:param core.emulator.distributed.DistributedServer server: remote server node
|
||||||
|
will run on, default is None for localhost
|
||||||
:param str image: image to start container with
|
:param str image: image to start container with
|
||||||
"""
|
"""
|
||||||
if image is None:
|
if image is None:
|
||||||
image = "ubuntu"
|
image = "ubuntu"
|
||||||
self.image = image
|
self.image = image
|
||||||
super(DockerNode, self).__init__(session, _id, name, nodedir, bootsh, start)
|
super(DockerNode, self).__init__(
|
||||||
|
session, _id, name, nodedir, bootsh, start, server
|
||||||
|
)
|
||||||
|
|
||||||
def create_node_net_client(self, use_ovs):
|
def create_node_net_client(self, use_ovs):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -74,6 +74,7 @@ class LxcNode(CoreNode):
|
||||||
nodedir=None,
|
nodedir=None,
|
||||||
bootsh="boot.sh",
|
bootsh="boot.sh",
|
||||||
start=True,
|
start=True,
|
||||||
|
server=None,
|
||||||
image=None,
|
image=None,
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
|
@ -85,12 +86,16 @@ class LxcNode(CoreNode):
|
||||||
:param str nodedir: node directory
|
:param str nodedir: node directory
|
||||||
:param str bootsh: boot shell to use
|
:param str bootsh: boot shell to use
|
||||||
:param bool start: start flag
|
:param bool start: start flag
|
||||||
|
:param core.emulator.distributed.DistributedServer server: remote server node
|
||||||
|
will run on, default is None for localhost
|
||||||
:param str image: image to start container with
|
:param str image: image to start container with
|
||||||
"""
|
"""
|
||||||
if image is None:
|
if image is None:
|
||||||
image = "ubuntu"
|
image = "ubuntu"
|
||||||
self.image = image
|
self.image = image
|
||||||
super(LxcNode, self).__init__(session, _id, name, nodedir, bootsh, start)
|
super(LxcNode, self).__init__(
|
||||||
|
session, _id, name, nodedir, bootsh, start, server
|
||||||
|
)
|
||||||
|
|
||||||
def alive(self):
|
def alive(self):
|
||||||
"""
|
"""
|
||||||
|
|
51
daemon/examples/python/distributed_lxd.py
Normal file
51
daemon/examples/python/distributed_lxd.py
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
import logging
|
||||||
|
import pdb
|
||||||
|
import sys
|
||||||
|
|
||||||
|
from core.emulator.coreemu import CoreEmu
|
||||||
|
from core.emulator.emudata import IpPrefixes, NodeOptions
|
||||||
|
from core.emulator.enumerations import EventTypes, NodeTypes
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
address = sys.argv[1]
|
||||||
|
remote = sys.argv[2]
|
||||||
|
|
||||||
|
# ip generator for example
|
||||||
|
prefixes = IpPrefixes(ip4_prefix="10.83.0.0/16")
|
||||||
|
|
||||||
|
# create emulator instance for creating sessions and utility methods
|
||||||
|
coreemu = CoreEmu({"distributed_address": address})
|
||||||
|
session = coreemu.create_session()
|
||||||
|
|
||||||
|
# initialize distributed
|
||||||
|
server_name = "core2"
|
||||||
|
session.add_distributed(server_name, remote)
|
||||||
|
|
||||||
|
# must be in configuration state for nodes to start, when using "node_add" below
|
||||||
|
session.set_state(EventTypes.CONFIGURATION_STATE)
|
||||||
|
|
||||||
|
# create local node, switch, and remote nodes
|
||||||
|
options = NodeOptions(image="ubuntu:18.04")
|
||||||
|
node_one = session.add_node(_type=NodeTypes.LXC, node_options=options)
|
||||||
|
options.emulation_server = server_name
|
||||||
|
node_two = session.add_node(_type=NodeTypes.LXC, node_options=options)
|
||||||
|
|
||||||
|
# create node interfaces and link
|
||||||
|
interface_one = prefixes.create_interface(node_one)
|
||||||
|
interface_two = prefixes.create_interface(node_two)
|
||||||
|
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
|
||||||
|
|
||||||
|
# instantiate session
|
||||||
|
session.instantiate()
|
||||||
|
|
||||||
|
# pause script for verification
|
||||||
|
pdb.set_trace()
|
||||||
|
|
||||||
|
# shutdown session
|
||||||
|
coreemu.shutdown()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
logging.basicConfig(level=logging.INFO)
|
||||||
|
main()
|
Loading…
Reference in a new issue