ipng/vppcfg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove commented out 'print' debug lines

Browse Source
This commit is contained in:
Pim van Pelt
2022-04-22 09:33:27 +00:00
parent d8c0dd4ab4
commit 13cdba1e1d
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/address.py
View File

@ -80,9 +80,7 @@ def is_allowed(yaml, ifname, iface_addresses, ip_interface):
vpp# set interface ip address loop0 192.0.2.3/23 vpp# set interface ip address loop0 192.0.2.3/23
set interface ip address: failed to add 192.0.2.3/23 on loop0 which conflicts with 192.0.2.1/24 for interface loop0 set interface ip address: failed to add 192.0.2.3/23 on loop0 which conflicts with 192.0.2.1/24 for interface loop0
""" """
## print("input: (%s,%s)" % (iface_addresses, ip_interface))
all_other_addresses = get_all_addresses_except_ifname(yaml, ifname) all_other_addresses = get_all_addresses_except_ifname(yaml, ifname)
## print("All IPs: %s" % all_other_addresses)
my_ip_network = ipaddress.ip_network(ip_interface, strict=False) my_ip_network = ipaddress.ip_network(ip_interface, strict=False)
@ -91,15 +89,12 @@ def is_allowed(yaml, ifname, iface_addresses, ip_interface):
continue continue
if ipaddress.ip_network(ipi, strict=False) == my_ip_network: if ipaddress.ip_network(ipi, strict=False) == my_ip_network:
## print("Same: %s == %s" % (ip_interface, ipi))
return False return False
if ipaddress.ip_network(ipi, strict=False).subnet_of(my_ip_network): if ipaddress.ip_network(ipi, strict=False).subnet_of(my_ip_network):
## print("More: %s == %s" % (ip_interface, ipi))
return False return False
if my_ip_network.subnet_of(ipaddress.ip_network(ipi, strict=False)): if my_ip_network.subnet_of(ipaddress.ip_network(ipi, strict=False)):
## print("Less: %s == %s" % (ip_interface, ipi))
return False return False
for ip in iface_addresses: for ip in iface_addresses:
@ -108,15 +103,12 @@ def is_allowed(yaml, ifname, iface_addresses, ip_interface):
continue continue
if ipaddress.ip_network(ipi, strict=False) == my_ip_network: if ipaddress.ip_network(ipi, strict=False) == my_ip_network:
## print("iface same: %s == %s" % (ip_interface, ipi))
return True return True
if ipaddress.ip_network(ipi, strict=False).subnet_of(my_ip_network): if ipaddress.ip_network(ipi, strict=False).subnet_of(my_ip_network):
## print("iface more: %s == %s" % (ip_interface, ipi))
return False return False
if my_ip_network.subnet_of(ipaddress.ip_network(ipi, strict=False)): if my_ip_network.subnet_of(ipaddress.ip_network(ipi, strict=False)):
## print("iface less: %s == %s" % (ip_interface, ipi))
return False return False
return True return True

1
config/interface.py
View File

@ -349,7 +349,6 @@ def unique_encapsulation(yaml, sub_ifname):
sibling_ifname = "%s.%d" % (parent_ifname, subid) sibling_ifname = "%s.%d" % (parent_ifname, subid)
sibling_encap = get_encapsulation(yaml, sibling_ifname) sibling_encap = get_encapsulation(yaml, sibling_ifname)
if sub_encap == sibling_encap and new_ifname != sibling_ifname: if sub_encap == sibling_encap and new_ifname != sibling_ifname:
## print("%s overlaps with %s" % (sub_encap, sibling_encap))
ncount = ncount + 1 ncount = ncount + 1
return ncount == 0 return ncount == 0