diff --git a/openstack/tests/unit/load_balancer/test_amphora.py b/openstack/tests/unit/load_balancer/test_amphora.py index 03d44f81d..09c087a5a 100644 --- a/openstack/tests/unit/load_balancer/test_amphora.py +++ b/openstack/tests/unit/load_balancer/test_amphora.py @@ -12,10 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import amphora +from openstack.tests.unit import base + IDENTIFIER = uuid.uuid4() LB_ID = uuid.uuid4() diff --git a/openstack/tests/unit/load_balancer/test_availability_zone.py b/openstack/tests/unit/load_balancer/test_availability_zone.py index 3417ee734..63eb9fb52 100644 --- a/openstack/tests/unit/load_balancer/test_availability_zone.py +++ b/openstack/tests/unit/load_balancer/test_availability_zone.py @@ -11,10 +11,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import availability_zone +from openstack.tests.unit import base + AVAILABILITY_ZONE_PROFILE_ID = uuid.uuid4() EXAMPLE = { diff --git a/openstack/tests/unit/load_balancer/test_availability_zone_profile.py b/openstack/tests/unit/load_balancer/test_availability_zone_profile.py index 82d1c0b9d..b6343772f 100644 --- a/openstack/tests/unit/load_balancer/test_availability_zone_profile.py +++ b/openstack/tests/unit/load_balancer/test_availability_zone_profile.py @@ -11,10 +11,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import availability_zone_profile +from openstack.tests.unit import base + IDENTIFIER = uuid.uuid4() EXAMPLE = { diff --git a/openstack/tests/unit/load_balancer/test_flavor.py b/openstack/tests/unit/load_balancer/test_flavor.py index 5d5069a75..5f4bec1ef 100644 --- a/openstack/tests/unit/load_balancer/test_flavor.py +++ b/openstack/tests/unit/load_balancer/test_flavor.py @@ -12,10 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import flavor +from openstack.tests.unit import base + IDENTIFIER = uuid.uuid4() FLAVOR_PROFILE_ID = uuid.uuid4() diff --git a/openstack/tests/unit/load_balancer/test_flavor_profile.py b/openstack/tests/unit/load_balancer/test_flavor_profile.py index 7b7ea43c4..2266f4d1f 100644 --- a/openstack/tests/unit/load_balancer/test_flavor_profile.py +++ b/openstack/tests/unit/load_balancer/test_flavor_profile.py @@ -12,10 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import flavor_profile +from openstack.tests.unit import base + IDENTIFIER = uuid.uuid4() EXAMPLE = { diff --git a/openstack/tests/unit/load_balancer/test_health_monitor.py b/openstack/tests/unit/load_balancer/test_health_monitor.py index 7bfd72c33..85ff52b7c 100644 --- a/openstack/tests/unit/load_balancer/test_health_monitor.py +++ b/openstack/tests/unit/load_balancer/test_health_monitor.py @@ -11,10 +11,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import health_monitor +from openstack.tests.unit import base + EXAMPLE = { 'admin_state_up': True, diff --git a/openstack/tests/unit/load_balancer/test_l7policy.py b/openstack/tests/unit/load_balancer/test_l7policy.py index a3194f93c..cf433fc2f 100644 --- a/openstack/tests/unit/load_balancer/test_l7policy.py +++ b/openstack/tests/unit/load_balancer/test_l7policy.py @@ -10,10 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import l7_policy +from openstack.tests.unit import base + EXAMPLE = { 'action': 'REJECT', diff --git a/openstack/tests/unit/load_balancer/test_l7rule.py b/openstack/tests/unit/load_balancer/test_l7rule.py index 3d93703f2..0f3788091 100644 --- a/openstack/tests/unit/load_balancer/test_l7rule.py +++ b/openstack/tests/unit/load_balancer/test_l7rule.py @@ -10,10 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import l7_rule +from openstack.tests.unit import base + EXAMPLE = { 'admin_state_up': True, diff --git a/openstack/tests/unit/load_balancer/test_listener.py b/openstack/tests/unit/load_balancer/test_listener.py index 3d70ac9cd..c8928e77e 100644 --- a/openstack/tests/unit/load_balancer/test_listener.py +++ b/openstack/tests/unit/load_balancer/test_listener.py @@ -10,10 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import listener +from openstack.tests.unit import base + IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/load_balancer/test_member.py b/openstack/tests/unit/load_balancer/test_member.py index a99a2858d..fe6d8f1ce 100644 --- a/openstack/tests/unit/load_balancer/test_member.py +++ b/openstack/tests/unit/load_balancer/test_member.py @@ -10,10 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import member +from openstack.tests.unit import base + IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/load_balancer/test_pool.py b/openstack/tests/unit/load_balancer/test_pool.py index 5bbc0b4e2..5ba5e366f 100644 --- a/openstack/tests/unit/load_balancer/test_pool.py +++ b/openstack/tests/unit/load_balancer/test_pool.py @@ -10,10 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base import uuid from openstack.load_balancer.v2 import pool +from openstack.tests.unit import base + IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/load_balancer/test_provider.py b/openstack/tests/unit/load_balancer/test_provider.py index 59b8f4308..3b087419b 100644 --- a/openstack/tests/unit/load_balancer/test_provider.py +++ b/openstack/tests/unit/load_balancer/test_provider.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.load_balancer.v2 import provider from openstack.tests.unit import base -from openstack.load_balancer.v2 import provider EXAMPLE = { 'name': 'best', diff --git a/openstack/tests/unit/load_balancer/test_proxy.py b/openstack/tests/unit/load_balancer/test_proxy.py index 169a02cf1..54bd479b6 100644 --- a/openstack/tests/unit/load_balancer/test_proxy.py +++ b/openstack/tests/unit/load_balancer/test_proxy.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import uuid from unittest import mock +import uuid from openstack.load_balancer.v2 import _proxy from openstack.load_balancer.v2 import amphora diff --git a/openstack/tests/unit/load_balancer/test_quota.py b/openstack/tests/unit/load_balancer/test_quota.py index c9b01aeef..648dfc40a 100644 --- a/openstack/tests/unit/load_balancer/test_quota.py +++ b/openstack/tests/unit/load_balancer/test_quota.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.load_balancer.v2 import quota from openstack.tests.unit import base -from openstack.load_balancer.v2 import quota IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/load_balancer/test_version.py b/openstack/tests/unit/load_balancer/test_version.py index 0e141dfce..db3e53c1c 100644 --- a/openstack/tests/unit/load_balancer/test_version.py +++ b/openstack/tests/unit/load_balancer/test_version.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.load_balancer import version from openstack.tests.unit import base -from openstack.load_balancer import version IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/tox.ini b/tox.ini index fee9f8492..09deeedb2 100644 --- a/tox.ini +++ b/tox.ini @@ -131,7 +131,6 @@ per-file-ignores = openstack/tests/unit/config/*:H306,I100,I201,I202 openstack/tests/unit/workflow/*:H306,I100,I201,I202 openstack/tests/unit/message/*:H306,I100,I201,I202 - openstack/tests/unit/load_balancer/*:H306,I100,I201,I202 [flake8:local-plugins] extension =