openstack
/
charm-neutron-gateway
Code Issues Proposed changes

Misc updates for OpenStack Train 

Drop installation of python3-neutron-lbaas as this package has
been dropped from the Train UCA.

Change-Id: I5dc373608d56f2fbb9f21a51f73a0da13c3b1611
This commit is contained in:
James Page 2019-10-16 09:59:01 +01:00
parent 5ec43f6dbe
commit 75c4fac218
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/neutron_utils.py
View File

@ -283,6 +283,8 @@ def get_packages():
if cmp_os_source >= 'rocky':
packages = [p for p in packages if not p.startswith('python-')]
packages.extend(PY3_PACKAGES)
if cmp_os_source >= 'train':
packages.remove('python3-neutron-lbaas')
return packages

13
unit_tests/test_neutron_utils.py
View File

@ -172,6 +172,19 @@ class TestNeutronUtils(CharmTestCase):
len(packages),
len([p for p in packages if not p.startswith('python-')])
)
self.assertTrue('python3-neutron-lbaas' in packages)
def test_get_packages_ovs_train(self):
self.patch_object(neutron_utils, 'disable_nova_metadata',
return_value=True)
self.config.return_value = 'ovs'
self.os_release.return_value = 'train'
packages = neutron_utils.get_packages()
self.assertEqual(
len(packages),
len([p for p in packages if not p.startswith('python-')])
)
self.assertFalse('python3-neutron-lbaas' in packages)
def test_get_purge_packages_ovs(self):
self.config.return_value = 'ovs'