tsarevvv/nmstate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

validator: Rename func/s prefix from verify to validate

Browse Source 
Signed-off-by: Edward Haas <edwardh@redhat.com>
This commit is contained in:
Edward Haas 2019-05-14 11:02:41 +03:00
parent 75ecc575ed
commit 0870d6ffbb
5 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libnmstate/netapplier.py
View File

@ -50,9 +50,9 @@ def apply(desired_state, verify_change=True, commit=True, rollback_timeout=60):
:rtype: str
"""
desired_state = copy.deepcopy(desired_state)
validator.verify(desired_state)
validator.verify_capabilities(desired_state, netinfo.capabilities())
validator.verify_dhcp(desired_state)
validator.validate(desired_state)
validator.validate_capabilities(desired_state, netinfo.capabilities())
validator.validate_dhcp(desired_state)
checkpoint = _apply_ifaces_state(
state.State(desired_state), verify_change, commit, rollback_timeout)
@ -112,7 +112,7 @@ def _apply_ifaces_state(desired_state, verify_change, commit,
desired_state.sanitize_dynamic_ip()
metadata.generate_ifaces_metadata(desired_state, current_state)
validator.verify_interfaces_state(desired_state, current_state)
validator.validate_interfaces_state(desired_state, current_state)
new_interfaces = _list_new_interfaces(desired_state, current_state)

2
libnmstate/netinfo.py
View File

@ -52,7 +52,7 @@ def show(include_status_data=False):
DNS.CONFIG: nm_dns.get_config(),
}
validator.verify(report)
validator.validate(report)
return report

22
libnmstate/validator.py
View File

@ -1,5 +1,5 @@
#
# Copyright 2018 Red Hat, Inc.
# Copyright 2018-2019 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -14,12 +14,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
from __future__ import absolute_import
import jsonschema as js
import logging
import six
import jsonschema as js
from . import nm
from . import schema
from .schema import Constants
@ -27,15 +27,15 @@ from libnmstate.error import NmstateDependencyError
from libnmstate.error import NmstateValueError
def verify(data, validation_schema=schema.ifaces_schema):
def validate(data, validation_schema=schema.ifaces_schema):
js.validate(data, validation_schema)
def verify_capabilities(state, capabilities):
verify_interface_capabilities(state[Constants.INTERFACES], capabilities)
def validate_capabilities(state, capabilities):
validate_interface_capabilities(state[Constants.INTERFACES], capabilities)
def verify_interface_capabilities(ifaces_state, capabilities):
def validate_interface_capabilities(ifaces_state, capabilities):
ifaces_types = [iface_state['type'] for iface_state in ifaces_state]
has_ovs_capability = nm.ovs.CAPABILITY in capabilities
for iface_type in ifaces_types:
@ -50,11 +50,11 @@ def verify_interface_capabilities(ifaces_state, capabilities):
"and started")
def verify_interfaces_state(desired_state, current_state):
verify_link_aggregation_state(desired_state, current_state)
def validate_interfaces_state(desired_state, current_state):
validate_link_aggregation_state(desired_state, current_state)
def verify_link_aggregation_state(desired_state, current_state):
def validate_link_aggregation_state(desired_state, current_state):
available_ifaces = {
ifname for ifname, ifstate in six.viewitems(desired_state.interfaces)
if ifstate.get('state') != 'absent'
@ -78,7 +78,7 @@ def verify_link_aggregation_state(desired_state, current_state):
specified_slaves |= slaves
def verify_dhcp(state):
def validate_dhcp(state):
for iface_state in state[Constants.INTERFACES]:
for family in ('ipv4', 'ipv6'):
ip = iface_state.get(family, {})

16
tests/lib/schema_validation_test.py
View File

@ -118,20 +118,20 @@ def default_data():
class TestIfaceCommon(object):
def test_valid_instance(self, default_data):
libnmstate.validator.verify(default_data)
libnmstate.validator.validate(default_data)
def test_invalid_instance(self, default_data):
default_data[INTERFACES][0]['state'] = 'bad-state'
with pytest.raises(js.ValidationError) as err:
libnmstate.validator.verify(default_data)
libnmstate.validator.validate(default_data)
assert 'bad-state' in err.value.args[0]
def test_invalid_type(self, default_data):
default_data[INTERFACES][0]['type'] = 'bad-type'
with pytest.raises(js.ValidationError) as err:
libnmstate.validator.verify(default_data)
libnmstate.validator.validate(default_data)
assert 'bad-type' in err.value.args[0]
@ -142,7 +142,7 @@ class TestIfaceTypeEthernet(object):
'type': 'ethernet',
'auto-negotiation': True,
})
libnmstate.validator.verify(default_data)
libnmstate.validator.validate(default_data)
def test_valid_ethernet_without_auto_neg(self, default_data):
default_data[INTERFACES][0].update({
@ -150,7 +150,7 @@ class TestIfaceTypeEthernet(object):
'link-speed': 1000,
'duplex': 'full',
})
libnmstate.validator.verify(default_data)
libnmstate.validator.validate(default_data)
def test_valid_without_auto_neg_and_missing_speed(self, default_data):
"""
@ -164,17 +164,17 @@ class TestIfaceTypeEthernet(object):
})
del default_data[INTERFACES][0]['link-speed']
libnmstate.validator.verify(default_data)
libnmstate.validator.validate(default_data)
class TestRoutes(object):
def test_valid_state_absent(self, default_data):
default_data[ROUTES]['config'][0]['state'] = 'absent'
libnmstate.validator.verify(default_data)
libnmstate.validator.validate(default_data)
def test_invalid_state(self, default_data):
default_data[ROUTES]['config'][0]['state'] = 'bad-state'
with pytest.raises(js.ValidationError) as err:
libnmstate.validator.verify(default_data)
libnmstate.validator.validate(default_data)
assert 'bad-state' in err.value.args[0]

24
tests/lib/validator_test.py
View File

@ -42,8 +42,8 @@ class TestLinkAggregationState(object):
]
})
libnmstate.validator.verify_link_aggregation_state(desired_state,
state.State({}))
libnmstate.validator.validate_link_aggregation_state(desired_state,
empty_state())
def test_bonds_with_single_slave(self):
desired_state = state.State({
@ -64,8 +64,8 @@ class TestLinkAggregationState(object):
}
]
})
libnmstate.validator.verify_link_aggregation_state(desired_state,
state.State({}))
libnmstate.validator.validate_link_aggregation_state(desired_state,
empty_state())
def test_bonds_with_multiple_slaves(self):
desired_state = state.State({
@ -88,8 +88,8 @@ class TestLinkAggregationState(object):
}
]
})
libnmstate.validator.verify_link_aggregation_state(desired_state,
state.State({}))
libnmstate.validator.validate_link_aggregation_state(desired_state,
empty_state())
def test_bonds_with_multiple_slaves_reused(self):
desired_state = state.State({
@ -112,8 +112,8 @@ class TestLinkAggregationState(object):
]
})
with pytest.raises(NmstateValueError):
libnmstate.validator.verify_link_aggregation_state(desired_state,
state.State({}))
libnmstate.validator.validate_link_aggregation_state(desired_state,
empty_state())
def test_bonds_with_missing_slaves(self):
desired_state = state.State({
@ -135,5 +135,9 @@ class TestLinkAggregationState(object):
]
})
with pytest.raises(NmstateValueError):
libnmstate.validator.verify_link_aggregation_state(desired_state,
state.State({}))
libnmstate.validator.validate_link_aggregation_state(desired_state,
empty_state())
def empty_state():
return state.State({})