From 993d76b82e36e064218570abaf3b07cc3035c1ab Mon Sep 17 00:00:00 2001
From: elajkat <lajos.katona@est.tech>
Date: Thu, 17 Sep 2020 11:28:23 +0200
Subject: [PATCH] Fix taas-tempest-plugin gate

Make pep8 job work on focal:
* adopt constraints files
* ignore W504 Line break occurred after a binary operator

Make tempest tests work by changing the default m1.medium flavor to d1.

Change-Id: Iea267fe07f3acfd344cb9843c0a79b924c2b30cc
---
 neutron_taas_tempest_plugin/config.py                 | 2 +-
 neutron_taas_tempest_plugin/tests/scenario/manager.py | 4 ++--
 requirements.txt                                      | 2 +-
 test-requirements.txt                                 | 8 ++++----
 tox.ini                                               | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/neutron_taas_tempest_plugin/config.py b/neutron_taas_tempest_plugin/config.py
index 7d8785b..df43595 100644
--- a/neutron_taas_tempest_plugin/config.py
+++ b/neutron_taas_tempest_plugin/config.py
@@ -42,6 +42,6 @@ TaaSPluginGroup = [
                default='ubuntu',
                help='Name of ssh user to use with advanced image in tests.'),
     cfg.StrOpt('advanced_image_flavor_ref',
-               default='m1.medium',
+               default='d1',
                help='Valid flavor to use with advanced image in tests.'),
 ]
diff --git a/neutron_taas_tempest_plugin/tests/scenario/manager.py b/neutron_taas_tempest_plugin/tests/scenario/manager.py
index edd78a1..02b481c 100644
--- a/neutron_taas_tempest_plugin/tests/scenario/manager.py
+++ b/neutron_taas_tempest_plugin/tests/scenario/manager.py
@@ -466,8 +466,8 @@ class NetworkScenarioTest(ScenarioTest):
         port_map = [(p["id"], fxip["ip_address"])
                     for p in ports
                     for fxip in p["fixed_ips"]
-                    if netutils.is_valid_ipv4(fxip["ip_address"])
-                    and p['status'] in p_status]
+                    if netutils.is_valid_ipv4(fxip["ip_address"]) and
+                    p['status'] in p_status]
         inactive = [p for p in ports if p['status'] != 'ACTIVE']
         if inactive:
             LOG.warning("Instance has ports that are not ACTIVE: %s", inactive)
diff --git a/requirements.txt b/requirements.txt
index 6de9f4e..040cd0e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,4 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
+pbr>=5.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f9a67e4..cdfaa11 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,12 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=3.0.0,<3.1 # Apache-2.0
 
-coverage!=4.4,>=4.0 # Apache-2.0
-python-subunit>=1.0.0 # Apache-2.0/BSD
+coverage>=5.2.1 # Apache-2.0
+python-subunit>=1.4.0 # Apache-2.0/BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
-oslotest>=3.2.0 # Apache-2.0
+oslotest>=4.4.1 # Apache-2.0
 os-testr>=1.0.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d6b5198..a9df05d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,8 +26,9 @@ commands = {posargs}
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
+# W504 Line break occurred after a binary operator
 
 show-source = True
-ignore = E123,E125
+ignore = E123,E125,W504
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build