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

Cosmetic: use '.. LCP' consistently

Browse Source
This commit is contained in:
Pim van Pelt
2022-03-22 18:49:31 +00:00
parent 97fef9bfd2
commit 27ce2351c7
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/yaml/error-bridgedomain3.yaml
View File

@ -3,7 +3,7 @@ test:
errors: errors:
expected: expected:
- "interface .* has an address but no LCP" - "interface .* has an address but no LCP"
- "sub-interface .* has an address but .* does not have LCP" - "sub-interface .* has an address but .* does not have an LCP"
- "bridgedomain .* member .* has an address" - "bridgedomain .* member .* has an address"
- "interface .* is in L2 mode but has an address" - "interface .* is in L2 mode but has an address"
- "sub-interface .* is in L2 mode but has an address" - "sub-interface .* is in L2 mode but has an address"

2
unittest/yaml/error-subinterface2.yaml
View File

@ -2,7 +2,7 @@ test:
description: "A subinterface cannot have an LCP if the parent doesn't have one" description: "A subinterface cannot have an LCP if the parent doesn't have one"
errors: errors:
expected: expected:
- "sub-interface .* has LCP name .* but .* does not have LCP" - "sub-interface .* has LCP name .* but .* does not have an LCP"
count: 1 count: 1
--- ---
interfaces: interfaces:

4
unittest/yaml/error-subinterface3.yaml
View File

@ -2,8 +2,8 @@ test:
description: "Children with an LCP require their parent to have one too" description: "Children with an LCP require their parent to have one too"
errors: errors:
expected: expected:
- "sub-interface .* has LCP name .* but .* does not have LCP" - "sub-interface .* has LCP name .* but .* does not have an LCP"
- "sub-interface .* is QinX and has LCP name .* but .* does not have LCP" - "sub-interface .* is QinX and has LCP name .* but .* does not have an LCP"
- "sub-interface .* has LCP name .* but its encapsulation is not exact-match" - "sub-interface .* has LCP name .* but its encapsulation is not exact-match"
- "sub-interface .* has invalid encapsulation" - "sub-interface .* has invalid encapsulation"
count: 4 count: 4

2
unittest/yaml/error-subinterface5.yaml
View File

@ -2,7 +2,7 @@ test:
description: "Sub-interface with addresses must have an LCP. Gi1/0/0 does this wrong, while Gi2/0/0 does it correctly" description: "Sub-interface with addresses must have an LCP. Gi1/0/0 does this wrong, while Gi2/0/0 does it correctly"
errors: errors:
expected: expected:
- "sub-interface .* has an address but .* does not have LCP" - "sub-interface .* has an address but .* does not have an LCP"
count: 1 count: 1
--- ---
interfaces: interfaces:

6
validator/interface.py
View File

@ -442,7 +442,7 @@ def validate_interfaces(yaml):
msgs.append("sub-interface %s does not have a unique LCP name %s" % (sub_ifname, sub_lcp)) msgs.append("sub-interface %s does not have a unique LCP name %s" % (sub_ifname, sub_lcp))
result = False result = False
if sub_lcp and not iface_lcp: if sub_lcp and not iface_lcp:
msgs.append("sub-interface %s has LCP name %s but %s does not have LCP" % (sub_ifname, sub_lcp, ifname)) msgs.append("sub-interface %s has LCP name %s but %s does not have an LCP" % (sub_ifname, sub_lcp, ifname))
result = False result = False
if sub_lcp and is_qinx(yaml, sub_ifname): if sub_lcp and is_qinx(yaml, sub_ifname):
mid_ifname, mid_iface = get_qinx_parent_by_name(yaml, sub_ifname) mid_ifname, mid_iface = get_qinx_parent_by_name(yaml, sub_ifname)
@ -450,7 +450,7 @@ def validate_interfaces(yaml):
msgs.append("sub-interface %s is QinX and has LCP name %s which requires a parent" % (sub_ifname, sub_lcp)) msgs.append("sub-interface %s is QinX and has LCP name %s which requires a parent" % (sub_ifname, sub_lcp))
result = False result = False
elif not get_lcp(yaml, mid_ifname): elif not get_lcp(yaml, mid_ifname):
msgs.append("sub-interface %s is QinX and has LCP name %s but %s does not have LCP" % (sub_ifname, sub_lcp, 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 result = False
if sub_lcp and 'encapsulation' in sub_iface and 'exact-match' in sub_iface['encapsulation'] and not sub_iface['encapsulation']['exact-match']: if sub_lcp and 'encapsulation' in sub_iface and 'exact-match' in sub_iface['encapsulation'] and not sub_iface['encapsulation']['exact-match']:
msgs.append("sub-interface %s has LCP name %s but its encapsulation is not exact-match" % (sub_ifname, sub_lcp)) msgs.append("sub-interface %s has LCP name %s but its encapsulation is not exact-match" % (sub_ifname, sub_lcp))
@ -460,7 +460,7 @@ def validate_interfaces(yaml):
if has_address(yaml, sub_ifname): if has_address(yaml, sub_ifname):
## The sub_iface lcp is not required: it can be derived from the iface_lcp, which has to be set ## The sub_iface lcp is not required: it can be derived from the iface_lcp, which has to be set
if not iface_lcp: if not iface_lcp:
msgs.append("sub-interface %s has an address but %s does not have LCP" % (sub_ifname, ifname)) msgs.append("sub-interface %s has an address but %s does not have an LCP" % (sub_ifname, ifname))
result = False result = False
if is_l2(yaml, sub_ifname): if is_l2(yaml, sub_ifname):
msgs.append("sub-interface %s is in L2 mode but has an address" % sub_ifname) msgs.append("sub-interface %s is in L2 mode but has an address" % sub_ifname)