Flake8 import order set up to detect cloudbridge as local & import fixes

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+application_import_names = cloudbridge, test

cloudbridge/cloud/base/resources.py

@@ -9,6 +9,8 @@ import re
 import shutil
 import time
 
+import six
+
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.interfaces.exceptions \
     import InvalidConfigurationException
@@ -50,8 +52,6 @@ from cloudbridge.cloud.interfaces.resources import VMType
 from cloudbridge.cloud.interfaces.resources import Volume
 from cloudbridge.cloud.interfaces.resources import VolumeState
 
-import six
-
 log = logging.getLogger(__name__)
 
 

cloudbridge/cloud/providers/aws/services.py

@@ -4,6 +4,8 @@ import string
 
 from botocore.exceptions import ClientError
 
+import requests
+
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import ClientPagedResultList
 from cloudbridge.cloud.base.services import BaseBucketService
@@ -32,8 +34,6 @@ from cloudbridge.cloud.interfaces.resources import VMFirewall
 from cloudbridge.cloud.interfaces.resources import VMType
 from cloudbridge.cloud.interfaces.resources import Volume
 
-import requests
-
 from .helpers import BotoEC2Service
 from .helpers import BotoS3Service
 from .resources import AWSBucket

cloudbridge/cloud/providers/azure/azure_client.py

@@ -20,6 +20,7 @@ import tenacity
 
 from cloudbridge.cloud.interfaces.exceptions import \
     InvalidNameException, ProviderConnectionException, WaitStateException
+
 from . import helpers as azure_helpers
 
 log = logging.getLogger(__name__)

cloudbridge/cloud/providers/azure/resources.py

@@ -9,6 +9,10 @@ from azure.common import AzureException
 from azure.mgmt.devtestlabs.models import GalleryImageReference
 from azure.mgmt.network.models import NetworkSecurityGroup
 
+from msrestazure.azure_exceptions import CloudError
+
+import pysftp
+
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import BaseAttachmentInfo, \
     BaseBucket, BaseBucketContainer, BaseBucketObject, BaseFloatingIP, \
@@ -22,10 +26,6 @@ from cloudbridge.cloud.interfaces.resources import Instance, \
     MachineImageState, NetworkState, RouterState, \
     SnapshotState, SubnetState, TrafficDirection
 
-from msrestazure.azure_exceptions import CloudError
-
-import pysftp
-
 from . import helpers as azure_helpers
 
 log = logging.getLogger(__name__)

cloudbridge/cloud/providers/azure/services.py

@@ -21,6 +21,7 @@ from cloudbridge.cloud.interfaces.exceptions import \
     DuplicateResourceException, InvalidValueException
 from cloudbridge.cloud.interfaces.resources import MachineImage, \
     Network, PlacementZone, Snapshot, Subnet, VMFirewall, VMType, Volume
+
 from . import helpers as azure_helpers
 from .resources import AzureBucket, \
     AzureInstance, AzureKeyPair, \

cloudbridge/cloud/providers/openstack/provider.py

@@ -5,8 +5,6 @@ import os
 
 from cinderclient import client as cinder_client
 
-from cloudbridge.cloud.base import BaseCloudProvider
-
 from keystoneauth1 import session
 
 from keystoneclient import client as keystone_client
@@ -20,6 +18,8 @@ from openstack import connection
 
 from swiftclient import client as swift_client
 
+from cloudbridge.cloud.base import BaseCloudProvider
+
 from .services import OpenStackComputeService
 from .services import OpenStackNetworkingService
 from .services import OpenStackSecurityService

cloudbridge/cloud/providers/openstack/resources.py

@@ -12,6 +12,20 @@ except ImportError:  # python 2
     from urlparse import urlparse
     from urlparse import urljoin
 
+from keystoneclient.v3.regions import Region
+
+from neutronclient.common.exceptions import PortNotFoundClient
+
+import novaclient.exceptions as novaex
+
+from openstack.exceptions import HttpException
+from openstack.exceptions import NotFoundException
+from openstack.exceptions import ResourceNotFound
+
+import swiftclient
+from swiftclient.service import SwiftService, SwiftUploadObject
+from swiftclient.utils import generate_temp_url
+
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import BaseAttachmentInfo
 from cloudbridge.cloud.base.resources import BaseBucket
@@ -48,20 +62,6 @@ from cloudbridge.cloud.interfaces.resources import TrafficDirection
 from cloudbridge.cloud.interfaces.resources import VolumeState
 from cloudbridge.cloud.providers.openstack import helpers as oshelpers
 
-from keystoneclient.v3.regions import Region
-
-from neutronclient.common.exceptions import PortNotFoundClient
-
-import novaclient.exceptions as novaex
-
-from openstack.exceptions import HttpException
-from openstack.exceptions import NotFoundException
-from openstack.exceptions import ResourceNotFound
-
-import swiftclient
-from swiftclient.service import SwiftService, SwiftUploadObject
-from swiftclient.utils import generate_temp_url
-
 ONE_GIG = 1048576000  # in bytes
 FIVE_GIG = ONE_GIG * 5  # in bytes
 

cloudbridge/cloud/providers/openstack/services.py

@@ -7,6 +7,13 @@ import re
 
 from cinderclient.exceptions import NotFound as CinderNotFound
 
+from neutronclient.common.exceptions import NeutronClientException
+
+from novaclient.exceptions import NotFound as NovaNotFound
+
+from openstack.exceptions import NotFoundException
+from openstack.exceptions import ResourceNotFound
+
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import BaseLaunchConfig
 from cloudbridge.cloud.base.resources import ClientPagedResultList
@@ -38,13 +45,6 @@ from cloudbridge.cloud.interfaces.resources import VMType
 from cloudbridge.cloud.interfaces.resources import Volume
 from cloudbridge.cloud.providers.openstack import helpers as oshelpers
 
-from neutronclient.common.exceptions import NeutronClientException
-
-from novaclient.exceptions import NotFound as NovaNotFound
-
-from openstack.exceptions import NotFoundException
-from openstack.exceptions import ResourceNotFound
-
 from .resources import OpenStackBucket
 from .resources import OpenStackInstance
 from .resources import OpenStackInternetGateway

test/helpers/__init__.py

@@ -6,12 +6,12 @@ import unittest
 import uuid
 from contextlib import contextmanager
 
+from six import reraise
+
 from cloudbridge.cloud.factory import CloudProviderFactory
 from cloudbridge.cloud.interfaces import InstanceState
 from cloudbridge.cloud.interfaces import TestMockHelperMixin
 
-from six import reraise
-
 
 def parse_bool(val):
     if val:

test/helpers/standard_interface_tests.py

@@ -5,7 +5,6 @@ This includes:
    2. Checking for object equality and repr
    3. Checking standard behaviour for list, iter, find, get, delete
 """
-import test.helpers as helpers
 import uuid
 
 from cloudbridge.cloud.interfaces.exceptions \
@@ -13,6 +12,8 @@ from cloudbridge.cloud.interfaces.exceptions \
 from cloudbridge.cloud.interfaces.resources import ObjectLifeCycleMixin
 from cloudbridge.cloud.interfaces.resources import ResultList
 
+import test.helpers as helpers
+
 
 def check_repr(test, obj):
     test.assertTrue(

test/test_block_store_service.py

@@ -1,8 +1,7 @@
 import time
 import uuid
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+
+import six
 
 from cloudbridge.cloud.factory import ProviderList
 from cloudbridge.cloud.interfaces import SnapshotState
@@ -12,7 +11,9 @@ from cloudbridge.cloud.interfaces.resources import AttachmentInfo
 from cloudbridge.cloud.interfaces.resources import Snapshot
 from cloudbridge.cloud.interfaces.resources import Volume
 
-import six
+from test import helpers
+from test.helpers import ProviderTestBase
+from test.helpers import standard_interface_tests as sit
 
 
 class CloudBlockStoreServiceTestCase(ProviderTestBase):

test/test_cloud_factory.py

@@ -1,5 +1,4 @@
 import unittest
-from test import helpers
 
 from cloudbridge.cloud import factory
 from cloudbridge.cloud import interfaces
@@ -9,6 +8,8 @@ from cloudbridge.cloud.interfaces.provider import CloudProvider
 from cloudbridge.cloud.providers.aws import AWSCloudProvider
 from cloudbridge.cloud.providers.aws.provider import MockAWSCloudProvider
 
+from test import helpers
+
 
 class CloudFactoryTestCase(unittest.TestCase):
 

test/test_cloud_helpers.py

@@ -1,9 +1,10 @@
 import itertools
-from test.helpers import ProviderTestBase
 
 from cloudbridge.cloud.base.resources import ClientPagedResultList
 from cloudbridge.cloud.base.resources import ServerPagedResultList
 
+from test.helpers import ProviderTestBase
+
 
 class DummyResult(object):
 

test/test_compute_service.py

@@ -1,7 +1,6 @@
 import ipaddress
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+
+import six
 
 from cloudbridge.cloud.factory import ProviderList
 from cloudbridge.cloud.interfaces import InstanceState
@@ -11,7 +10,9 @@ from cloudbridge.cloud.interfaces.resources import Instance
 from cloudbridge.cloud.interfaces.resources import SnapshotState
 from cloudbridge.cloud.interfaces.resources import VMType
 
-import six
+from test import helpers
+from test.helpers import ProviderTestBase
+from test.helpers import standard_interface_tests as sit
 
 
 class CloudComputeServiceTestCase(ProviderTestBase):

test/test_image_service.py

@@ -1,10 +1,10 @@
+from cloudbridge.cloud.interfaces import MachineImageState
+from cloudbridge.cloud.interfaces.resources import MachineImage
+
 from test import helpers
 from test.helpers import ProviderTestBase
 from test.helpers import standard_interface_tests as sit
 
-from cloudbridge.cloud.interfaces import MachineImageState
-from cloudbridge.cloud.interfaces.resources import MachineImage
-
 
 class CloudImageServiceTestCase(ProviderTestBase):
 

test/test_interface.py

@@ -1,5 +1,4 @@
 import unittest
-from test.helpers import ProviderTestBase
 
 import cloudbridge
 from cloudbridge.cloud import interfaces
@@ -7,6 +6,8 @@ from cloudbridge.cloud.factory import CloudProviderFactory
 from cloudbridge.cloud.interfaces import TestMockHelperMixin
 from cloudbridge.cloud.interfaces.exceptions import ProviderConnectionException
 
+from test.helpers import ProviderTestBase
+
 
 class CloudInterfaceTestCase(ProviderTestBase):
 

test/test_network_service.py

@@ -1,13 +1,13 @@
-import test.helpers as helpers
-from test.helpers import ProviderTestBase
-from test.helpers import get_provider_test_data
-from test.helpers import standard_interface_tests as sit
-
 from cloudbridge.cloud.interfaces.resources import FloatingIP
 from cloudbridge.cloud.interfaces.resources import Network
 from cloudbridge.cloud.interfaces.resources import RouterState
 from cloudbridge.cloud.interfaces.resources import Subnet
 
+import test.helpers as helpers
+from test.helpers import ProviderTestBase
+from test.helpers import get_provider_test_data
+from test.helpers import standard_interface_tests as sit
+
 
 class CloudNetworkServiceTestCase(ProviderTestBase):
 

test/test_object_life_cycle.py

@@ -1,9 +1,9 @@
-from test import helpers
-from test.helpers import ProviderTestBase
-
 from cloudbridge.cloud.interfaces import VolumeState
 from cloudbridge.cloud.interfaces.exceptions import WaitStateException
 
+from test import helpers
+from test.helpers import ProviderTestBase
+
 
 class CloudObjectLifeCycleTestCase(ProviderTestBase):
 

test/test_object_store_service.py

@@ -4,17 +4,18 @@ import tempfile
 import uuid
 from datetime import datetime
 from io import BytesIO
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
 from unittest import skip
 
+import requests
+
 from cloudbridge.cloud.interfaces.exceptions import InvalidNameException
 from cloudbridge.cloud.interfaces.provider import TestMockHelperMixin
 from cloudbridge.cloud.interfaces.resources import Bucket
 from cloudbridge.cloud.interfaces.resources import BucketObject
 
-import requests
+from test import helpers
+from test.helpers import ProviderTestBase
+from test.helpers import standard_interface_tests as sit
 
 
 class CloudObjectStoreServiceTestCase(ProviderTestBase):

test/test_region_service.py

@@ -1,10 +1,10 @@
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+import six
 
 from cloudbridge.cloud.interfaces import Region
 
-import six
+from test import helpers
+from test.helpers import ProviderTestBase
+from test.helpers import standard_interface_tests as sit
 
 
 class CloudRegionServiceTestCase(ProviderTestBase):

test/test_security_service.py

@@ -1,8 +1,4 @@
 """Test cloudbridge.security modules."""
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
-
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.interfaces.exceptions import DuplicateResourceException
 from cloudbridge.cloud.interfaces.resources import KeyPair
@@ -10,6 +6,10 @@ from cloudbridge.cloud.interfaces.resources import TrafficDirection
 from cloudbridge.cloud.interfaces.resources import VMFirewall
 from cloudbridge.cloud.interfaces.resources import VMFirewallRule
 
+from test import helpers
+from test.helpers import ProviderTestBase
+from test.helpers import standard_interface_tests as sit
+
 
 class CloudSecurityServiceTestCase(ProviderTestBase):
 

test/test_vm_types_service.py

@@ -1,9 +1,9 @@
+import six
+
 from test import helpers
 from test.helpers import ProviderTestBase
 from test.helpers import standard_interface_tests as sit
 
-import six
-
 
 class CloudVMTypeServiceTestCase(ProviderTestBase):