openstack/charm-neutron-gateway
Code Issues Proposed changes

Fixup package names for >= liberty, add unit tests

Browse Source
This commit is contained in:
James Page 2015-09-10 13:35:59 +01:00
parent 200e6fe388
commit 20ff2ce6e0
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/neutron_utils.py
View File

@ -250,6 +250,13 @@ def get_packages():
packages.append('openswan') packages.append('openswan')
if source >= 'kilo': if source >= 'kilo':
packages.append('python-neutron-fwaas') packages.append('python-neutron-fwaas')
if source >= 'liberty':
# Switch out mysql driver
packages.remove('python-mysqldb')
packages.append('python-pymysql')
# Switch out to actual metering agent package
packages.remove('neutron-plugin-metering-agent')
packages.append('neutron-metering-agent')
packages.extend(determine_l3ha_packages()) packages.extend(determine_l3ha_packages())
if git_install_requested(): if git_install_requested():

4
unit_tests/test_neutron_hooks.py
View File

@ -162,7 +162,7 @@ class TestQuantumHooks(CharmTestCase):
self.assertTrue(_amqp_joined.called) self.assertTrue(_amqp_joined.called)
self.assertTrue(_amqp_nova_joined.called) self.assertTrue(_amqp_nova_joined.called)
self.assertTrue(_zmq_joined.called) self.assertTrue(_zmq_joined.called)
self.create_sysctl.assert_called() self.assertTrue(self.create_sysctl.called)
@patch.object(hooks, 'git_install_requested') @patch.object(hooks, 'git_install_requested')
def test_config_changed_upgrade(self, git_requested): def test_config_changed_upgrade(self, git_requested):
@ -235,7 +235,7 @@ class TestQuantumHooks(CharmTestCase):
self.assertTrue(_amqp_joined.called) self.assertTrue(_amqp_joined.called)
self.assertTrue(_amqp_nova_joined.called) self.assertTrue(_amqp_nova_joined.called)
self.assertTrue(_zmq_joined.called) self.assertTrue(_zmq_joined.called)
self.create_sysctl.assert_called() self.assertTrue(self.create_sysctl.called)
def test_upgrade_charm(self): def test_upgrade_charm(self):
_install = self.patch('install') _install = self.patch('install')

11
unit_tests/test_neutron_utils.py
View File

@ -158,6 +158,17 @@ class TestQuantumUtils(CharmTestCase):
self.get_os_codename_install_source.return_value = 'kilo' self.get_os_codename_install_source.return_value = 'kilo'
self.assertTrue('python-neutron-fwaas' in neutron_utils.get_packages()) self.assertTrue('python-neutron-fwaas' in neutron_utils.get_packages())
@patch.object(neutron_utils, 'git_install_requested')
def test_get_packages_ovs_liberty(self, git_requested):
git_requested.return_value = False
self.config.return_value = 'ovs'
self.get_os_codename_install_source.return_value = 'liberty'
packages = neutron_utils.get_packages()
self.assertTrue('neutron-metering-agent' in packages)
self.assertFalse('neutron-plugin-metering-agent' in packages)
self.assertFalse('python-mysqldb' in packages)
self.assertTrue('python-pymysql' in packages)
@patch.object(neutron_utils, 'git_install_requested') @patch.object(neutron_utils, 'git_install_requested')
def test_get_packages_l3ha(self, git_requested): def test_get_packages_l3ha(self, git_requested):
git_requested.return_value = False git_requested.return_value = False