From d1676c24d317e7ee4115582cdfc28279ea910e2b Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Mon, 19 Apr 2021 15:42:27 +0200 Subject: [PATCH] Fix import order in network unit tests Change-Id: I9bc1d42cfb0cb6574a9f765b21a50e338a98f2b6 --- openstack/tests/unit/network/test_version.py | 2 +- openstack/tests/unit/network/v2/test_address_group.py | 2 +- openstack/tests/unit/network/v2/test_address_scope.py | 2 +- .../tests/unit/network/v2/test_auto_allocated_topology.py | 2 +- openstack/tests/unit/network/v2/test_availability_zone.py | 2 +- openstack/tests/unit/network/v2/test_extension.py | 2 +- openstack/tests/unit/network/v2/test_floating_ip.py | 2 +- openstack/tests/unit/network/v2/test_health_monitor.py | 2 +- openstack/tests/unit/network/v2/test_l3_conntrack_helper.py | 2 +- openstack/tests/unit/network/v2/test_listener.py | 2 +- openstack/tests/unit/network/v2/test_load_balancer.py | 2 +- openstack/tests/unit/network/v2/test_metering_label.py | 2 +- openstack/tests/unit/network/v2/test_metering_label_rule.py | 2 +- openstack/tests/unit/network/v2/test_network.py | 2 +- .../tests/unit/network/v2/test_network_ip_availability.py | 2 +- openstack/tests/unit/network/v2/test_network_segment_range.py | 2 +- openstack/tests/unit/network/v2/test_pool.py | 2 +- openstack/tests/unit/network/v2/test_pool_member.py | 2 +- openstack/tests/unit/network/v2/test_port.py | 2 +- openstack/tests/unit/network/v2/test_port_forwarding.py | 2 +- .../tests/unit/network/v2/test_qos_bandwidth_limit_rule.py | 3 ++- openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py | 3 ++- .../tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py | 3 ++- openstack/tests/unit/network/v2/test_qos_policy.py | 3 ++- openstack/tests/unit/network/v2/test_qos_rule_type.py | 2 +- openstack/tests/unit/network/v2/test_quota.py | 4 ++-- openstack/tests/unit/network/v2/test_rbac_policy.py | 2 +- openstack/tests/unit/network/v2/test_security_group.py | 2 +- openstack/tests/unit/network/v2/test_security_group_rule.py | 2 +- openstack/tests/unit/network/v2/test_segment.py | 2 +- openstack/tests/unit/network/v2/test_service_profile.py | 2 +- openstack/tests/unit/network/v2/test_service_provider.py | 2 +- openstack/tests/unit/network/v2/test_subnet.py | 2 +- openstack/tests/unit/network/v2/test_subnet_pool.py | 2 +- openstack/tests/unit/network/v2/test_vpn_service.py | 3 +-- tox.ini | 1 - 36 files changed, 40 insertions(+), 38 deletions(-) diff --git a/openstack/tests/unit/network/test_version.py b/openstack/tests/unit/network/test_version.py index 22b6e1028..77df42ba6 100644 --- a/openstack/tests/unit/network/test_version.py +++ b/openstack/tests/unit/network/test_version.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network import version from openstack.tests.unit import base -from openstack.network import version IDENTIFIER = 'v2.0' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_address_group.py b/openstack/tests/unit/network/v2/test_address_group.py index 9275575f7..356857293 100644 --- a/openstack/tests/unit/network/v2/test_address_group.py +++ b/openstack/tests/unit/network/v2/test_address_group.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import address_group from openstack.tests.unit import base -from openstack.network.v2 import address_group IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_address_scope.py b/openstack/tests/unit/network/v2/test_address_scope.py index 48103fd72..8f7a2059d 100644 --- a/openstack/tests/unit/network/v2/test_address_scope.py +++ b/openstack/tests/unit/network/v2/test_address_scope.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import address_scope from openstack.tests.unit import base -from openstack.network.v2 import address_scope IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_auto_allocated_topology.py b/openstack/tests/unit/network/v2/test_auto_allocated_topology.py index 500837949..bc836f0bc 100644 --- a/openstack/tests/unit/network/v2/test_auto_allocated_topology.py +++ b/openstack/tests/unit/network/v2/test_auto_allocated_topology.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import auto_allocated_topology from openstack.tests.unit import base -from openstack.network.v2 import auto_allocated_topology EXAMPLE = { 'tenant_id': '1', diff --git a/openstack/tests/unit/network/v2/test_availability_zone.py b/openstack/tests/unit/network/v2/test_availability_zone.py index 8b9fc79c0..ef5f22336 100644 --- a/openstack/tests/unit/network/v2/test_availability_zone.py +++ b/openstack/tests/unit/network/v2/test_availability_zone.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import availability_zone from openstack.tests.unit import base -from openstack.network.v2 import availability_zone IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_extension.py b/openstack/tests/unit/network/v2/test_extension.py index a2f67e1f2..4ae763445 100644 --- a/openstack/tests/unit/network/v2/test_extension.py +++ b/openstack/tests/unit/network/v2/test_extension.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import extension from openstack.tests.unit import base -from openstack.network.v2 import extension IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_floating_ip.py b/openstack/tests/unit/network/v2/test_floating_ip.py index d443884b5..1c057b64c 100644 --- a/openstack/tests/unit/network/v2/test_floating_ip.py +++ b/openstack/tests/unit/network/v2/test_floating_ip.py @@ -12,8 +12,8 @@ from unittest import mock -from openstack import proxy from openstack.network.v2 import floating_ip +from openstack import proxy from openstack.tests.unit import base IDENTIFIER = 'IDENTIFIER' diff --git a/openstack/tests/unit/network/v2/test_health_monitor.py b/openstack/tests/unit/network/v2/test_health_monitor.py index 5acfdda5d..143738266 100644 --- a/openstack/tests/unit/network/v2/test_health_monitor.py +++ b/openstack/tests/unit/network/v2/test_health_monitor.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import health_monitor from openstack.tests.unit import base -from openstack.network.v2 import health_monitor IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_l3_conntrack_helper.py b/openstack/tests/unit/network/v2/test_l3_conntrack_helper.py index c1575f228..38527b50c 100644 --- a/openstack/tests/unit/network/v2/test_l3_conntrack_helper.py +++ b/openstack/tests/unit/network/v2/test_l3_conntrack_helper.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import l3_conntrack_helper from openstack.tests.unit import base -from openstack.network.v2 import l3_conntrack_helper EXAMPLE = { 'id': 'ct_helper_id', diff --git a/openstack/tests/unit/network/v2/test_listener.py b/openstack/tests/unit/network/v2/test_listener.py index 15f598e83..fca356e08 100644 --- a/openstack/tests/unit/network/v2/test_listener.py +++ b/openstack/tests/unit/network/v2/test_listener.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import listener from openstack.tests.unit import base -from openstack.network.v2 import listener IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_load_balancer.py b/openstack/tests/unit/network/v2/test_load_balancer.py index 4590f513d..b66db3790 100644 --- a/openstack/tests/unit/network/v2/test_load_balancer.py +++ b/openstack/tests/unit/network/v2/test_load_balancer.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import load_balancer from openstack.tests.unit import base -from openstack.network.v2 import load_balancer IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_metering_label.py b/openstack/tests/unit/network/v2/test_metering_label.py index 8dc4a4a3b..50efac047 100644 --- a/openstack/tests/unit/network/v2/test_metering_label.py +++ b/openstack/tests/unit/network/v2/test_metering_label.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import metering_label from openstack.tests.unit import base -from openstack.network.v2 import metering_label IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_metering_label_rule.py b/openstack/tests/unit/network/v2/test_metering_label_rule.py index c11f2838b..be005940e 100644 --- a/openstack/tests/unit/network/v2/test_metering_label_rule.py +++ b/openstack/tests/unit/network/v2/test_metering_label_rule.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import metering_label_rule from openstack.tests.unit import base -from openstack.network.v2 import metering_label_rule IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_network.py b/openstack/tests/unit/network/v2/test_network.py index b6e2d637b..37a51cb82 100644 --- a/openstack/tests/unit/network/v2/test_network.py +++ b/openstack/tests/unit/network/v2/test_network.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import network from openstack.tests.unit import base -from openstack.network.v2 import network IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_network_ip_availability.py b/openstack/tests/unit/network/v2/test_network_ip_availability.py index 0dc64b788..c40b8b7fb 100644 --- a/openstack/tests/unit/network/v2/test_network_ip_availability.py +++ b/openstack/tests/unit/network/v2/test_network_ip_availability.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import network_ip_availability from openstack.tests.unit import base -from openstack.network.v2 import network_ip_availability IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_network_segment_range.py b/openstack/tests/unit/network/v2/test_network_segment_range.py index 9a76cc234..2e32f299d 100644 --- a/openstack/tests/unit/network/v2/test_network_segment_range.py +++ b/openstack/tests/unit/network/v2/test_network_segment_range.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import network_segment_range from openstack.tests.unit import base -from openstack.network.v2 import network_segment_range IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_pool.py b/openstack/tests/unit/network/v2/test_pool.py index acade83da..1dae98a57 100644 --- a/openstack/tests/unit/network/v2/test_pool.py +++ b/openstack/tests/unit/network/v2/test_pool.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import pool from openstack.tests.unit import base -from openstack.network.v2 import pool IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_pool_member.py b/openstack/tests/unit/network/v2/test_pool_member.py index 156b6beec..9d2df196b 100644 --- a/openstack/tests/unit/network/v2/test_pool_member.py +++ b/openstack/tests/unit/network/v2/test_pool_member.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import pool_member from openstack.tests.unit import base -from openstack.network.v2 import pool_member IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_port.py b/openstack/tests/unit/network/v2/test_port.py index 9c37fe25d..7fd88b631 100644 --- a/openstack/tests/unit/network/v2/test_port.py +++ b/openstack/tests/unit/network/v2/test_port.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import port from openstack.tests.unit import base -from openstack.network.v2 import port IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_port_forwarding.py b/openstack/tests/unit/network/v2/test_port_forwarding.py index fd3fbfa7b..8748cae9e 100644 --- a/openstack/tests/unit/network/v2/test_port_forwarding.py +++ b/openstack/tests/unit/network/v2/test_port_forwarding.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import port_forwarding from openstack.tests.unit import base -from openstack.network.v2 import port_forwarding EXAMPLE = { 'id': 'pf_id', diff --git a/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py b/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py index cd9f7ef49..581004e10 100644 --- a/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py +++ b/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.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.network.v2 import qos_bandwidth_limit_rule +from openstack.tests.unit import base + EXAMPLE = { 'id': 'IDENTIFIER', diff --git a/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py b/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py index 9f2bb38b8..02a71a2e4 100644 --- a/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py +++ b/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.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.network.v2 import qos_dscp_marking_rule +from openstack.tests.unit import base + EXAMPLE = { 'id': 'IDENTIFIER', diff --git a/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py b/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py index e18fa1d85..b42335bd7 100644 --- a/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py +++ b/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.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.network.v2 import qos_minimum_bandwidth_rule +from openstack.tests.unit import base + EXAMPLE = { 'id': 'IDENTIFIER', diff --git a/openstack/tests/unit/network/v2/test_qos_policy.py b/openstack/tests/unit/network/v2/test_qos_policy.py index 7a786e83d..295f56341 100644 --- a/openstack/tests/unit/network/v2/test_qos_policy.py +++ b/openstack/tests/unit/network/v2/test_qos_policy.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.network.v2 import qos_policy +from openstack.tests.unit import base + EXAMPLE = { 'id': 'IDENTIFIER', diff --git a/openstack/tests/unit/network/v2/test_qos_rule_type.py b/openstack/tests/unit/network/v2/test_qos_rule_type.py index bd927c4bb..a10f23aee 100644 --- a/openstack/tests/unit/network/v2/test_qos_rule_type.py +++ b/openstack/tests/unit/network/v2/test_qos_rule_type.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import qos_rule_type from openstack.tests.unit import base -from openstack.network.v2 import qos_rule_type EXAMPLE = { 'type': 'bandwidth_limit', diff --git a/openstack/tests/unit/network/v2/test_quota.py b/openstack/tests/unit/network/v2/test_quota.py index e6b6b7a27..54d7a6949 100644 --- a/openstack/tests/unit/network/v2/test_quota.py +++ b/openstack/tests/unit/network/v2/test_quota.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.network.v2 import quota from openstack import resource +from openstack.tests.unit import base + IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_rbac_policy.py b/openstack/tests/unit/network/v2/test_rbac_policy.py index d91531956..ea0a9a364 100644 --- a/openstack/tests/unit/network/v2/test_rbac_policy.py +++ b/openstack/tests/unit/network/v2/test_rbac_policy.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import rbac_policy from openstack.tests.unit import base -from openstack.network.v2 import rbac_policy IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_security_group.py b/openstack/tests/unit/network/v2/test_security_group.py index 661f8aa49..7a4c74163 100644 --- a/openstack/tests/unit/network/v2/test_security_group.py +++ b/openstack/tests/unit/network/v2/test_security_group.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import security_group from openstack.tests.unit import base -from openstack.network.v2 import security_group IDENTIFIER = 'IDENTIFIER' RULES = [ diff --git a/openstack/tests/unit/network/v2/test_security_group_rule.py b/openstack/tests/unit/network/v2/test_security_group_rule.py index c334b654e..cfaf43da0 100644 --- a/openstack/tests/unit/network/v2/test_security_group_rule.py +++ b/openstack/tests/unit/network/v2/test_security_group_rule.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import security_group_rule from openstack.tests.unit import base -from openstack.network.v2 import security_group_rule IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_segment.py b/openstack/tests/unit/network/v2/test_segment.py index 3dd0c94c0..4130f6650 100644 --- a/openstack/tests/unit/network/v2/test_segment.py +++ b/openstack/tests/unit/network/v2/test_segment.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import segment from openstack.tests.unit import base -from openstack.network.v2 import segment IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_service_profile.py b/openstack/tests/unit/network/v2/test_service_profile.py index 2e6e26f24..a6be8c079 100644 --- a/openstack/tests/unit/network/v2/test_service_profile.py +++ b/openstack/tests/unit/network/v2/test_service_profile.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import service_profile from openstack.tests.unit import base -from openstack.network.v2 import service_profile IDENTIFIER = 'IDENTIFIER' EXAMPLE_WITH_OPTIONAL = { diff --git a/openstack/tests/unit/network/v2/test_service_provider.py b/openstack/tests/unit/network/v2/test_service_provider.py index 07cdce727..ad578bff9 100644 --- a/openstack/tests/unit/network/v2/test_service_provider.py +++ b/openstack/tests/unit/network/v2/test_service_provider.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import service_provider from openstack.tests.unit import base -from openstack.network.v2 import service_provider IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_subnet.py b/openstack/tests/unit/network/v2/test_subnet.py index 5f1cb0419..6d87eebba 100644 --- a/openstack/tests/unit/network/v2/test_subnet.py +++ b/openstack/tests/unit/network/v2/test_subnet.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import subnet from openstack.tests.unit import base -from openstack.network.v2 import subnet IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_subnet_pool.py b/openstack/tests/unit/network/v2/test_subnet_pool.py index 4a13cd34e..a0859b38e 100644 --- a/openstack/tests/unit/network/v2/test_subnet_pool.py +++ b/openstack/tests/unit/network/v2/test_subnet_pool.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.network.v2 import subnet_pool from openstack.tests.unit import base -from openstack.network.v2 import subnet_pool IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/network/v2/test_vpn_service.py b/openstack/tests/unit/network/v2/test_vpn_service.py index 6ae369783..a0bef05f1 100644 --- a/openstack/tests/unit/network/v2/test_vpn_service.py +++ b/openstack/tests/unit/network/v2/test_vpn_service.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.network.v2 import vpn_service +from openstack.tests.unit import base IDENTIFIER = 'IDENTIFIER' diff --git a/tox.ini b/tox.ini index 6a44739cd..64446e384 100644 --- a/tox.ini +++ b/tox.ini @@ -133,7 +133,6 @@ per-file-ignores = openstack/tests/unit/message/*:H306,I100,I201,I202 openstack/tests/unit/load_balancer/*:H306,I100,I201,I202 openstack/tests/unit/compute/*:H306,I100,I201,I202 - openstack/tests/unit/network/*:H306,I100,I201,I202 [flake8:local-plugins] extension =