diff -Nru neutron-fwaas-12.0.1/AUTHORS neutron-fwaas-12.0.2/AUTHORS --- neutron-fwaas-12.0.1/AUTHORS 2018-11-06 06:28:18.000000000 +0000 +++ neutron-fwaas-12.0.2/AUTHORS 2019-10-28 14:49:41.000000000 +0000 @@ -84,6 +84,7 @@ Hirofumi Ichihara Hiroyuki Ito Hunt Xu +Ian Wienand Ignacio Scopetta Ihar Hrachyshka Inessa Vasilevskaya @@ -172,6 +173,7 @@ Romil Gupta Rui Zang Russell Bryant +Ryan Tidwell Ryota MIBU Salvatore Orlando Salvatore Orlando @@ -200,6 +202,7 @@ Sumit Naiksatam Sumit Naiksatam Sushil Kumar +Swaminathan Vasudevan Sylvain Afchain Terry Wilson Thierry Carrez diff -Nru neutron-fwaas-12.0.1/ChangeLog neutron-fwaas-12.0.2/ChangeLog --- neutron-fwaas-12.0.1/ChangeLog 2018-11-06 06:28:18.000000000 +0000 +++ neutron-fwaas-12.0.2/ChangeLog 2019-10-28 14:49:40.000000000 +0000 @@ -1,6 +1,14 @@ CHANGES ======= +12.0.2 +------ + +* Fix AttributeError with third-party L3 service plugins +* FWaaS-DVR: FWaaS rules not updated in DVR routers on compute host +* OpenDev Migration Patch +* Replace openstack.org git:// URLs with https:// + 12.0.1 ------ diff -Nru neutron-fwaas-12.0.1/debian/changelog neutron-fwaas-12.0.2/debian/changelog --- neutron-fwaas-12.0.1/debian/changelog 2018-12-11 20:02:08.000000000 +0000 +++ neutron-fwaas-12.0.2/debian/changelog 2020-09-09 04:54:05.000000000 +0000 @@ -1,8 +1,15 @@ -neutron-fwaas (1:12.0.1-0ubuntu1~cloud0) xenial-queens; urgency=medium +neutron-fwaas (1:12.0.2-0ubuntu1~cloud0) xenial-queens; urgency=medium * New upstream release for the Ubuntu Cloud Archive. - -- Openstack Ubuntu Testing Bot Tue, 11 Dec 2018 20:02:08 +0000 + -- Openstack Ubuntu Testing Bot Wed, 09 Sep 2020 04:54:05 +0000 + +neutron-fwaas (1:12.0.2-0ubuntu1) bionic; urgency=medium + + * d/watch: Update to point at OpenDev. + * New stable point release for OpenStack Queens (LP: #1893234). + + -- Chris MacNaughton Fri, 28 Aug 2020 12:11:39 +0000 neutron-fwaas (1:12.0.1-0ubuntu1) bionic; urgency=medium diff -Nru neutron-fwaas-12.0.1/debian/watch neutron-fwaas-12.0.2/debian/watch --- neutron-fwaas-12.0.1/debian/watch 2018-12-03 14:15:45.000000000 +0000 +++ neutron-fwaas-12.0.2/debian/watch 2020-08-28 12:11:39.000000000 +0000 @@ -1,3 +1,3 @@ version=3 opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/\.0b/~b/;s/\.0rc/~rc/" \ - http://tarballs.openstack.org/neutron-fwaas neutron-fwaas-(12\.\d.*)\.tar\.gz + https://tarballs.opendev.org/openstack/neutron-fwaas neutron-fwaas-(12\.\d.*)\.tar\.gz diff -Nru neutron-fwaas-12.0.1/neutron_fwaas/services/firewall/fwaas_plugin.py neutron-fwaas-12.0.2/neutron_fwaas/services/firewall/fwaas_plugin.py --- neutron-fwaas-12.0.1/neutron_fwaas/services/firewall/fwaas_plugin.py 2018-11-06 06:26:26.000000000 +0000 +++ neutron-fwaas-12.0.2/neutron_fwaas/services/firewall/fwaas_plugin.py 2019-10-28 14:48:43.000000000 +0000 @@ -171,6 +171,14 @@ f_const.FIREWALL_PLUGIN, self.endpoints, fanout=False) return self.conn.consume_in_threads() + def _check_dvr_extensions(self, l3plugin): + return ( + n_utils.is_extension_supported( + l3plugin, nl_constants.L3_AGENT_SCHEDULER_EXT_ALIAS) and + n_utils.is_extension_supported( + l3plugin, nl_constants.L3_DISTRIBUTED_EXT_ALIAS) and + getattr(l3plugin, '_get_dvr_hosts_for_router', False)) + def _get_hosts_to_notify(self, context, router_ids): """Returns all hosts to send notification about firewall update""" l3_plugin = directory.get_plugin(plugin_constants.L3) @@ -178,10 +186,24 @@ n_utils.is_extension_supported( l3_plugin, nl_constants.L3_AGENT_SCHEDULER_EXT_ALIAS) and getattr(l3_plugin, 'get_l3_agents_hosting_routers', False)) + scheduled_hosts = set() if no_broadcast: + # This call checks for all scheduled routers to the network node agents = l3_plugin.get_l3_agents_hosting_routers( context, router_ids, admin_state_up=True, active=True) - return [a.host for a in agents] + scheduled_hosts = set([a.host for a in agents]) + + # Now check for unscheduled DVR router on distributed compute hosts + unscheduled_dvr_hosts = set() + dvr_broadcast = self._check_dvr_extensions(l3_plugin) + if (dvr_broadcast): + for router_id in router_ids: + hosts = set(l3_plugin._get_dvr_hosts_for_router( + context, router_id)) + unscheduled_dvr_hosts |= hosts + if no_broadcast or dvr_broadcast: + scheduled_hosts = scheduled_hosts.union(unscheduled_dvr_hosts) + return scheduled_hosts # NOTE(blallau): default: FirewallAgentAPI performs RPC broadcast return [None] diff -Nru neutron-fwaas-12.0.1/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py neutron-fwaas-12.0.2/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py --- neutron-fwaas-12.0.1/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py 2018-11-06 06:26:26.000000000 +0000 +++ neutron-fwaas-12.0.2/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py 2019-10-28 14:48:43.000000000 +0000 @@ -377,6 +377,44 @@ self.assertEqual('other-tenant', fw1['firewall']['tenant_id']) self.assertEqual(self._tenant_id, fw2['firewall']['tenant_id']) + def test_update_firewall_calls_get_dvr_hosts_for_router(self): + ctx = context.get_admin_context() + name = "user_fw" + attrs = self._get_test_firewall_attrs(name) + check_attr1 = getattr(self.l3_plugin, + "get_l3_agents_hosting_routers", False) + check_attr2 = getattr(self.l3_plugin, + "_get_dvr_hosts_for_router", False) + # For third-party L3-service plugins do not run this test + if check_attr1 is False or check_attr2 is False: + return + with self.router(name='router1', admin_state_up=True, + tenant_id=self._tenant_id) as router1: + with self.firewall_policy() as fwp: + fwp_id = fwp['firewall_policy']['id'] + attrs['firewall_policy_id'] = fwp_id + with self.firewall( + firewall_policy_id=fwp_id, + admin_state_up=test_db_firewall.ADMIN_STATE_UP, + router_ids=[router1['router']['id']] + ) as firewall: + fw_id = firewall['firewall']['id'] + self.callbacks.set_firewall_status(ctx, fw_id, + nl_constants.ACTIVE) + with mock.patch.object( + self.l3_plugin, + 'get_l3_agents_hosting_routers') as s_hosts, \ + mock.patch.object( + self.plugin, + '_check_dvr_extensions') as dvr_exts, \ + mock.patch.object( + self.l3_plugin, + '_get_dvr_hosts_for_router') as u_hosts: + self.plugin.update_firewall(ctx, fw_id, firewall) + dvr_exts.return_value = True + self.assertTrue(u_hosts.called) + self.assertTrue(s_hosts.called) + def test_update_firewall(self): ctx = context.get_admin_context() name = "new_firewall1" diff -Nru neutron-fwaas-12.0.1/neutron_fwaas.egg-info/pbr.json neutron-fwaas-12.0.2/neutron_fwaas.egg-info/pbr.json --- neutron-fwaas-12.0.1/neutron_fwaas.egg-info/pbr.json 2018-11-06 06:28:18.000000000 +0000 +++ neutron-fwaas-12.0.2/neutron_fwaas.egg-info/pbr.json 2019-10-28 14:49:41.000000000 +0000 @@ -1 +1 @@ -{"git_version": "a3c335a", "is_release": true} \ No newline at end of file +{"git_version": "4c05f1f66", "is_release": true} \ No newline at end of file diff -Nru neutron-fwaas-12.0.1/neutron_fwaas.egg-info/PKG-INFO neutron-fwaas-12.0.2/neutron_fwaas.egg-info/PKG-INFO --- neutron-fwaas-12.0.1/neutron_fwaas.egg-info/PKG-INFO 2018-11-06 06:28:18.000000000 +0000 +++ neutron-fwaas-12.0.2/neutron_fwaas.egg-info/PKG-INFO 2019-10-28 14:49:41.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: neutron-fwaas -Version: 12.0.1 +Version: 12.0.2 Summary: OpenStack Networking FWaaS Home-page: https://docs.openstack.org/neutron-fwaas/latest/ Author: OpenStack diff -Nru neutron-fwaas-12.0.1/PKG-INFO neutron-fwaas-12.0.2/PKG-INFO --- neutron-fwaas-12.0.1/PKG-INFO 2018-11-06 06:28:18.000000000 +0000 +++ neutron-fwaas-12.0.2/PKG-INFO 2019-10-28 14:49:41.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: neutron-fwaas -Version: 12.0.1 +Version: 12.0.2 Summary: OpenStack Networking FWaaS Home-page: https://docs.openstack.org/neutron-fwaas/latest/ Author: OpenStack diff -Nru neutron-fwaas-12.0.1/tools/tox_install.sh neutron-fwaas-12.0.2/tools/tox_install.sh --- neutron-fwaas-12.0.1/tools/tox_install.sh 2018-11-06 06:26:26.000000000 +0000 +++ neutron-fwaas-12.0.2/tools/tox_install.sh 2019-10-28 14:48:43.000000000 +0000 @@ -53,7 +53,7 @@ $ZUUL_CLONER --cache-dir \ /opt/git \ --branch $BRANCH_NAME \ - git://git.openstack.org \ + https://git.openstack.org \ openstack/neutron cd openstack/neutron $install_cmd -e . diff -Nru neutron-fwaas-12.0.1/.zuul.yaml neutron-fwaas-12.0.2/.zuul.yaml --- neutron-fwaas-12.0.1/.zuul.yaml 2018-11-06 06:26:26.000000000 +0000 +++ neutron-fwaas-12.0.2/.zuul.yaml 2019-10-28 14:48:43.000000000 +0000 @@ -40,7 +40,7 @@ description: | Run Python 35 tests on networking-midonet repository. vars: - zuul_work_dir: src/git.openstack.org/openstack/networking-midonet + zuul_work_dir: src/opendev.org/openstack/networking-midonet required-projects: - openstack/requirements - openstack/networking-midonet @@ -49,4 +49,4 @@ - openstack/neutron-lbaas - openstack/neutron-dynamic-routing - openstack/networking-l2gw - - openstack/tap-as-a-service + - x/tap-as-a-service