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

cleanup for core.misc and core.netns

Browse source
This commit is contained in:
bharnden 2018-10-11 16:01:17 -07:00
parent 05a5574155
commit eb04e0a79f
7 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/netns/nodes.py
View file

@ -211,9 +211,7 @@ class PtpNet(LxBrNet):
if len(self._netif) != 2:
return all_links
if1, if2 = self._netif.items()
if1 = if1[1]
if2 = if2[1]
if1, if2 = self._netif.values()
unidirectional = 0
if if1.getparams() != if2.getparams():
@ -224,7 +222,7 @@ class PtpNet(LxBrNet):
interface1_ip6 = None
interface1_ip6_mask = None
for address in if1.addrlist:
ip, sep, mask = address.partition("/")
ip, _sep, mask = address.partition("/")
mask = int(mask)
if ipaddress.is_ipv4_address(ip):
family = AF_INET
@ -242,7 +240,7 @@ class PtpNet(LxBrNet):
interface2_ip6 = None
interface2_ip6_mask = None
for address in if2.addrlist:
ip, sep, mask = address.partition("/")
ip, _sep, mask = address.partition("/")
mask = int(mask)
if ipaddress.is_ipv4_address(ip):
family = AF_INET

8
daemon/core/netns/openvswitch.py
View file

@ -449,9 +449,7 @@ class OvsPtpNet(OvsNet):
if len(self._netif) != 2:
return all_links
if1, if2 = self._netif.items()
if1 = if1[1]
if2 = if2[1]
if1, if2 = self._netif.values()
unidirectional = 0
if if1.getparams() != if2.getparams():
@ -462,7 +460,7 @@ class OvsPtpNet(OvsNet):
interface1_ip6 = None
interface1_ip6_mask = None
for address in if1.addrlist:
ip, sep, mask = address.partition("/")
ip, _sep, mask = address.partition("/")
mask = int(mask)
if ipaddress.is_ipv4_address(ip):
family = AF_INET
@ -480,7 +478,7 @@ class OvsPtpNet(OvsNet):
interface2_ip6 = None
interface2_ip6_mask = None
for address in if2.addrlist:
ip, sep, mask = address.partition("/")
ip, _sep, mask = address.partition("/")
mask = int(mask)
if ipaddress.is_ipv4_address(ip):
family = AF_INET

8
daemon/core/netns/vnet.py
View file

@ -140,11 +140,9 @@ class EbtablesQueue(object):
while self.doupdateloop:
with self.updatelock:
for wlan in self.updates:
"""
Check if wlan is from a previously closed session. Because of the
rate limiting scheme employed here, this may happen if a new session
is started soon after closing a previous session.
"""
# Check if wlan is from a previously closed session. Because of the
# rate limiting scheme employed here, this may happen if a new session
# is started soon after closing a previous session.
# TODO: if these are WlanNodes, this will never throw an exception
try:
wlan.session

7
daemon/core/netns/vnode.py
View file

@ -364,7 +364,7 @@ class SimpleLxcNode(PyCoreNode):
if self.up:
self.check_cmd([constants.IP_BIN, "addr", "del", str(addr), "dev", self.ifname(ifindex)])
def delalladdr(self, ifindex, address_types=valid_address_types):
def delalladdr(self, ifindex, address_types=None):
"""
Delete all addresses from an interface.
@ -373,6 +373,9 @@ class SimpleLxcNode(PyCoreNode):
:return: nothing
:raises CoreCommandError: when a non-zero exit status occurs
"""
if not address_types:
address_types = self.valid_address_types
interface_name = self.ifname(ifindex)
addresses = self.client.getaddr(interface_name, rescan=True)
@ -570,7 +573,7 @@ class LxcNode(SimpleLxcNode):
:rtype: file
"""
hostfilename = self.hostfilename(filename)
dirname, basename = os.path.split(hostfilename)
dirname, _basename = os.path.split(hostfilename)
if not os.path.isdir(dirname):
os.makedirs(dirname, mode=0755)
return open(hostfilename, mode)