From 2642e94deaecaf5d735b9093a2e8bc4025e86e0c Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sun, 3 Apr 2022 12:48:09 +0000 Subject: [PATCH] Assert that sub-ints with addresses must have exact-match set --- config/interface.py | 8 ++++++-- unittest/yaml/error-subinterface8.yaml | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/interface.py b/config/interface.py index 2433cd0..b18e97e 100644 --- a/config/interface.py +++ b/config/interface.py @@ -502,12 +502,16 @@ def validate_interfaces(yaml): elif not get_lcp(yaml, mid_ifname): msgs.append("sub-interface %s is QinX and has LCP name %s but %s does not have an LCP" % (sub_ifname, sub_lcp, mid_ifname)) result = False - if sub_lcp and 'encapsulation' in sub_iface and 'exact-match' in sub_iface['encapsulation'] and not sub_iface['encapsulation']['exact-match']: + + encap = get_encapsulation(yaml, sub_ifname) + if sub_lcp and (not encap or not encap['exact-match']): msgs.append("sub-interface %s has LCP name %s but its encapsulation is not exact-match" % (sub_ifname, sub_lcp)) result = False - if has_address(yaml, sub_ifname): + if not encap or not encap['exact-match']: + msgs.append("sub-interface %s has an address but its encapsulation is not exact-match" % (sub_ifname)) + result = False if is_l2(yaml, sub_ifname): msgs.append("sub-interface %s is in L2 mode but has an address" % sub_ifname) result = False diff --git a/unittest/yaml/error-subinterface8.yaml b/unittest/yaml/error-subinterface8.yaml index 5faf101..76429d7 100644 --- a/unittest/yaml/error-subinterface8.yaml +++ b/unittest/yaml/error-subinterface8.yaml @@ -4,7 +4,8 @@ test: expected: - "sub-interface GigabitEthernet1/0/0.(101|102) has invalid encapsulation" - "sub-interface .* has LCP name .* but its encapsulation is not exact-match" - count: 4 + - "sub-interface .* has an address but its encapsulation is not exact-match" + count: 5 --- interfaces: GigabitEthernet1/0/0: