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

updates to Pipefile.lock and for nodes to add server to constructor

Browse source
This commit is contained in:
bharnden 2019-10-05 11:16:57 -07:00
parent 931ee65235
commit 95296988c5
6 changed files with 310 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/core/emane/nodes.py
View file

@ -29,8 +29,8 @@ class EmaneNet(CoreNetworkBase):
type = "wlan"
is_emane = True
def __init__(self, session, _id=None, name=None, start=True):
super(EmaneNet, self).__init__(session, _id, name, start)
def __init__(self, session, _id=None, name=None, start=True, server=None):
super(EmaneNet, self).__init__(session, _id, name, start, server)
self.conf = ""
self.up = False
self.nemidmap = {}

5
daemon/core/nodes/base.py
View file

@ -1045,7 +1045,7 @@ class CoreNetworkBase(NodeBase):
linktype = LinkTypes.WIRED.value
is_emane = False
def __init__(self, session, _id, name, start=True):
def __init__(self, session, _id, name, start=True, server=None):
"""
Create a CoreNetworkBase instance.
@ -1053,8 +1053,9 @@ class CoreNetworkBase(NodeBase):
:param int _id: object id
:param str name: object name
:param bool start: should object start
:param str server: remote server node will run on, default is None for localhost
"""
super(CoreNetworkBase, self).__init__(session, _id, name, start=start)
super(CoreNetworkBase, self).__init__(session, _id, name, start, server)
self._linked = {}
self._linked_lock = threading.Lock()

28
daemon/core/nodes/network.py
View file

@ -281,7 +281,9 @@ class CoreNetwork(CoreNetworkBase):
policy = "DROP"
def __init__(self, session, _id=None, name=None, start=True, policy=None):
def __init__(
self, session, _id=None, name=None, start=True, server=None, policy=None
):
"""
Creates a LxBrNet instance.
@ -289,9 +291,10 @@ class CoreNetwork(CoreNetworkBase):
:param int _id: object id
:param str name: object name
:param bool start: start flag
:param str server: remote server node will run on, default is None for localhost
:param policy: network policy
"""
CoreNetworkBase.__init__(self, session, _id, name, start)
CoreNetworkBase.__init__(self, session, _id, name, start, server)
if name is None:
name = str(self.id)
if policy is not None:
@ -649,6 +652,7 @@ class GreTapBridge(CoreNetwork):
ttl=255,
key=None,
start=True,
server=None,
):
"""
Create a GreTapBridge instance.
@ -663,9 +667,7 @@ class GreTapBridge(CoreNetwork):
:param key: gre tap key
:param bool start: start flag
"""
CoreNetwork.__init__(
self, session=session, _id=_id, name=name, policy=policy, start=False
)
CoreNetwork.__init__(self, session, _id, name, False, server, policy)
self.grekey = key
if self.grekey is None:
self.grekey = self.session.id ^ self.id
@ -769,6 +771,7 @@ class CtrlNet(CoreNetwork):
prefix=None,
hostid=None,
start=True,
server=None,
assign_address=True,
updown_script=None,
serverintf=None,
@ -782,6 +785,7 @@ class CtrlNet(CoreNetwork):
:param prefix: control network ipv4 prefix
:param hostid: host id
:param bool start: start flag
:param str server: remote server node will run on, default is None for localhost
:param str assign_address: assigned address
:param str updown_script: updown script
:param serverintf: server interface
@ -792,7 +796,7 @@ class CtrlNet(CoreNetwork):
self.assign_address = assign_address
self.updown_script = updown_script
self.serverintf = serverintf
CoreNetwork.__init__(self, session, _id=_id, name=name, start=start)
CoreNetwork.__init__(self, session, _id, name, start, server)
def startup(self):
"""
@ -1028,7 +1032,7 @@ class HubNode(CoreNetwork):
policy = "ACCEPT"
type = "hub"
def __init__(self, session, _id=None, name=None, start=True):
def __init__(self, session, _id=None, name=None, start=True, server=None):
"""
Creates a HubNode instance.
@ -1036,9 +1040,10 @@ class HubNode(CoreNetwork):
:param int _id: node id
:param str name: node namee
:param bool start: start flag
:param str server: remote server node will run on, default is None for localhost
:raises CoreCommandError: when there is a command exception
"""
CoreNetwork.__init__(self, session, _id, name, start)
CoreNetwork.__init__(self, session, _id, name, start, server)
# TODO: move to startup method
if start:
@ -1055,7 +1060,9 @@ class WlanNode(CoreNetwork):
policy = "DROP"
type = "wlan"
def __init__(self, session, _id=None, name=None, start=True, policy=None):
def __init__(
self, session, _id=None, name=None, start=True, server=None, policy=None
):
"""
Create a WlanNode instance.
@ -1063,9 +1070,10 @@ class WlanNode(CoreNetwork):
:param int _id: node id
:param str name: node name
:param bool start: start flag
:param str server: remote server node will run on, default is None for localhost
:param policy: wlan policy
"""
CoreNetwork.__init__(self, session, _id, name, start, policy)
CoreNetwork.__init__(self, session, _id, name, start, server, policy)
# wireless model such as basic range
self.model = None
# mobility model such as scripted

6
daemon/core/nodes/physical.py
View file

@ -277,7 +277,7 @@ class Rj45Node(CoreNodeBase, CoreInterface):
apitype = NodeTypes.RJ45.value
type = "rj45"
def __init__(self, session, _id=None, name=None, mtu=1500, start=True):
def __init__(self, session, _id=None, name=None, mtu=1500, start=True, server=None):
"""
Create an RJ45Node instance.
@ -286,9 +286,9 @@ class Rj45Node(CoreNodeBase, CoreInterface):
:param str name: node name
:param mtu: rj45 mtu
:param bool start: start flag
:return:
:param str server: remote server node will run on, default is None for localhost
"""
CoreNodeBase.__init__(self, session, _id, name, start=start)
CoreNodeBase.__init__(self, session, _id, name, start, server)
CoreInterface.__init__(self, node=self, name=name, mtu=mtu)
self.up = False
self.lock = threading.RLock()