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

removed parameter conversion for creating GreTap commands

Browse source
This commit is contained in:
Blake Harnden 2019-10-14 12:31:41 -07:00
parent 2bfd050880
commit 82bdbd776b
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
daemon/core/nodes/interface.py
View file

@ -456,12 +456,12 @@ class GreTap(CoreInterface):
:param core.nodes.base.CoreNode node: related core node :param core.nodes.base.CoreNode node: related core node
:param str name: interface name :param str name: interface name
:param core.emulator.session.Session session: core session instance :param core.emulator.session.Session session: core session instance
:param mtu: interface mtu :param int mtu: interface mtu
:param str remoteip: remote address :param str remoteip: remote address
:param int _id: object id :param int _id: object id
:param str localip: local address :param str localip: local address
:param ttl: ttl value :param int ttl: ttl value
:param key: gre tap key :param int key: gre tap key
:param bool start: start flag :param bool start: start flag
:param fabric.connection.Connection server: remote server node will run on, :param fabric.connection.Connection server: remote server node will run on,
default is None for localhost default is None for localhost
@ -484,13 +484,7 @@ class GreTap(CoreInterface):
if remoteip is None: if remoteip is None:
raise ValueError("missing remote IP required for GRE TAP device") raise ValueError("missing remote IP required for GRE TAP device")
if localip is not None: self.net_client.create_gretap(self.localname, remoteip, localip, ttl, key)
localip = str(localip)
if ttl is not None:
ttl = str(ttl)
if key is not None:
key = str(key)
self.net_client.create_gretap(self.localname, str(remoteip), localip, ttl, key)
self.net_client.device_up(self.localname) self.net_client.device_up(self.localname)
self.up = True self.up = True

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

@ -177,8 +177,8 @@ class LinuxNetClient(object):
:param str device: device to add tap to :param str device: device to add tap to
:param str address: address to add tap for :param str address: address to add tap for
:param str local: local address to tie to :param str local: local address to tie to
:param str ttl: time to live value :param int ttl: time to live value
:param str key: key for tap :param int key: key for tap
:return: nothing :return: nothing
""" """
cmd = "%s link add %s type gretap remote %s" % (IP_BIN, device, address) cmd = "%s link add %s type gretap remote %s" % (IP_BIN, device, address)