Add unit tests for new utils and add missing relation hook links
This commit is contained in:
parent
36fc3a0fcb
commit
a6c3663eb8
|
@ -0,0 +1 @@
|
||||||
|
neutron_api_hooks.py
|
|
@ -0,0 +1 @@
|
||||||
|
neutron_api_hooks.py
|
|
@ -0,0 +1 @@
|
||||||
|
neutron_api_hooks.py
|
|
@ -234,12 +234,11 @@ def resource_map():
|
||||||
context.PostgresqlDBContext(database=config('database')))
|
context.PostgresqlDBContext(database=config('database')))
|
||||||
|
|
||||||
else:
|
else:
|
||||||
print "Adding NeutronApiSDNContext"
|
|
||||||
resource_map[NEUTRON_CONF]['contexts'].append(
|
resource_map[NEUTRON_CONF]['contexts'].append(
|
||||||
neutron_api_context.NeutronApiSDNContext()
|
neutron_api_context.NeutronApiSDNContext()
|
||||||
)
|
)
|
||||||
resource_map[NEUTRON_DEFAULT]['contexts'] = \
|
resource_map[NEUTRON_DEFAULT]['contexts'] = \
|
||||||
neutron_api_context.NeutronApiSDNConfigFileContext()
|
[neutron_api_context.NeutronApiSDNConfigFileContext()]
|
||||||
return resource_map
|
return resource_map
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -103,28 +103,57 @@ class TestNeutronAPIUtils(CharmTestCase):
|
||||||
expect.extend(nutils.KILO_PACKAGES)
|
expect.extend(nutils.KILO_PACKAGES)
|
||||||
self.assertItemsEqual(pkg_list, expect)
|
self.assertItemsEqual(pkg_list, expect)
|
||||||
|
|
||||||
|
@patch.object(nutils, 'git_install_requested')
|
||||||
|
def test_determine_packages_noplugin(self, git_requested):
|
||||||
|
git_requested.return_value = False
|
||||||
|
self.test_config.set('manage-neutron-plugin-legacy-mode', False)
|
||||||
|
pkg_list = nutils.determine_packages()
|
||||||
|
expect = deepcopy(nutils.BASE_PACKAGES)
|
||||||
|
expect.extend(['neutron-server'])
|
||||||
|
self.assertItemsEqual(pkg_list, expect)
|
||||||
|
|
||||||
def test_determine_ports(self):
|
def test_determine_ports(self):
|
||||||
port_list = nutils.determine_ports()
|
port_list = nutils.determine_ports()
|
||||||
self.assertItemsEqual(port_list, [9696])
|
self.assertItemsEqual(port_list, [9696])
|
||||||
|
|
||||||
|
@patch.object(nutils, 'manage_plugin')
|
||||||
@patch('os.path.exists')
|
@patch('os.path.exists')
|
||||||
def test_resource_map(self, _path_exists):
|
def test_resource_map(self, _path_exists, _manage_plugin):
|
||||||
_path_exists.return_value = False
|
_path_exists.return_value = False
|
||||||
|
_manage_plugin.return_value = True
|
||||||
_map = nutils.resource_map()
|
_map = nutils.resource_map()
|
||||||
confs = [nutils.NEUTRON_CONF, nutils.NEUTRON_DEFAULT,
|
confs = [nutils.NEUTRON_CONF, nutils.NEUTRON_DEFAULT,
|
||||||
nutils.APACHE_CONF]
|
nutils.APACHE_CONF]
|
||||||
[self.assertIn(q_conf, _map.keys()) for q_conf in confs]
|
[self.assertIn(q_conf, _map.keys()) for q_conf in confs]
|
||||||
self.assertTrue(nutils.APACHE_24_CONF not in _map.keys())
|
self.assertTrue(nutils.APACHE_24_CONF not in _map.keys())
|
||||||
|
|
||||||
|
@patch.object(nutils, 'manage_plugin')
|
||||||
@patch('os.path.exists')
|
@patch('os.path.exists')
|
||||||
def test_resource_map_apache24(self, _path_exists):
|
def test_resource_map_apache24(self, _path_exists, _manage_plugin):
|
||||||
_path_exists.return_value = True
|
_path_exists.return_value = True
|
||||||
|
_manage_plugin.return_value = True
|
||||||
_map = nutils.resource_map()
|
_map = nutils.resource_map()
|
||||||
confs = [nutils.NEUTRON_CONF, nutils.NEUTRON_DEFAULT,
|
confs = [nutils.NEUTRON_CONF, nutils.NEUTRON_DEFAULT,
|
||||||
nutils.APACHE_24_CONF]
|
nutils.APACHE_24_CONF]
|
||||||
[self.assertIn(q_conf, _map.keys()) for q_conf in confs]
|
[self.assertIn(q_conf, _map.keys()) for q_conf in confs]
|
||||||
self.assertTrue(nutils.APACHE_CONF not in _map.keys())
|
self.assertTrue(nutils.APACHE_CONF not in _map.keys())
|
||||||
|
|
||||||
|
@patch.object(nutils, 'manage_plugin')
|
||||||
|
@patch('os.path.exists')
|
||||||
|
def test_resource_map_noplugin(self, _path_exists, _manage_plugin):
|
||||||
|
_path_exists.return_value = True
|
||||||
|
_manage_plugin.return_value = False
|
||||||
|
_map = nutils.resource_map()
|
||||||
|
found_sdn_ctxt = False
|
||||||
|
found_sdnconfig_ctxt = False
|
||||||
|
for ctxt in _map[nutils.NEUTRON_CONF]['contexts']:
|
||||||
|
if isinstance(ctxt, ncontext.NeutronApiSDNContext):
|
||||||
|
found_sdn_ctxt = True
|
||||||
|
for ctxt in _map[nutils.NEUTRON_DEFAULT]['contexts']:
|
||||||
|
if isinstance(ctxt, ncontext.NeutronApiSDNConfigFileContext):
|
||||||
|
found_sdnconfig_ctxt = True
|
||||||
|
self.assertTrue(found_sdn_ctxt and found_sdnconfig_ctxt)
|
||||||
|
|
||||||
@patch('os.path.exists')
|
@patch('os.path.exists')
|
||||||
def test_restart_map(self, mock_path_exists):
|
def test_restart_map(self, mock_path_exists):
|
||||||
mock_path_exists.return_value = False
|
mock_path_exists.return_value = False
|
||||||
|
@ -477,3 +506,13 @@ class TestNeutronAPIUtils(CharmTestCase):
|
||||||
'upgrade',
|
'upgrade',
|
||||||
'head']
|
'head']
|
||||||
self.subprocess.check_output.assert_called_with(cmd)
|
self.subprocess.check_output.assert_called_with(cmd)
|
||||||
|
|
||||||
|
def test_manage_plugin_true(self):
|
||||||
|
self.test_config.set('manage-neutron-plugin-legacy-mode', True)
|
||||||
|
manage = nutils.manage_plugin()
|
||||||
|
self.assertTrue(manage)
|
||||||
|
|
||||||
|
def test_manage_plugin_false(self):
|
||||||
|
self.test_config.set('manage-neutron-plugin-legacy-mode', False)
|
||||||
|
manage = nutils.manage_plugin()
|
||||||
|
self.assertFalse(manage)
|
||||||
|
|
Loading…
Reference in New Issue