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

Refactor for *_get_by_name()

Browse Source 
They now all return a list [ifname, iface]. If no interface was found
they return None,None. If one was found, they return the (string) name
and the dictionary with interface contents.
This commit is contained in:
Pim van Pelt
2022-03-21 01:18:03 +00:00
parent 5247e3a241
commit ba22b1aad8
8 changed files with 84 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
validator/bridgedomain.py
View File

@ -22,13 +22,13 @@ class NullHandler(logging.Handler):
def get_by_name(yaml, ifname):
""" Return the BridgeDomain by name, if it exists. Return None otherwise. """
""" Return the BridgeDomain by name, if it exists. Return None,None otherwise. """
try:
if ifname in yaml['bridgedomains']:
return yaml['bridgedomains'][ifname]
return ifname, yaml['bridgedomains'][ifname]
except:
pass
return None
return None, None
def get_bridge_interfaces(yaml):
@ -86,8 +86,7 @@ def validate_bridgedomains(yaml):
if 'interfaces' in iface:
for member in iface['interfaces']:
member_iface = interface.get_by_name(yaml, member)
if not member_iface:
if (None, None) == interface.get_by_name(yaml, member):
msgs.append("bridgedomain %s member %s does not exist" % (ifname, member))
result = False
continue