openstack
/
os-net-config
Code Issues Proposed changes

Merge "Handle bools-as-strings nm_controlled values"

This commit is contained in:
Jenkins 2017-04-07 05:14:42 +00:00 committed by Gerrit Code Review
parent fc4be60106 9033caa332
commit d12f1615cc
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os_net_config/objects.py
View File

@ -247,7 +247,8 @@ class _BaseOpts(object):
mtu = json.get('mtu', None)
dhclient_args = json.get('dhclient_args')
dns_servers = json.get('dns_servers')
nm_controlled = json.get('nm_controlled')
nm_controlled = strutils.bool_from_string(str(json.get('nm_controlled',
False)))
primary = strutils.bool_from_string(str(json.get('primary', False)))
addresses = []
routes = []

40
os_net_config/tests/test_objects.py
View File

@ -144,6 +144,46 @@ class TestInterface(base.TestCase):
interface1 = objects.object_from_json(json.loads(data))
self.assertEqual("--foobar", interface1.dhclient_args)
def test_from_json_nm_controlled_false(self):
data = """{
"type": "interface",
"name": "em1",
"nm_controlled": false
}
"""
interface1 = objects.object_from_json(json.loads(data))
self.assertFalse(interface1.nm_controlled)
def test_from_json_nm_controlled_true(self):
data = """{
"type": "interface",
"name": "em1",
"nm_controlled": true
}
"""
interface1 = objects.object_from_json(json.loads(data))
self.assertTrue(interface1.nm_controlled)
def test_from_json_nm_controlled_false_boolstr(self):
data = """{
"type": "interface",
"name": "em1",
"nm_controlled": "no"
}
"""
interface1 = objects.object_from_json(json.loads(data))
self.assertFalse(interface1.nm_controlled)
def test_from_json_nm_controlled_true_boolstr(self):
data = """{
"type": "interface",
"name": "em1",
"nm_controlled": "yes"
}
"""
interface1 = objects.object_from_json(json.loads(data))
self.assertTrue(interface1.nm_controlled)
def test_from_json_dns_servers(self):
data = """{
"type": "interface",