From de49260304602a621f7daf2b1bc1f8fcd2d6f313 Mon Sep 17 00:00:00 2001 From: Boden R Date: Tue, 21 May 2019 12:06:31 -0600 Subject: [PATCH] fix gate Get the FWaaS gate working again by adding the required constructor arg to L3AgentExtensionAPI. Also bumps up neutron-lib to the latest. Change-Id: I62d70e8d93cae5a27c8722f69407113035d032bc --- doc/requirements.txt | 3 ++- lower-constraints.txt | 5 ++--- .../agents/l3reference/test_firewall_l3_agent_v2.py | 4 ++-- requirements.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index b75bacac1..6d3a8c966 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,7 +1,8 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD sphinxcontrib-apidoc>=0.2.0 # BSD sphinxmark>=0.1.14 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0 diff --git a/lower-constraints.txt b/lower-constraints.txt index 6db076067..ab00cdab8 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -51,7 +51,7 @@ msgpack-python==0.4.0 munch==2.1.0 netaddr==0.7.18 netifaces==0.10.4 -neutron-lib==1.25.0 +neutron-lib==1.26.0 neutron==14.0.0.0b3 openstackdocstheme==1.18.1 openstacksdk==0.11.2 @@ -125,8 +125,7 @@ Routes==2.3.1 simplejson==3.5.1 six==1.10.0 snowballstemmer==1.2.1 -Sphinx==1.6.5 -sphinxcontrib-websupport==1.0.1 +sphinx==1.6.5 sqlalchemy-migrate==0.11.0 SQLAlchemy==1.2.0 sqlparse==0.2.2 diff --git a/neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/l3reference/test_firewall_l3_agent_v2.py b/neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/l3reference/test_firewall_l3_agent_v2.py index c1b7646e1..2b03e114b 100644 --- a/neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/l3reference/test_firewall_l3_agent_v2.py +++ b/neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/l3reference/test_firewall_l3_agent_v2.py @@ -323,7 +323,7 @@ class TestFWaaSL3AgentExtension(base.BaseTestCase): ri = self._prepare_router_data() ri.internal_ports = ports router_info = {ri.router_id: ri} - api_object = l3_agent_api.L3AgentExtensionAPI(router_info) + api_object = l3_agent_api.L3AgentExtensionAPI(router_info, None) self.api.consume_api(api_object) fw_port_ids = port_ids @@ -342,7 +342,7 @@ class TestFWaaSL3AgentExtension(base.BaseTestCase): ri.internal_ports = ports router_info = {} router_info[ri.router_id] = ri - api_object = l3_agent_api.L3AgentExtensionAPI(router_info) + api_object = l3_agent_api.L3AgentExtensionAPI(router_info, None) self.api.consume_api(api_object) fw_port_ids = port_ids ports_for_fw_expected = [(ri, port_ids)] diff --git a/requirements.txt b/requirements.txt index 0d9e06614..69969bf09 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ netaddr>=0.7.18 # BSD SQLAlchemy>=1.2.0 # MIT alembic>=0.8.10 # MIT six>=1.10.0 # MIT -neutron-lib>=1.25.0 # Apache-2.0 +neutron-lib>=1.26.0 # Apache-2.0 os-ken >= 0.3.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 oslo.db>=4.37.0 # Apache-2.0