Merge "Fix import order in network unit tests"

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 = {

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 = {

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 = {

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',

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 = {

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 = {

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'

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 = {

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',

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 = {

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 = {

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 = {

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 = {

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 = {

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 = {

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 = {

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 = {

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 = {

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 = {

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',

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',

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',

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',

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',

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',

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 = {

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 = {

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 = [

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 = {

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 = {

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 = {

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 = {

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 = {

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 = {

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'

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 =