Merge "Fix test_allocate_ips_are_from_correct_subnet on ML2/OVN backend"
diff --git a/neutron_tempest_plugin/api/test_security_groups.py b/neutron_tempest_plugin/api/test_security_groups.py
index 94b6dbf..0970d83 100644
--- a/neutron_tempest_plugin/api/test_security_groups.py
+++ b/neutron_tempest_plugin/api/test_security_groups.py
@@ -240,12 +240,14 @@
def _create_security_group_rules(self, amount, port_index=1):
for i in range(amount):
- self.create_security_group_rule(**{
+ ingress_rule = self.create_security_group_rule(**{
'project_id': self.client.tenant_id,
'direction': 'ingress',
'port_range_max': port_index + i,
'port_range_min': port_index + i,
'protocol': 'tcp'})
+ self.addCleanup(
+ self.client.delete_security_group_rule, ingress_rule['id'])
def _increase_sg_rules_quota(self):
sg_rules_quota = self._get_sg_rules_quota()
diff --git a/tox.ini b/tox.ini
index d3e722a..ff50b9d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-minversion = 3.1
+minversion = 3.18.0
envlist = pep8
skipsdist = True
ignore_basepython_conflict = True
@@ -22,7 +22,7 @@
commands =
sh ./tools/misc-sanity-checks.sh
flake8
-whitelist_externals =
+allowlist_externals =
sh
[testenv:venv]