Address pre-checkin issues

- Skip bandit error B113
- Fix some style errors
- Adjust requirements
- Stop running python27 jobs
- Remove unit test jobs as on zuul tempest plugins
  are not loaded

Change-Id: I14fa84dfe8ed8f30f7bc4e2432b92c1b6387eb3e

.zuul.yaml

@@ -1,6 +1,9 @@
 - project:
     templates:
-      - openstack-python-jobs-neutron
-      - openstack-lower-constraints-jobs
-      - openstack-python36-jobs
       - check-requirements
+    check:
+      jobs:
+        - openstack-tox-pep8
+    gate:
+      jobs:
+        - openstack-tox-pep8

lower-constraints.txt

@@ -1,15 +1,14 @@
-coverage==4.0
 hacking>=1.1.0 # Apache-2.0
 flake8-import-order==0.12
 mock==2.0.0
-neutron-lib==1.26.0
+neutron-lib==3.4.0
 openstackdocstheme==2.2.0
-os-testr==1.0.0
+os-testr==3.0.0
 oslotest==3.2.0
 pbr==4.0.0
 pylint==2.1.0
 python-subunit==1.0.0
-reno==3.1.0
 stestr==2.0.0
+stevedore==4.0.0
 tempest==17.1.0
 testtools==2.2.0

requirements.txt

@@ -2,5 +2,5 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+neutron-lib>=3.4.0
 pbr>=4.0.0 # Apache-2.0
-neutron-lib>=1.26.0 # Apache-2.0

test-requirements.txt

@@ -4,16 +4,14 @@
 
 hacking>=1.1.0 # Apache-2.0
 
-bandit!=1.6.0,>=1.1.0 # Apache-2.0
+bandit # Apache 2.0
-coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order==0.12 # LGPLv3
-mock>=2.0.0 # BSD
+mock>=2.0.0
-python-subunit>=1.0.0 # Apache-2.0/BSD
+os-testr>=3.0.0
-oslotest>=3.2.0 # Apache-2.0
+oslotest>=3.2.0
-testtools>=2.2.0 # MIT
-# releasenotes
-reno>=3.1.0 # Apache-2.0
-tempest>=17.1.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
 pylint==2.1.0 # GPLv2
-stestr>=2.0.0 # Apache-2.0
+python-subunit>=1.0.0
+stestr>=2.0.0
+stevedore>=4.0.0
+tempest>=17.1.0 # Apache-2.0
+testtools>=2.2.0

tox.ini

@@ -1,11 +1,11 @@
 [tox]
 minversion = 3.1
-envlist = py36,pep8,docs
+envlist = py39,pep8,docs
 skipsdist = True
 
 
 [testenv]
-basepython = python3
+basepython = python3.9
 usedevelop = True
 install_command =  pip install {opts} {packages}
 setenv =
@@ -17,7 +17,7 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-whitelist_externals = sh
+allowlist_externals = sh
                       rm
                       find
 commands =
@@ -89,9 +89,10 @@ import-order-style = pep8
 [testenv:bandit]
 basepython = python3
 # B108 hardcoded_tmp_directory - remove when fixed
+# B113 request_without_timeout
 # B602 subprocess_popen_with_shell_equals_true - removed when fixed
 # B605 start_process_with_a_shell - remove when fixed
-commands = bandit -r vmware_nsx_tempest_plugin -n 5 -s B108,B602,B605 -ll
+commands = bandit -r vmware_nsx_tempest_plugin -n 5 -s B108,B602,B605,B113 -ll
 
 [testenv:lower-constraints]
 basepython = python3

vmware_nsx_tempest_plugin/lib/feature_manager.py

@@ -1848,7 +1848,7 @@ class FeatureManager(traffic_manager.IperfManager,
             present = [True for el in result if nsx_dr_rtr_name in el]
             if present:
                 dr_present = True
-        return[{'dr_present': dr_present}, {'sr_present': sr_present}]
+        return [{'dr_present': dr_present}, {'sr_present': sr_present}]
 
     def create_project_octavia_scale(self, protocol_type,
                                      protocol_port, lb_algorithm,

vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_mac_learning.py

@@ -235,9 +235,9 @@ class NSXv3MacLearningTest(base.BaseNetworkTest):
         test_ports_in_body = []
         # Verify the each port exists in the list of all ports
         for tport in body['ports']:
-            if(nill_nsx['display_name'] == tport['name']):
+            if (nill_nsx['display_name'] == tport['name']):
                 test_ports_in_body.append(nill_nsx['display_name'])
-            if(ml_port_nsx['display_name'] == tport['name']):
+            if (ml_port_nsx['display_name'] == tport['name']):
                 test_ports_in_body.append(ml_port_nsx['display_name'])
         self.assertEqual(len(test_ports_in_body), 2,
                          'List ports does not match num of created ports')

vmware_nsx_tempest_plugin/tests/scenario/test_multiple_allow_address_pair.py

@@ -62,7 +62,8 @@ class MultipleAllowAddress(feature_manager.FeatureManager):
                 manager_ip, CONF.nsxv.user, CONF.nsxv.password)
 
     def _assign_ip_address(self, ssh_source, interface_name, ip_address):
-        ssh_source.exec_command("sudo /sbin/ifconfig %s %s netmask 255.255.255.0 \
+        ssh_source.exec_command("sudo /sbin/ifconfig %s %s "
+                                "netmask 255.255.255.0 \
                                 up" % (interface_name, ip_address))
 
     def verify_ping_to_fip_from_ext_vm(self, server_details):

vmware_nsx_tempest_plugin/tests/scenario/test_qos.py

@@ -272,7 +272,7 @@ class TestQosOps(feature_manager.FeatureManager):
         elif float(bw_value) - (float(max_mbps) + float(max_burst)) > 0.5:
             LOG.info("Traffic received: {bw}".format(bw=bw_value))
             raise Exception('Traffic is not limited by bw-limit rule')
-        elif((float(max_mbps) + float(max_burst)) - float(bw_value)) > 0.5:
+        elif ((float(max_mbps) + float(max_burst)) - float(bw_value)) > 0.5:
             LOG.info("Traffic received: {bw}".format(bw=bw_value))
             raise Exception('Traffic is limited below configured value')