openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Fix group parameter for cfg.RequiredOptError in default drivers"

Browse Source
This commit is contained in:
Jenkins 2017-01-02 10:36:31 +00:00 committed by Gerrit Code Review
commit d830929329
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kuryr_kubernetes/controller/drivers/default_project.py
View File

@ -30,6 +30,7 @@ class DefaultPodProjectDriver(base.PodProjectDriver):
# DefaultPodProjectDriver and its subclasses, but it may be
# optional for other drivers (e.g. when each namespace has own
# project)
raise cfg.RequiredOptError('project', 'neutron_defaults')
raise cfg.RequiredOptError('project',
cfg.OptGroup('neutron_defaults'))
return project_id

2
kuryr_kubernetes/controller/drivers/default_security_groups.py
View File

@ -31,6 +31,6 @@ class DefaultPodSecurityGroupsDriver(base.PodSecurityGroupsDriver):
# optional for other drivers (e.g. when each namespace has own
# set of security groups)
raise cfg.RequiredOptError('pod_security_groups',
'neutron_defaults')
cfg.OptGroup('neutron_defaults'))
return sg_list[:]

3
kuryr_kubernetes/controller/drivers/default_subnet.py
View File

@ -47,6 +47,7 @@ class DefaultPodSubnetDriver(base.PodSubnetsDriver):
# DefaultPodSubnetDriver and its subclasses, but it may be
# optional for other drivers (e.g. when each namespace has own
# subnet)
raise cfg.RequiredOptError('pod_subnet', 'neutron_defaults')
raise cfg.RequiredOptError('pod_subnet',
cfg.OptGroup('neutron_defaults'))
return {subnet_id: _get_subnet(subnet_id)}

5
kuryr_kubernetes/tests/unit/controller/drivers/test_default_project.py
View File

@ -35,5 +35,6 @@ class TestDefaultPodProjectDriver(test_base.TestCase):
def test_get_project_not_set(self):
pod = mock.sentinel.pod
driver = default_project.DefaultPodProjectDriver()
self.assertRaises(cfg.RequiredOptError, driver.get_project, pod)
msg = "value required for option project in group \[neutron_defaults\]"
self.assertRaisesRegex(cfg.RequiredOptError, msg,
driver.get_project, pod)

6
kuryr_kubernetes/tests/unit/controller/drivers/test_default_security_groups.py
View File

@ -40,6 +40,8 @@ class TestDefaultPodSecurityGroupsDriver(test_base.TestCase):
project_id = mock.sentinel.project_id
pod = mock.sentinel.pod
driver = default_security_groups.DefaultPodSecurityGroupsDriver()
msg = ("value required for option pod_security_groups in group" +
" \[neutron_defaults\]")
self.assertRaises(cfg.RequiredOptError, driver.get_security_groups,
pod, project_id)
self.assertRaisesRegex(cfg.RequiredOptError, msg,
driver.get_security_groups, pod, project_id)

6
kuryr_kubernetes/tests/unit/controller/drivers/test_default_subnet.py
View File

@ -47,9 +47,11 @@ class TestDefaultPodSubnetDriver(test_base.TestCase):
pod = mock.sentinel.pod
project_id = mock.sentinel.project_id
driver = default_subnet.DefaultPodSubnetDriver()
msg = ("value required for option pod_subnet in group" +
" \[neutron_defaults\]")
self.assertRaises(cfg.RequiredOptError, driver.get_subnets, pod,
project_id)
self.assertRaisesRegex(cfg.RequiredOptError, msg, driver.get_subnets,
pod, project_id)
m_get_subnet.assert_not_called()