diff --git a/hooks/neutron_utils.py b/hooks/neutron_utils.py index fea45e39..009f8c9a 100644 --- a/hooks/neutron_utils.py +++ b/hooks/neutron_utils.py @@ -804,7 +804,7 @@ def restart_map(release=None): elif cmp_release >= 'newton' and 'neutron-lbaasv2-agent' in svcs: svcs.remove('neutron-lbaasv2-agent') if svcs: - _map[f] = list(svcs) + _map[f] = sorted(list(svcs)) return _map diff --git a/osci.yaml b/osci.yaml index 7429cadb..76da4721 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: neutron-gateway build_type: charmcraft - charmcraft_channel: 2.0/stable + charmcraft_channel: 2.1/stable diff --git a/pip.sh b/pip.sh deleted file mode 100755 index 9a7e6b09..00000000 --- a/pip.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -# -# This file is managed centrally by release-tools and should not be modified -# within individual charm repos. See the 'global' dir contents for available -# choices of tox.ini for OpenStack Charms: -# https://github.com/openstack-charmers/release-tools -# -# setuptools 58.0 dropped the support for use_2to3=true which is needed to -# install blessings (an indirect dependency of charm-tools). -# -# More details on the beahvior of tox and virtualenv creation can be found at -# https://github.com/tox-dev/tox/issues/448 -# -# This script is wrapper to force the use of the pinned versions early in the -# process when the virtualenv was created and upgraded before installing the -# depedencies declared in the target. -pip install 'pip<20.3' 'setuptools<50.0.0' -pip "$@" diff --git a/test-requirements.txt b/test-requirements.txt index 4ef87dc5..40d87f30 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,7 +8,6 @@ # all of its own requirements and if it doesn't, fix it there. # pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. -setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 requests>=2.18.4 diff --git a/tox.ini b/tox.ini index bddbd1f2..ae4d124c 100644 --- a/tox.ini +++ b/tox.ini @@ -9,47 +9,43 @@ # all of its own requirements and if it doesn't, fix it there. [tox] envlist = pep8,py3 -skipsdist = True # NOTE: Avoid build/test env pollution by not enabling sitepackages. sitepackages = False # NOTE: Avoid false positives by not skipping missing interpreters. skip_missing_interpreters = False -# NOTES: -# * We avoid the new dependency resolver by pinning pip < 20.3, see -# https://github.com/pypa/pip/issues/9187 -# * Pinning dependencies requires tox >= 3.2.0, see -# https://tox.readthedocs.io/en/latest/config.html#conf-requires -# * It is also necessary to pin virtualenv as a newer virtualenv would still -# lead to fetching the latest pip in the func* tox targets, see -# https://stackoverflow.com/a/38133283 -requires = - pip < 20.3 - virtualenv < 20.0 - setuptools < 50.0.0 - -# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci -minversion = 3.18.0 [testenv] +# We use tox mainly for virtual environment management for test requirements +# and do not install the charm code as a Python package into that environment. +# Ref: https://tox.wiki/en/latest/config.html#skip_install +skip_install = True setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 CHARM_DIR={envdir} -install_command = - {toxinidir}/pip.sh install {opts} {packages} commands = stestr run --slowest {posargs} allowlist_externals = charmcraft rename.sh -passenv = HOME TERM CS_* OS_* TEST_* +passenv = + HOME + TERM + CS_* + OS_* + TEST_* deps = -r{toxinidir}/test-requirements.txt [testenv:build] basepython = python3 deps = -r{toxinidir}/build-requirements.txt +# charmcraft clean is done to ensure that +# `tox -e build` always performs a clean, repeatable build. +# For faster rebuilds during development, +# directly run `charmcraft -v pack && ./rename.sh`. commands = charmcraft clean charmcraft -v pack {toxinidir}/rename.sh + charmcraft clean [testenv:py310] basepython = python3.10 diff --git a/unit_tests/test_neutron_utils.py b/unit_tests/test_neutron_utils.py index 2d7b948f..bf78a127 100644 --- a/unit_tests/test_neutron_utils.py +++ b/unit_tests/test_neutron_utils.py @@ -582,12 +582,13 @@ class TestNeutronUtils(CharmTestCase): mock_get_packages.return_value = ['neutron-vpn-agent'] self.os_release.return_value = 'icehouse' ex_map = { - neutron_utils.NEUTRON_CONF: ['neutron-lbaas-agent', - 'neutron-plugin-openvswitch-agent', - 'neutron-vpn-agent', - 'neutron-dhcp-agent', - 'neutron-metering-agent', - 'neutron-metadata-agent'], + neutron_utils.NEUTRON_CONF: sorted([ + 'neutron-lbaas-agent', + 'neutron-plugin-openvswitch-agent', + 'neutron-dhcp-agent', + 'neutron-vpn-agent', + 'neutron-metering-agent', + 'neutron-metadata-agent']), neutron_utils.NEUTRON_DNSMASQ_CONF: ['neutron-dhcp-agent'], neutron_utils.NEUTRON_LBAAS_AGENT_CONF: ['neutron-lbaas-agent'], @@ -620,179 +621,6 @@ class TestNeutronUtils(CharmTestCase): } self.assertEqual(neutron_utils.restart_map(), ex_map) - @patch.object(neutron_utils, 'get_packages') - def test_restart_map_ovs_mitaka(self, mock_get_packages): - self.patch_object(neutron_utils, 'disable_nova_metadata', - return_value=False) - self.config.return_value = 'ovs' - self.disable_neutron_lbaas.return_value = False - mock_get_packages.return_value = ['neutron-vpn-agent'] - self.os_release.return_value = 'mitaka' - ex_map = { - neutron_utils.NEUTRON_CONF: ['neutron-lbaas-agent', - 'neutron-vpn-agent', - 'neutron-dhcp-agent', - 'neutron-metering-agent', - 'neutron-metadata-agent', - 'neutron-openvswitch-agent'], - neutron_utils.NEUTRON_DNSMASQ_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_LBAAS_AGENT_CONF: - ['neutron-lbaas-agent'], - neutron_utils.NEUTRON_OVS_AGENT_CONF: - ['neutron-openvswitch-agent'], - neutron_utils.NEUTRON_METADATA_AGENT_CONF: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_VPNAAS_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_L3_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_DHCP_AGENT_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_FWAAS_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_METERING_AGENT_CONF: - ['neutron-metering-agent'], - neutron_utils.NOVA_CONF: ['nova-api-metadata'], - neutron_utils.EXT_PORT_CONF: ['ext-port'], - neutron_utils.PHY_NIC_MTU_CONF: ['os-charm-phy-nic-mtu'], - neutron_utils.NEUTRON_DHCP_AA_PROFILE_PATH: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_OVS_AA_PROFILE_PATH: - ['neutron-openvswitch-agent'], - neutron_utils.NEUTRON_L3_AA_PROFILE_PATH: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_LBAAS_AA_PROFILE_PATH: - ['neutron-lbaas-agent'], - neutron_utils.NEUTRON_METADATA_AA_PROFILE_PATH: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_METERING_AA_PROFILE_PATH: - ['neutron-metering-agent'], - neutron_utils.NOVA_API_METADATA_AA_PROFILE_PATH: - ['nova-api-metadata'], - } - self.assertEqual(neutron_utils.restart_map(), ex_map) - - @patch.object(neutron_utils, 'get_packages') - def test_restart_map_ovs_newton(self, mock_get_packages): - self.patch_object(neutron_utils, 'disable_nova_metadata', - return_value=False) - self.config.return_value = 'ovs' - self.disable_neutron_lbaas.return_value = False - mock_get_packages.return_value = ['neutron-vpn-agent'] - self.os_release.return_value = 'newton' - ex_map = { - neutron_utils.NEUTRON_CONF: ['neutron-vpn-agent', - 'neutron-lbaasv2-agent', - 'neutron-dhcp-agent', - 'neutron-metering-agent', - 'neutron-metadata-agent', - 'neutron-openvswitch-agent'], - neutron_utils.NEUTRON_DNSMASQ_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_LBAAS_AGENT_CONF: - ['neutron-lbaasv2-agent'], - neutron_utils.NEUTRON_OVS_AGENT_CONF: - ['neutron-openvswitch-agent'], - neutron_utils.NEUTRON_METADATA_AGENT_CONF: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_VPNAAS_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_L3_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_DHCP_AGENT_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_FWAAS_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_METERING_AGENT_CONF: - ['neutron-metering-agent'], - neutron_utils.NOVA_CONF: ['nova-api-metadata'], - neutron_utils.EXT_PORT_CONF: ['ext-port'], - neutron_utils.PHY_NIC_MTU_CONF: ['os-charm-phy-nic-mtu'], - neutron_utils.NEUTRON_DHCP_AA_PROFILE_PATH: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_OVS_AA_PROFILE_PATH: - ['neutron-openvswitch-agent'], - neutron_utils.NEUTRON_L3_AA_PROFILE_PATH: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_LBAASV2_AA_PROFILE_PATH: - ['neutron-lbaasv2-agent'], - neutron_utils.NEUTRON_METADATA_AA_PROFILE_PATH: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_METERING_AA_PROFILE_PATH: - ['neutron-metering-agent'], - neutron_utils.NOVA_API_METADATA_AA_PROFILE_PATH: - ['nova-api-metadata'], - } - self.assertEqual(neutron_utils.restart_map(), ex_map) - - @patch.object(neutron_utils, 'get_packages') - def test_restart_map_ovs_stein_disable_lbaas(self, mock_get_packages): - self.patch_object(neutron_utils, 'disable_nova_metadata', - return_value=False) - self.config.return_value = 'ovs' - self.disable_neutron_lbaas.return_value = True - mock_get_packages.return_value = ['neutron-vpn-agent'] - self.os_release.return_value = 'stein' - ex_map = { - neutron_utils.NEUTRON_CONF: ['neutron-vpn-agent', - 'neutron-dhcp-agent', - 'neutron-metering-agent', - 'neutron-metadata-agent', - 'neutron-openvswitch-agent'], - neutron_utils.NEUTRON_DNSMASQ_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_OVS_AGENT_CONF: - ['neutron-openvswitch-agent'], - neutron_utils.NEUTRON_METADATA_AGENT_CONF: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_VPNAAS_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_L3_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_DHCP_AGENT_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_FWAAS_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_METERING_AGENT_CONF: - ['neutron-metering-agent'], - neutron_utils.NOVA_CONF: ['nova-api-metadata'], - neutron_utils.EXT_PORT_CONF: ['ext-port'], - neutron_utils.PHY_NIC_MTU_CONF: ['os-charm-phy-nic-mtu'], - neutron_utils.NEUTRON_DHCP_AA_PROFILE_PATH: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_OVS_AA_PROFILE_PATH: - ['neutron-openvswitch-agent'], - neutron_utils.NEUTRON_L3_AA_PROFILE_PATH: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_METADATA_AA_PROFILE_PATH: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_METERING_AA_PROFILE_PATH: - ['neutron-metering-agent'], - neutron_utils.NOVA_API_METADATA_AA_PROFILE_PATH: - ['nova-api-metadata'], - } - self.assertEqual(neutron_utils.restart_map(), ex_map) - - @patch.object(neutron_utils, 'get_packages') - def test_restart_map_ovs_train(self, mock_get_packages): - self.patch_object(neutron_utils, 'disable_nova_metadata', - return_value=False) - self.config.return_value = 'ovs' - mock_get_packages.return_value = ['neutron-vpn-agent'] - self.os_release.return_value = 'train' - ex_map = { - neutron_utils.NEUTRON_CONF: ['neutron-vpn-agent', - 'neutron-dhcp-agent', - 'neutron-metering-agent', - 'neutron-metadata-agent', - 'neutron-openvswitch-agent'], - neutron_utils.NEUTRON_DNSMASQ_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_OVS_AGENT_CONF: - ['neutron-openvswitch-agent'], - neutron_utils.NEUTRON_METADATA_AGENT_CONF: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_VPNAAS_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_L3_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_DHCP_AGENT_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_FWAAS_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_METERING_AGENT_CONF: - ['neutron-metering-agent'], - neutron_utils.NOVA_CONF: ['nova-api-metadata'], - neutron_utils.EXT_PORT_CONF: ['ext-port'], - neutron_utils.PHY_NIC_MTU_CONF: ['os-charm-phy-nic-mtu'], - neutron_utils.NEUTRON_DHCP_AA_PROFILE_PATH: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_OVS_AA_PROFILE_PATH: - ['neutron-openvswitch-agent'], - neutron_utils.NEUTRON_L3_AA_PROFILE_PATH: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_METADATA_AA_PROFILE_PATH: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_METERING_AA_PROFILE_PATH: - ['neutron-metering-agent'], - neutron_utils.NOVA_API_METADATA_AA_PROFILE_PATH: - ['nova-api-metadata'], - } - self.assertEqual(neutron_utils.restart_map(), ex_map) - @patch.object(neutron_utils, 'get_packages') def test_restart_map_ovs_post_trusty(self, mock_get_packages): self.patch_object(neutron_utils, 'disable_nova_metadata', @@ -814,11 +642,12 @@ class TestNeutronUtils(CharmTestCase): mock_get_packages.return_value = ['neutron-vpn-agent'] self.os_release.return_value = 'icehouse' ex_map = { - neutron_utils.NEUTRON_CONF: ['neutron-lbaas-agent', - 'neutron-vpn-agent', - 'neutron-dhcp-agent', - 'neutron-metering-agent', - 'neutron-metadata-agent'], + neutron_utils.NEUTRON_CONF: sorted([ + 'neutron-lbaas-agent', + 'neutron-vpn-agent', + 'neutron-dhcp-agent', + 'neutron-metering-agent', + 'neutron-metadata-agent']), neutron_utils.NEUTRON_DNSMASQ_CONF: ['neutron-dhcp-agent'], neutron_utils.NEUTRON_LBAAS_AGENT_CONF: ['neutron-lbaas-agent'], @@ -846,47 +675,6 @@ class TestNeutronUtils(CharmTestCase): self.assertEqual(neutron_utils.restart_map(), ex_map) - @patch.object(neutron_utils, 'get_packages') - def test_restart_map_ovs_odl_newton(self, mock_get_packages): - self.patch_object(neutron_utils, 'disable_nova_metadata', - return_value=False) - self.disable_neutron_lbaas.return_value = False - self.config.return_value = 'ovs-odl' - mock_get_packages.return_value = ['neutron-vpn-agent'] - self.os_release.return_value = 'newton' - ex_map = { - neutron_utils.NEUTRON_CONF: ['neutron-vpn-agent', - 'neutron-lbaasv2-agent', - 'neutron-dhcp-agent', - 'neutron-metering-agent', - 'neutron-metadata-agent'], - neutron_utils.NEUTRON_DNSMASQ_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_LBAAS_AGENT_CONF: - ['neutron-lbaasv2-agent'], - neutron_utils.NEUTRON_METADATA_AGENT_CONF: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_VPNAAS_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_L3_AGENT_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_DHCP_AGENT_CONF: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_FWAAS_CONF: ['neutron-vpn-agent'], - neutron_utils.NEUTRON_METERING_AGENT_CONF: - ['neutron-metering-agent'], - neutron_utils.NOVA_CONF: ['nova-api-metadata'], - neutron_utils.EXT_PORT_CONF: ['ext-port'], - neutron_utils.PHY_NIC_MTU_CONF: ['os-charm-phy-nic-mtu'], - neutron_utils.NEUTRON_DHCP_AA_PROFILE_PATH: ['neutron-dhcp-agent'], - neutron_utils.NEUTRON_LBAASV2_AA_PROFILE_PATH: - ['neutron-lbaasv2-agent'], - neutron_utils.NEUTRON_METADATA_AA_PROFILE_PATH: - ['neutron-metadata-agent'], - neutron_utils.NEUTRON_METERING_AA_PROFILE_PATH: - ['neutron-metering-agent'], - neutron_utils.NOVA_API_METADATA_AA_PROFILE_PATH: - ['nova-api-metadata'], - } - - self.assertEqual(neutron_utils.restart_map(), ex_map) - @patch('charmhelpers.contrib.openstack.templating.OSConfigRenderer') def test_register_configs_nsx(self, mock_renderer): self.patch_object(neutron_utils, 'disable_nova_metadata',