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

Get rid of ' characters in errors

Browse Source
This commit is contained in:
Pim van Pelt
2022-03-15 21:13:42 +00:00
parent 2bbcff2ca0
commit 2947bbfd25
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/error-bondethernet1.yaml
View File

@ -2,7 +2,7 @@ test:
description: "Members of a BondEthernet must exist" description: "Members of a BondEthernet must exist"
errors: errors:
expected: expected:
- "bondethernet .* member .* doesn't exist" - "bondethernet .* member .* does not exist"
count: 2 count: 2
--- ---
bondethernets: bondethernets:

2
unittest/error-bridgedomain1.yaml
View File

@ -2,7 +2,7 @@ test:
description: "Interfaces put into the bridge, must exist as phy or sub-interface" description: "Interfaces put into the bridge, must exist as phy or sub-interface"
errors: errors:
expected: expected:
- "bridgedomain .* member .* doesn't exist" - "bridgedomain .* member .* does not exist"
count: 2 count: 2
--- ---
interfaces: interfaces:

2
validator/bondethernet.py
View File

@ -42,7 +42,7 @@ def validate_bondethernets(yaml):
logger.debug("bondethernet %s: %s" % (ifname, iface)) logger.debug("bondethernet %s: %s" % (ifname, iface))
for member in iface['interfaces']: for member in iface['interfaces']:
if not interface.get_by_name(yaml, member): if not interface.get_by_name(yaml, member):
msgs.append("bondethernet %s member %s doesn't exist" % (ifname, member)) msgs.append("bondethernet %s member %s does not exist" % (ifname, member))
result = False result = False
if interface.has_sub(yaml, member): if interface.has_sub(yaml, member):

2
validator/bridgedomain.py
View File

@ -62,7 +62,7 @@ def validate_bridgedomains(yaml):
for member in iface['interfaces']: for member in iface['interfaces']:
member_iface = interface.get_by_name(yaml, member) member_iface = interface.get_by_name(yaml, member)
if not member_iface: if not member_iface:
msgs.append("bridgedomain %s member %s doesn't exist" % (ifname, member)) msgs.append("bridgedomain %s member %s does not exist" % (ifname, member))
result = False result = False
continue continue

4
validator/interface.py
View File

@ -418,7 +418,7 @@ def validate_interfaces(yaml):
sub_lcp = get_lcp(yaml, sub_ifname) sub_lcp = get_lcp(yaml, sub_ifname)
if sub_lcp and len(sub_lcp)>15: if sub_lcp and len(sub_lcp)>15:
msgs.append("sub-interface %s has LCP with too long name '%s'" % (sub_ifname, sub_lcp)) msgs.append("sub-interface %s has LCP with too long name %s" % (sub_ifname, sub_lcp))
result = False result = False
if iface_lcp and not lcp.is_unique(yaml, iface_lcp): if iface_lcp and not lcp.is_unique(yaml, iface_lcp):
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))
@ -444,7 +444,7 @@ def validate_interfaces(yaml):
msgs.append("sub-interface %s has invalid encapsulation" % (sub_ifname)) msgs.append("sub-interface %s has invalid encapsulation" % (sub_ifname))
result = False result = False
elif not unique_encapsulation(yaml, sub_ifname): elif not unique_encapsulation(yaml, sub_ifname):
msgs.append("sub-interface %s doesn't have unique encapsulation" % (sub_ifname)) msgs.append("sub-interface %s does not have unique encapsulation" % (sub_ifname))
result = False result = False
if 'l2xc' in sub_iface: if 'l2xc' in sub_iface:
if has_lcp(yaml, sub_ifname): if has_lcp(yaml, sub_ifname):