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

define 'is_l2' the same way VPP does: in a bridge or as an L2XC target.

Browse Source
This commit is contained in:
Pim van Pelt
2022-03-16 23:16:46 +00:00
parent 8a1da516f3
commit 6b6207f028
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
validator/interface.py
View File

@ -232,23 +232,26 @@ def valid_encapsulation(yaml, sub_ifname):
return False return False
if 'inner-dot1q' in encap and not ('dot1ad' in encap or 'dot1q' in encap): if 'inner-dot1q' in encap and not ('dot1ad' in encap or 'dot1q' in encap):
return False return False
if 'exact-match' in encap and encap['exact-match'] == False and is_l3(yaml, sub_ifname): if 'exact-match' in encap and encap['exact-match'] == False and has_lcp(yaml, sub_ifname):
return False return False
return True return True
def is_l3(yaml, ifname): def is_l2(yaml, ifname):
""" Returns True if the interface exists and has either an LCP or an address """ """ Returns True if the interface is an L2XC target or a member of a bridgedomain """
iface = get_by_name(yaml, ifname) if is_bridge_interface(yaml, ifname):
if not iface:
return False
if has_lcp(yaml, ifname):
return True return True
if has_address(yaml, ifname): if is_l2xc_target_interface(yaml, ifname):
return True return True
return False return False
def is_l3(yaml, ifname):
""" Returns True if the interface exists and is neither l2xc target nor bridgedomain """
return not is_l2(yaml, ifname)
def get_lcp(yaml, ifname): def get_lcp(yaml, ifname):
""" Returns the LCP of the interface. If the interface is a sub-interface with L3 """ Returns the LCP of the interface. If the interface is a sub-interface with L3
enabled, synthesize it based on its parent, using smart QinQ syntax. enabled, synthesize it based on its parent, using smart QinQ syntax.
@ -258,7 +261,7 @@ def get_lcp(yaml, ifname):
parent_iface = get_parent_by_name(yaml, ifname) parent_iface = get_parent_by_name(yaml, ifname)
if 'lcp' in iface: if 'lcp' in iface:
return iface['lcp'] return iface['lcp']
if not is_l3(yaml, ifname): if is_l2(yaml, ifname):
return None return None
if parent_iface and not 'lcp' in parent_iface: if parent_iface and not 'lcp' in parent_iface:
return None return None