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

removed devname from linkconfig as the only usage was of it was using a parametr that was already being passed in

Browse source
This commit is contained in:
Blake Harnden 2020-05-23 00:00:40 -07:00
parent dd13bc8379
commit 26b0868f65
8 changed files with 9 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1174,7 +1174,6 @@ class CoreNetworkBase(NodeBase):
duplicate: float = None,
jitter: float = None,
netif2: float = None,
devname: str = None,
) -> None:
"""
Configure link parameters by applying tc queuing disciplines on the interface.
@ -1186,7 +1185,6 @@ class CoreNetworkBase(NodeBase):
:param duplicate: duplicate percentage to set to
:param jitter: jitter to set to
:param netif2: interface two
:param devname: device name
:return: nothing
"""
raise NotImplementedError

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

@ -448,7 +448,6 @@ class CoreNetwork(CoreNetworkBase):
duplicate: float = None,
jitter: float = None,
netif2: float = None,
devname: str = None,
) -> None:
"""
Configure link parameters by applying tc queuing disciplines on the interface.
@ -460,11 +459,9 @@ class CoreNetwork(CoreNetworkBase):
:param duplicate: duplicate percentage to set to
:param jitter: jitter to set to
:param netif2: interface two
:param devname: device name
:return: nothing
"""
if devname is None:
devname = netif.localname
devname = netif.localname
tc = f"{TC_BIN} qdisc replace dev {devname}"
parent = "root"
changed = False

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

@ -151,16 +151,13 @@ class PhysicalNode(CoreNodeBase):
duplicate: float = None,
jitter: float = None,
netif2: CoreInterface = None,
devname: str = None,
) -> None:
"""
Apply tc queing disciplines using linkconfig.
"""
linux_bridge = CoreNetwork(session=self.session, start=False)
linux_bridge.up = True
linux_bridge.linkconfig(
netif, bw, delay, loss, duplicate, jitter, netif2, devname
)
linux_bridge.linkconfig(netif, bw, delay, loss, duplicate, jitter, netif2)
del linux_bridge
def newifindex(self) -> int: