Mirrors/network
1
0
Fork 0
mirror of https://github.com/linux-system-roles/network.git synced 2026-07-28 13:33:57 +00:00
Code Issues Projects Releases Wiki Activity

module: rename internal ArgValidator._validate()

Browse source 
First a trivial renaming because the next commit will
add a different "_validate" method.
This commit is contained in:
Thomas Haller 2018-09-27 11:12:22 +02:00
parent 8daa14eb36
commit 6856b5407d
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
module_utils/network_lsr/argument_validator.py
View file

@ -91,12 +91,12 @@ class ArgValidator:
except Exception: # pylint: disable=broad-except
return self.default_value
def _validate(self, value, name):
def _validate_impl(self, value, name):
raise NotImplementedError()
def validate(self, value, name=None):
name = name or self.name or ""
validated = self._validate(value, name)
validated = self._validate_impl(value, name)
return self._validate_post(value, name, validated)
# pylint: disable=unused-argument,no-self-use
@ -117,7 +117,7 @@ class ArgValidatorStr(ArgValidator):
self.enum_values = enum_values
self.allow_empty = allow_empty
def _validate(self, value, name):
def _validate_impl(self, value, name):
if not isinstance(value, Util.STRING_TYPE):
raise ValidationError(name, "must be a string but is '%s'" % (value))
value = str(value)
@ -154,7 +154,7 @@ class ArgValidatorNum(ArgValidator):
self.val_max = val_max
self.numeric_type = numeric_type
def _validate(self, value, name):
def _validate_impl(self, value, name):
v = None
try:
if isinstance(value, self.numeric_type):
@ -185,7 +185,7 @@ class ArgValidatorBool(ArgValidator):
def __init__(self, name, required=False, default_value=False):
ArgValidator.__init__(self, name, required, default_value)
def _validate(self, value, name):
def _validate_impl(self, value, name):
try:
if isinstance(value, bool):
return value
@ -212,7 +212,7 @@ class ArgValidatorDict(ArgValidator):
self.nested = {}
self.all_missing_during_validate = all_missing_during_validate
def _validate(self, value, name):
def _validate_impl(self, value, name):
result = {}
seen_keys = set()
try:
@ -247,7 +247,7 @@ class ArgValidatorList(ArgValidator):
ArgValidator.__init__(self, name, required=False, default_value=default_value)
self.nested = nested
def _validate(self, value, name):
def _validate_impl(self, value, name):
if isinstance(value, Util.STRING_TYPE):
# we expect a list. However, for convenience allow to
@ -273,8 +273,8 @@ class ArgValidatorIP(ArgValidatorStr):
self.family = family
self.plain_address = plain_address
def _validate(self, value, name):
v = ArgValidatorStr._validate(self, value, name)
def _validate_impl(self, value, name):
v = ArgValidatorStr._validate_impl(self, value, name)
try:
addr, family = Util.parse_ip(v, self.family)
except Exception:
@ -293,8 +293,8 @@ class ArgValidatorMac(ArgValidatorStr):
ArgValidatorStr.__init__(self, name, required, default_value, None)
self.force_len = force_len
def _validate(self, value, name):
v = ArgValidatorStr._validate(self, value, name)
def _validate_impl(self, value, name):
v = ArgValidatorStr._validate_impl(self, value, name)
try:
addr = Util.mac_aton(v, self.force_len)
except MyError:
@ -323,7 +323,7 @@ class ArgValidatorIPAddr(ArgValidatorDict):
)
self.family = family
def _validate(self, value, name):
def _validate_impl(self, value, name):
if isinstance(value, Util.STRING_TYPE):
v = str(value)
if not v:
@ -336,7 +336,7 @@ class ArgValidatorIPAddr(ArgValidatorDict):
"value '%s' is not a valid IP%s address with prefix length"
% (value, Util.addr_family_to_v(self.family)),
)
v = ArgValidatorDict._validate(self, value, name)
v = ArgValidatorDict._validate_impl(self, value, name)
return {
"address": v["address"]["address"],
"family": v["address"]["family"],