diff --git a/unittest/error-bondethernet1.yaml b/unittest/error-bondethernet1.yaml index 6701db6..63bdc44 100644 --- a/unittest/error-bondethernet1.yaml +++ b/unittest/error-bondethernet1.yaml @@ -2,7 +2,7 @@ test: description: "Members of a BondEthernet must exist" errors: expected: - - "bondethernet .* member .* doesn't exist" + - "bondethernet .* member .* does not exist" count: 2 --- bondethernets: diff --git a/unittest/error-bridgedomain1.yaml b/unittest/error-bridgedomain1.yaml index 4f65a89..9d3ef74 100644 --- a/unittest/error-bridgedomain1.yaml +++ b/unittest/error-bridgedomain1.yaml @@ -2,7 +2,7 @@ test: description: "Interfaces put into the bridge, must exist as phy or sub-interface" errors: expected: - - "bridgedomain .* member .* doesn't exist" + - "bridgedomain .* member .* does not exist" count: 2 --- interfaces: diff --git a/validator/bondethernet.py b/validator/bondethernet.py index 1c5d521..7588a3a 100644 --- a/validator/bondethernet.py +++ b/validator/bondethernet.py @@ -42,7 +42,7 @@ def validate_bondethernets(yaml): logger.debug("bondethernet %s: %s" % (ifname, iface)) for member in iface['interfaces']: 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 if interface.has_sub(yaml, member): diff --git a/validator/bridgedomain.py b/validator/bridgedomain.py index ac606b6..4436836 100644 --- a/validator/bridgedomain.py +++ b/validator/bridgedomain.py @@ -62,7 +62,7 @@ def validate_bridgedomains(yaml): for member in iface['interfaces']: member_iface = interface.get_by_name(yaml, member) 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 continue diff --git a/validator/interface.py b/validator/interface.py index eaacbc2..976fe2b 100644 --- a/validator/interface.py +++ b/validator/interface.py @@ -418,7 +418,7 @@ def validate_interfaces(yaml): sub_lcp = get_lcp(yaml, sub_ifname) 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 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)) @@ -444,7 +444,7 @@ def validate_interfaces(yaml): msgs.append("sub-interface %s has invalid encapsulation" % (sub_ifname)) result = False 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 if 'l2xc' in sub_iface: if has_lcp(yaml, sub_ifname):