Moved packages under cloud one level up

README.rst

@@ -82,7 +82,7 @@ exploring the API:
 
 .. code-block:: python
 
-  from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+  from cloudbridge.factory import CloudProviderFactory, ProviderList
 
   provider = CloudProviderFactory().create_provider(ProviderList.AWS, {})
   print(provider.security.key_pairs.list())

cloudbridge/cloud/base/resources.py → cloudbridge/base/resources.py

@@ -12,42 +12,42 @@ import uuid
 
 import six
 
-from cloudbridge.cloud.interfaces.exceptions import \
+from cloudbridge.interfaces.exceptions import \
     InvalidConfigurationException
-from cloudbridge.cloud.interfaces.exceptions import InvalidLabelException
-from cloudbridge.cloud.interfaces.exceptions import InvalidNameException
-from cloudbridge.cloud.interfaces.exceptions import WaitStateException
-from cloudbridge.cloud.interfaces.resources import AttachmentInfo
-from cloudbridge.cloud.interfaces.resources import Bucket
-from cloudbridge.cloud.interfaces.resources import BucketObject
-from cloudbridge.cloud.interfaces.resources import CloudResource
-from cloudbridge.cloud.interfaces.resources import FloatingIP
-from cloudbridge.cloud.interfaces.resources import FloatingIpState
-from cloudbridge.cloud.interfaces.resources import GatewayState
-from cloudbridge.cloud.interfaces.resources import Instance
-from cloudbridge.cloud.interfaces.resources import InstanceState
-from cloudbridge.cloud.interfaces.resources import InternetGateway
-from cloudbridge.cloud.interfaces.resources import KeyPair
-from cloudbridge.cloud.interfaces.resources import LaunchConfig
-from cloudbridge.cloud.interfaces.resources import MachineImage
-from cloudbridge.cloud.interfaces.resources import MachineImageState
-from cloudbridge.cloud.interfaces.resources import Network
-from cloudbridge.cloud.interfaces.resources import NetworkState
-from cloudbridge.cloud.interfaces.resources import ObjectLifeCycleMixin
-from cloudbridge.cloud.interfaces.resources import PageableObjectMixin
-from cloudbridge.cloud.interfaces.resources import PlacementZone
-from cloudbridge.cloud.interfaces.resources import Region
-from cloudbridge.cloud.interfaces.resources import ResultList
-from cloudbridge.cloud.interfaces.resources import Router
-from cloudbridge.cloud.interfaces.resources import Snapshot
-from cloudbridge.cloud.interfaces.resources import SnapshotState
-from cloudbridge.cloud.interfaces.resources import Subnet
-from cloudbridge.cloud.interfaces.resources import SubnetState
-from cloudbridge.cloud.interfaces.resources import VMFirewall
-from cloudbridge.cloud.interfaces.resources import VMFirewallRule
-from cloudbridge.cloud.interfaces.resources import VMType
-from cloudbridge.cloud.interfaces.resources import Volume
-from cloudbridge.cloud.interfaces.resources import VolumeState
+from cloudbridge.interfaces.exceptions import InvalidLabelException
+from cloudbridge.interfaces.exceptions import InvalidNameException
+from cloudbridge.interfaces.exceptions import WaitStateException
+from cloudbridge.interfaces.resources import AttachmentInfo
+from cloudbridge.interfaces.resources import Bucket
+from cloudbridge.interfaces.resources import BucketObject
+from cloudbridge.interfaces.resources import CloudResource
+from cloudbridge.interfaces.resources import FloatingIP
+from cloudbridge.interfaces.resources import FloatingIpState
+from cloudbridge.interfaces.resources import GatewayState
+from cloudbridge.interfaces.resources import Instance
+from cloudbridge.interfaces.resources import InstanceState
+from cloudbridge.interfaces.resources import InternetGateway
+from cloudbridge.interfaces.resources import KeyPair
+from cloudbridge.interfaces.resources import LaunchConfig
+from cloudbridge.interfaces.resources import MachineImage
+from cloudbridge.interfaces.resources import MachineImageState
+from cloudbridge.interfaces.resources import Network
+from cloudbridge.interfaces.resources import NetworkState
+from cloudbridge.interfaces.resources import ObjectLifeCycleMixin
+from cloudbridge.interfaces.resources import PageableObjectMixin
+from cloudbridge.interfaces.resources import PlacementZone
+from cloudbridge.interfaces.resources import Region
+from cloudbridge.interfaces.resources import ResultList
+from cloudbridge.interfaces.resources import Router
+from cloudbridge.interfaces.resources import Snapshot
+from cloudbridge.interfaces.resources import SnapshotState
+from cloudbridge.interfaces.resources import Subnet
+from cloudbridge.interfaces.resources import SubnetState
+from cloudbridge.interfaces.resources import VMFirewall
+from cloudbridge.interfaces.resources import VMFirewallRule
+from cloudbridge.interfaces.resources import VMType
+from cloudbridge.interfaces.resources import Volume
+from cloudbridge.interfaces.resources import VolumeState
 
 from . import helpers as cb_helpers
 

cloudbridge/cloud/base/services.py → cloudbridge/base/services.py

@@ -3,29 +3,29 @@ Base implementation for services available through a provider
 """
 import logging
 
-from cloudbridge.cloud.interfaces.exceptions import InvalidParamException
-from cloudbridge.cloud.interfaces.resources import Network
-from cloudbridge.cloud.interfaces.services import BucketObjectService
-from cloudbridge.cloud.interfaces.services import BucketService
-from cloudbridge.cloud.interfaces.services import CloudService
-from cloudbridge.cloud.interfaces.services import ComputeService
-from cloudbridge.cloud.interfaces.services import FloatingIPService
-from cloudbridge.cloud.interfaces.services import GatewayService
-from cloudbridge.cloud.interfaces.services import ImageService
-from cloudbridge.cloud.interfaces.services import InstanceService
-from cloudbridge.cloud.interfaces.services import KeyPairService
-from cloudbridge.cloud.interfaces.services import NetworkService
-from cloudbridge.cloud.interfaces.services import NetworkingService
-from cloudbridge.cloud.interfaces.services import RegionService
-from cloudbridge.cloud.interfaces.services import RouterService
-from cloudbridge.cloud.interfaces.services import SecurityService
-from cloudbridge.cloud.interfaces.services import SnapshotService
-from cloudbridge.cloud.interfaces.services import StorageService
-from cloudbridge.cloud.interfaces.services import SubnetService
-from cloudbridge.cloud.interfaces.services import VMFirewallRuleService
-from cloudbridge.cloud.interfaces.services import VMFirewallService
-from cloudbridge.cloud.interfaces.services import VMTypeService
-from cloudbridge.cloud.interfaces.services import VolumeService
+from cloudbridge.interfaces.exceptions import InvalidParamException
+from cloudbridge.interfaces.resources import Network
+from cloudbridge.interfaces.services import BucketObjectService
+from cloudbridge.interfaces.services import BucketService
+from cloudbridge.interfaces.services import CloudService
+from cloudbridge.interfaces.services import ComputeService
+from cloudbridge.interfaces.services import FloatingIPService
+from cloudbridge.interfaces.services import GatewayService
+from cloudbridge.interfaces.services import ImageService
+from cloudbridge.interfaces.services import InstanceService
+from cloudbridge.interfaces.services import KeyPairService
+from cloudbridge.interfaces.services import NetworkService
+from cloudbridge.interfaces.services import NetworkingService
+from cloudbridge.interfaces.services import RegionService
+from cloudbridge.interfaces.services import RouterService
+from cloudbridge.interfaces.services import SecurityService
+from cloudbridge.interfaces.services import SnapshotService
+from cloudbridge.interfaces.services import StorageService
+from cloudbridge.interfaces.services import SubnetService
+from cloudbridge.interfaces.services import VMFirewallRuleService
+from cloudbridge.interfaces.services import VMFirewallService
+from cloudbridge.interfaces.services import VMTypeService
+from cloudbridge.interfaces.services import VolumeService
 
 from . import helpers as cb_helpers
 from .middleware import dispatch

cloudbridge/cloud/base/subservices.py → cloudbridge/base/subservices.py

@@ -1,10 +1,10 @@
 import logging
 
-from cloudbridge.cloud.interfaces.subservices import BucketObjectSubService
-from cloudbridge.cloud.interfaces.subservices import FloatingIPSubService
-from cloudbridge.cloud.interfaces.subservices import GatewaySubService
-from cloudbridge.cloud.interfaces.subservices import SubnetSubService
-from cloudbridge.cloud.interfaces.subservices import VMFirewallRuleSubService
+from cloudbridge.interfaces.subservices import BucketObjectSubService
+from cloudbridge.interfaces.subservices import FloatingIPSubService
+from cloudbridge.interfaces.subservices import GatewaySubService
+from cloudbridge.interfaces.subservices import SubnetSubService
+from cloudbridge.interfaces.subservices import VMFirewallRuleSubService
 
 from .resources import BasePageableObjectMixin
 

cloudbridge/cloud/__init__.py

@@ -1,2 +0,0 @@
-from .factory import CloudProviderFactory  # noqa
-from .factory import ProviderList  # noqa

cloudbridge/cloud/factory.py → cloudbridge/factory.py

@@ -4,9 +4,9 @@ import logging
 import pkgutil
 from collections import defaultdict
 
-from cloudbridge.cloud import providers
-from cloudbridge.cloud.interfaces import CloudProvider
-from cloudbridge.cloud.interfaces import TestMockHelperMixin
+from cloudbridge import providers
+from cloudbridge.interfaces import CloudProvider
+from cloudbridge.interfaces import TestMockHelperMixin
 
 
 log = logging.getLogger(__name__)
@@ -33,7 +33,7 @@ class CloudProviderFactory(object):
     def register_provider_class(self, cls):
         """
         Registers a provider class with the factory. The class must
-        inherit from cloudbridge.cloud.interfaces.CloudProvider
+        inherit from cloudbridge.interfaces.CloudProvider
         and also have a class attribute named PROVIDER_ID.
 
         The PROVIDER_ID is a user friendly name for the cloud provider,
@@ -43,7 +43,7 @@ class CloudProviderFactory(object):
         :type  cls: class
         :param cls: A class implementing the CloudProvider interface.
                     Mock providers must also implement
-                    :py:class:`cloudbridge.cloud.base.helpers.
+                    :py:class:`cloudbridge.base.helpers.
                     TestMockHelperMixin`.
         """
         if isinstance(cls, type) and issubclass(cls, CloudProvider):
@@ -64,7 +64,7 @@ class CloudProviderFactory(object):
     def discover_providers(self):
         """
         Discover all available providers within the
-        ``cloudbridge.cloud.providers`` package.
+        ``cloudbridge.providers`` package.
         Note that this methods does not guard against a failed import.
         """
         for _, modname, _ in pkgutil.iter_modules(providers.__path__):
@@ -93,7 +93,7 @@ class CloudProviderFactory(object):
         Get a list of available providers.
 
         It uses a simple automatic discovery system by iterating through all
-        submodules in cloudbridge.cloud.providers.
+        submodules in cloudbridge.providers.
 
         :rtype: dict
         :return: A dict of available providers and their implementations in the

cloudbridge/cloud/interfaces/services.py → cloudbridge/interfaces/services.py

@@ -5,7 +5,7 @@ from abc import ABCMeta
 from abc import abstractmethod
 from abc import abstractproperty
 
-from cloudbridge.cloud.interfaces.resources import PageableObjectMixin
+from cloudbridge.interfaces.resources import PageableObjectMixin
 
 
 class CloudService(object):
@@ -1358,8 +1358,8 @@ class VMFirewallRuleService(CloudService):
         Example:
 
         .. code-block:: python
-            from cloudbridge.cloud.interfaces.resources import TrafficDirection
-            from cloudbridge.cloud.interfaces.resources import BaseNetwork
+            from cloudbridge.interfaces.resources import TrafficDirection
+            from cloudbridge.interfaces.resources import BaseNetwork
 
             fw = provider.security.vm_firewalls.get('my_fw_id')
             fw.rules.create(TrafficDirection.INBOUND, protocol='tcp',

cloudbridge/cloud/interfaces/subservices.py → cloudbridge/interfaces/subservices.py

@@ -1,7 +1,7 @@
 from abc import ABCMeta
 from abc import abstractmethod
 
-from cloudbridge.cloud.interfaces.resources import PageableObjectMixin
+from cloudbridge.interfaces.resources import PageableObjectMixin
 
 
 class BucketObjectSubService(PageableObjectMixin):
@@ -232,8 +232,8 @@ class VMFirewallRuleSubService(PageableObjectMixin):
         Example:
 
         .. code-block:: python
-            from cloudbridge.cloud.interfaces.resources import TrafficDirection
-            from cloudbridge.cloud.interfaces.resources import BaseNetwork
+            from cloudbridge.interfaces.resources import TrafficDirection
+            from cloudbridge.interfaces.resources import BaseNetwork
 
             fw = provider.security.vm_firewalls.get('my_fw_id')
             fw.rules.create(TrafficDirection.INBOUND, protocol='tcp',

cloudbridge/cloud/providers/aws/helpers.py → cloudbridge/providers/aws/helpers.py

@@ -7,8 +7,8 @@ from botocore import xform_name
 from botocore.exceptions import ClientError
 from botocore.utils import merge_dicts
 
-from cloudbridge.cloud.base.resources import ClientPagedResultList
-from cloudbridge.cloud.base.resources import ServerPagedResultList
+from cloudbridge.base.resources import ClientPagedResultList
+from cloudbridge.base.resources import ServerPagedResultList
 
 
 def trim_empty_params(params_dict):

cloudbridge/cloud/providers/aws/provider.py → cloudbridge/providers/aws/provider.py

@@ -3,8 +3,8 @@ import logging as log
 
 import boto3
 
-from cloudbridge.cloud.base import BaseCloudProvider
-from cloudbridge.cloud.base.helpers import get_env
+from cloudbridge.base import BaseCloudProvider
+from cloudbridge.base.helpers import get_env
 
 from .services import AWSComputeService
 from .services import AWSNetworkingService

cloudbridge/cloud/providers/aws/resources.py → cloudbridge/providers/aws/resources.py

@@ -7,33 +7,33 @@ import logging
 
 from botocore.exceptions import ClientError
 
-from cloudbridge.cloud.base.resources import BaseAttachmentInfo
-from cloudbridge.cloud.base.resources import BaseBucket
-from cloudbridge.cloud.base.resources import BaseBucketObject
-from cloudbridge.cloud.base.resources import BaseFloatingIP
-from cloudbridge.cloud.base.resources import BaseInstance
-from cloudbridge.cloud.base.resources import BaseInternetGateway
-from cloudbridge.cloud.base.resources import BaseKeyPair
-from cloudbridge.cloud.base.resources import BaseLaunchConfig
-from cloudbridge.cloud.base.resources import BaseMachineImage
-from cloudbridge.cloud.base.resources import BaseNetwork
-from cloudbridge.cloud.base.resources import BasePlacementZone
-from cloudbridge.cloud.base.resources import BaseRegion
-from cloudbridge.cloud.base.resources import BaseRouter
-from cloudbridge.cloud.base.resources import BaseSnapshot
-from cloudbridge.cloud.base.resources import BaseSubnet
-from cloudbridge.cloud.base.resources import BaseVMFirewall
-from cloudbridge.cloud.base.resources import BaseVMFirewallRule
-from cloudbridge.cloud.base.resources import BaseVMType
-from cloudbridge.cloud.base.resources import BaseVolume
-from cloudbridge.cloud.interfaces.resources import GatewayState
-from cloudbridge.cloud.interfaces.resources import InstanceState
-from cloudbridge.cloud.interfaces.resources import MachineImageState
-from cloudbridge.cloud.interfaces.resources import NetworkState
-from cloudbridge.cloud.interfaces.resources import RouterState
-from cloudbridge.cloud.interfaces.resources import SnapshotState
-from cloudbridge.cloud.interfaces.resources import SubnetState
-from cloudbridge.cloud.interfaces.resources import VolumeState
+from cloudbridge.base.resources import BaseAttachmentInfo
+from cloudbridge.base.resources import BaseBucket
+from cloudbridge.base.resources import BaseBucketObject
+from cloudbridge.base.resources import BaseFloatingIP
+from cloudbridge.base.resources import BaseInstance
+from cloudbridge.base.resources import BaseInternetGateway
+from cloudbridge.base.resources import BaseKeyPair
+from cloudbridge.base.resources import BaseLaunchConfig
+from cloudbridge.base.resources import BaseMachineImage
+from cloudbridge.base.resources import BaseNetwork
+from cloudbridge.base.resources import BasePlacementZone
+from cloudbridge.base.resources import BaseRegion
+from cloudbridge.base.resources import BaseRouter
+from cloudbridge.base.resources import BaseSnapshot
+from cloudbridge.base.resources import BaseSubnet
+from cloudbridge.base.resources import BaseVMFirewall
+from cloudbridge.base.resources import BaseVMFirewallRule
+from cloudbridge.base.resources import BaseVMType
+from cloudbridge.base.resources import BaseVolume
+from cloudbridge.interfaces.resources import GatewayState
+from cloudbridge.interfaces.resources import InstanceState
+from cloudbridge.interfaces.resources import MachineImageState
+from cloudbridge.interfaces.resources import NetworkState
+from cloudbridge.interfaces.resources import RouterState
+from cloudbridge.interfaces.resources import SnapshotState
+from cloudbridge.interfaces.resources import SubnetState
+from cloudbridge.interfaces.resources import VolumeState
 
 from .helpers import find_tag_value
 from .helpers import trim_empty_params

cloudbridge/cloud/providers/aws/services.py → cloudbridge/providers/aws/services.py

@@ -9,42 +9,42 @@ import cachetools
 
 import requests
 
-import cloudbridge.cloud.base.helpers as cb_helpers
-from cloudbridge.cloud.base.middleware import dispatch
-from cloudbridge.cloud.base.resources import ClientPagedResultList
-from cloudbridge.cloud.base.services import BaseBucketObjectService
-from cloudbridge.cloud.base.services import BaseBucketService
-from cloudbridge.cloud.base.services import BaseComputeService
-from cloudbridge.cloud.base.services import BaseFloatingIPService
-from cloudbridge.cloud.base.services import BaseGatewayService
-from cloudbridge.cloud.base.services import BaseImageService
-from cloudbridge.cloud.base.services import BaseInstanceService
-from cloudbridge.cloud.base.services import BaseKeyPairService
-from cloudbridge.cloud.base.services import BaseNetworkService
-from cloudbridge.cloud.base.services import BaseNetworkingService
-from cloudbridge.cloud.base.services import BaseRegionService
-from cloudbridge.cloud.base.services import BaseRouterService
-from cloudbridge.cloud.base.services import BaseSecurityService
-from cloudbridge.cloud.base.services import BaseSnapshotService
-from cloudbridge.cloud.base.services import BaseStorageService
-from cloudbridge.cloud.base.services import BaseSubnetService
-from cloudbridge.cloud.base.services import BaseVMFirewallRuleService
-from cloudbridge.cloud.base.services import BaseVMFirewallService
-from cloudbridge.cloud.base.services import BaseVMTypeService
-from cloudbridge.cloud.base.services import BaseVolumeService
-from cloudbridge.cloud.interfaces.exceptions import DuplicateResourceException
-from cloudbridge.cloud.interfaces.exceptions import \
+import cloudbridge.base.helpers as cb_helpers
+from cloudbridge.base.middleware import dispatch
+from cloudbridge.base.resources import ClientPagedResultList
+from cloudbridge.base.services import BaseBucketObjectService
+from cloudbridge.base.services import BaseBucketService
+from cloudbridge.base.services import BaseComputeService
+from cloudbridge.base.services import BaseFloatingIPService
+from cloudbridge.base.services import BaseGatewayService
+from cloudbridge.base.services import BaseImageService
+from cloudbridge.base.services import BaseInstanceService
+from cloudbridge.base.services import BaseKeyPairService
+from cloudbridge.base.services import BaseNetworkService
+from cloudbridge.base.services import BaseNetworkingService
+from cloudbridge.base.services import BaseRegionService
+from cloudbridge.base.services import BaseRouterService
+from cloudbridge.base.services import BaseSecurityService
+from cloudbridge.base.services import BaseSnapshotService
+from cloudbridge.base.services import BaseStorageService
+from cloudbridge.base.services import BaseSubnetService
+from cloudbridge.base.services import BaseVMFirewallRuleService
+from cloudbridge.base.services import BaseVMFirewallService
+from cloudbridge.base.services import BaseVMTypeService
+from cloudbridge.base.services import BaseVolumeService
+from cloudbridge.interfaces.exceptions import DuplicateResourceException
+from cloudbridge.interfaces.exceptions import \
     InvalidConfigurationException
-from cloudbridge.cloud.interfaces.exceptions import InvalidParamException
-from cloudbridge.cloud.interfaces.exceptions import InvalidValueException
-from cloudbridge.cloud.interfaces.resources import KeyPair
-from cloudbridge.cloud.interfaces.resources import MachineImage
-from cloudbridge.cloud.interfaces.resources import Network
-from cloudbridge.cloud.interfaces.resources import Snapshot
-from cloudbridge.cloud.interfaces.resources import TrafficDirection
-from cloudbridge.cloud.interfaces.resources import VMFirewall
-from cloudbridge.cloud.interfaces.resources import VMType
-from cloudbridge.cloud.interfaces.resources import Volume
+from cloudbridge.interfaces.exceptions import InvalidParamException
+from cloudbridge.interfaces.exceptions import InvalidValueException
+from cloudbridge.interfaces.resources import KeyPair
+from cloudbridge.interfaces.resources import MachineImage
+from cloudbridge.interfaces.resources import Network
+from cloudbridge.interfaces.resources import Snapshot
+from cloudbridge.interfaces.resources import TrafficDirection
+from cloudbridge.interfaces.resources import VMFirewall
+from cloudbridge.interfaces.resources import VMType
+from cloudbridge.interfaces.resources import Volume
 
 from .helpers import BotoEC2Service
 from .helpers import BotoS3Service

cloudbridge/cloud/providers/aws/subservices.py → cloudbridge/providers/aws/subservices.py

@@ -1,10 +1,10 @@
 import logging
 
-from cloudbridge.cloud.base.subservices import BaseBucketObjectSubService
-from cloudbridge.cloud.base.subservices import BaseFloatingIPSubService
-from cloudbridge.cloud.base.subservices import BaseGatewaySubService
-from cloudbridge.cloud.base.subservices import BaseSubnetSubService
-from cloudbridge.cloud.base.subservices import BaseVMFirewallRuleSubService
+from cloudbridge.base.subservices import BaseBucketObjectSubService
+from cloudbridge.base.subservices import BaseFloatingIPSubService
+from cloudbridge.base.subservices import BaseGatewaySubService
+from cloudbridge.base.subservices import BaseSubnetSubService
+from cloudbridge.base.subservices import BaseVMFirewallRuleSubService
 
 log = logging.getLogger(__name__)
 

cloudbridge/cloud/providers/azure/azure_client.py → cloudbridge/providers/azure/azure_client.py

@@ -19,10 +19,10 @@ from msrestazure.azure_exceptions import CloudError
 
 import tenacity
 
-from cloudbridge.cloud.interfaces.exceptions import DuplicateResourceException
-from cloudbridge.cloud.interfaces.exceptions import InvalidLabelException
-from cloudbridge.cloud.interfaces.exceptions import ProviderConnectionException
-from cloudbridge.cloud.interfaces.exceptions import WaitStateException
+from cloudbridge.interfaces.exceptions import DuplicateResourceException
+from cloudbridge.interfaces.exceptions import InvalidLabelException
+from cloudbridge.interfaces.exceptions import ProviderConnectionException
+from cloudbridge.interfaces.exceptions import WaitStateException
 
 from . import helpers as azure_helpers
 

cloudbridge/cloud/providers/azure/helpers.py → cloudbridge/providers/azure/helpers.py

@@ -1,4 +1,4 @@
-from cloudbridge.cloud.interfaces.exceptions import InvalidValueException
+from cloudbridge.interfaces.exceptions import InvalidValueException
 
 
 # def filter_by_tag(list_items, filters):

cloudbridge/cloud/providers/azure/provider.py → cloudbridge/providers/azure/provider.py

@@ -8,14 +8,15 @@ from msrestazure.azure_exceptions import CloudError
 import tenacity
 
 import cloudbridge
-from cloudbridge.cloud.base import BaseCloudProvider
-from cloudbridge.cloud.base.helpers import get_env
-from cloudbridge.cloud.interfaces.exceptions import ProviderConnectionException
-from cloudbridge.cloud.providers.azure.azure_client import AzureClient
-from cloudbridge.cloud.providers.azure.services import AzureComputeService
-from cloudbridge.cloud.providers.azure.services import AzureNetworkingService
-from cloudbridge.cloud.providers.azure.services import AzureSecurityService
-from cloudbridge.cloud.providers.azure.services import AzureStorageService
+from cloudbridge.base import BaseCloudProvider
+from cloudbridge.base.helpers import get_env
+from cloudbridge.interfaces.exceptions import ProviderConnectionException
+from cloudbridge.providers.azure.azure_client import AzureClient
+
+from .services import AzureComputeService
+from .services import AzureNetworkingService
+from .services import AzureSecurityService
+from .services import AzureStorageService
 
 log = logging.getLogger(__name__)
 

cloudbridge/cloud/providers/azure/resources.py → cloudbridge/providers/azure/resources.py

@@ -12,34 +12,34 @@ from msrestazure.azure_exceptions import CloudError
 
 import pysftp
 
-from cloudbridge.cloud.base.resources import BaseAttachmentInfo
-from cloudbridge.cloud.base.resources import BaseBucket
-from cloudbridge.cloud.base.resources import BaseBucketObject
-from cloudbridge.cloud.base.resources import BaseFloatingIP
-from cloudbridge.cloud.base.resources import BaseInstance
-from cloudbridge.cloud.base.resources import BaseInternetGateway
-from cloudbridge.cloud.base.resources import BaseKeyPair
-from cloudbridge.cloud.base.resources import BaseLaunchConfig
-from cloudbridge.cloud.base.resources import BaseMachineImage
-from cloudbridge.cloud.base.resources import BaseNetwork
-from cloudbridge.cloud.base.resources import BasePlacementZone
-from cloudbridge.cloud.base.resources import BaseRegion
-from cloudbridge.cloud.base.resources import BaseRouter
-from cloudbridge.cloud.base.resources import BaseSnapshot
-from cloudbridge.cloud.base.resources import BaseSubnet
-from cloudbridge.cloud.base.resources import BaseVMFirewall
-from cloudbridge.cloud.base.resources import BaseVMFirewallRule
-from cloudbridge.cloud.base.resources import BaseVMType
-from cloudbridge.cloud.base.resources import BaseVolume
-from cloudbridge.cloud.interfaces import InstanceState
-from cloudbridge.cloud.interfaces import VolumeState
-from cloudbridge.cloud.interfaces.resources import Instance
-from cloudbridge.cloud.interfaces.resources import MachineImageState
-from cloudbridge.cloud.interfaces.resources import NetworkState
-from cloudbridge.cloud.interfaces.resources import RouterState
-from cloudbridge.cloud.interfaces.resources import SnapshotState
-from cloudbridge.cloud.interfaces.resources import SubnetState
-from cloudbridge.cloud.interfaces.resources import TrafficDirection
+from cloudbridge.base.resources import BaseAttachmentInfo
+from cloudbridge.base.resources import BaseBucket
+from cloudbridge.base.resources import BaseBucketObject
+from cloudbridge.base.resources import BaseFloatingIP
+from cloudbridge.base.resources import BaseInstance
+from cloudbridge.base.resources import BaseInternetGateway
+from cloudbridge.base.resources import BaseKeyPair
+from cloudbridge.base.resources import BaseLaunchConfig
+from cloudbridge.base.resources import BaseMachineImage
+from cloudbridge.base.resources import BaseNetwork
+from cloudbridge.base.resources import BasePlacementZone
+from cloudbridge.base.resources import BaseRegion
+from cloudbridge.base.resources import BaseRouter
+from cloudbridge.base.resources import BaseSnapshot
+from cloudbridge.base.resources import BaseSubnet
+from cloudbridge.base.resources import BaseVMFirewall
+from cloudbridge.base.resources import BaseVMFirewallRule
+from cloudbridge.base.resources import BaseVMType
+from cloudbridge.base.resources import BaseVolume
+from cloudbridge.interfaces import InstanceState
+from cloudbridge.interfaces import VolumeState
+from cloudbridge.interfaces.resources import Instance
+from cloudbridge.interfaces.resources import MachineImageState
+from cloudbridge.interfaces.resources import NetworkState
+from cloudbridge.interfaces.resources import RouterState
+from cloudbridge.interfaces.resources import SnapshotState
+from cloudbridge.interfaces.resources import SubnetState
+from cloudbridge.interfaces.resources import TrafficDirection
 
 from . import helpers as azure_helpers
 from .subservices import AzureBucketObjectSubService

cloudbridge/cloud/providers/azure/services.py → cloudbridge/providers/azure/services.py

@@ -7,40 +7,40 @@ from azure.mgmt.compute.models import DiskCreateOption
 
 from msrestazure.azure_exceptions import CloudError
 
-import cloudbridge.cloud.base.helpers as cb_helpers
-from cloudbridge.cloud.base.middleware import dispatch
-from cloudbridge.cloud.base.resources import ClientPagedResultList
-from cloudbridge.cloud.base.resources import ServerPagedResultList
-from cloudbridge.cloud.base.services import BaseBucketObjectService
-from cloudbridge.cloud.base.services import BaseBucketService
-from cloudbridge.cloud.base.services import BaseComputeService
-from cloudbridge.cloud.base.services import BaseFloatingIPService
-from cloudbridge.cloud.base.services import BaseGatewayService
-from cloudbridge.cloud.base.services import BaseImageService
-from cloudbridge.cloud.base.services import BaseInstanceService
-from cloudbridge.cloud.base.services import BaseKeyPairService
-from cloudbridge.cloud.base.services import BaseNetworkService
-from cloudbridge.cloud.base.services import BaseNetworkingService
-from cloudbridge.cloud.base.services import BaseRegionService
-from cloudbridge.cloud.base.services import BaseRouterService
-from cloudbridge.cloud.base.services import BaseSecurityService
-from cloudbridge.cloud.base.services import BaseSnapshotService
-from cloudbridge.cloud.base.services import BaseStorageService
-from cloudbridge.cloud.base.services import BaseSubnetService
-from cloudbridge.cloud.base.services import BaseVMFirewallRuleService
-from cloudbridge.cloud.base.services import BaseVMFirewallService
-from cloudbridge.cloud.base.services import BaseVMTypeService
-from cloudbridge.cloud.base.services import BaseVolumeService
-from cloudbridge.cloud.interfaces.exceptions import DuplicateResourceException
-from cloudbridge.cloud.interfaces.exceptions import InvalidParamException
-from cloudbridge.cloud.interfaces.exceptions import InvalidValueException
-from cloudbridge.cloud.interfaces.resources import MachineImage
-from cloudbridge.cloud.interfaces.resources import Network
-from cloudbridge.cloud.interfaces.resources import Snapshot
-from cloudbridge.cloud.interfaces.resources import TrafficDirection
-from cloudbridge.cloud.interfaces.resources import VMFirewall
-from cloudbridge.cloud.interfaces.resources import VMType
-from cloudbridge.cloud.interfaces.resources import Volume
+import cloudbridge.base.helpers as cb_helpers
+from cloudbridge.base.middleware import dispatch
+from cloudbridge.base.resources import ClientPagedResultList
+from cloudbridge.base.resources import ServerPagedResultList
+from cloudbridge.base.services import BaseBucketObjectService
+from cloudbridge.base.services import BaseBucketService
+from cloudbridge.base.services import BaseComputeService
+from cloudbridge.base.services import BaseFloatingIPService
+from cloudbridge.base.services import BaseGatewayService
+from cloudbridge.base.services import BaseImageService
+from cloudbridge.base.services import BaseInstanceService
+from cloudbridge.base.services import BaseKeyPairService
+from cloudbridge.base.services import BaseNetworkService
+from cloudbridge.base.services import BaseNetworkingService
+from cloudbridge.base.services import BaseRegionService
+from cloudbridge.base.services import BaseRouterService
+from cloudbridge.base.services import BaseSecurityService
+from cloudbridge.base.services import BaseSnapshotService
+from cloudbridge.base.services import BaseStorageService
+from cloudbridge.base.services import BaseSubnetService
+from cloudbridge.base.services import BaseVMFirewallRuleService
+from cloudbridge.base.services import BaseVMFirewallService
+from cloudbridge.base.services import BaseVMTypeService
+from cloudbridge.base.services import BaseVolumeService
+from cloudbridge.interfaces.exceptions import DuplicateResourceException
+from cloudbridge.interfaces.exceptions import InvalidParamException
+from cloudbridge.interfaces.exceptions import InvalidValueException
+from cloudbridge.interfaces.resources import MachineImage
+from cloudbridge.interfaces.resources import Network
+from cloudbridge.interfaces.resources import Snapshot
+from cloudbridge.interfaces.resources import TrafficDirection
+from cloudbridge.interfaces.resources import VMFirewall
+from cloudbridge.interfaces.resources import VMType
+from cloudbridge.interfaces.resources import Volume
 
 from .resources import AzureBucket
 from .resources import AzureBucketObject

cloudbridge/cloud/providers/azure/subservices.py → cloudbridge/providers/azure/subservices.py

@@ -1,10 +1,10 @@
 import logging
 
-from cloudbridge.cloud.base.subservices import BaseBucketObjectSubService
-from cloudbridge.cloud.base.subservices import BaseFloatingIPSubService
-from cloudbridge.cloud.base.subservices import BaseGatewaySubService
-from cloudbridge.cloud.base.subservices import BaseSubnetSubService
-from cloudbridge.cloud.base.subservices import BaseVMFirewallRuleSubService
+from cloudbridge.base.subservices import BaseBucketObjectSubService
+from cloudbridge.base.subservices import BaseFloatingIPSubService
+from cloudbridge.base.subservices import BaseGatewaySubService
+from cloudbridge.base.subservices import BaseSubnetSubService
+from cloudbridge.base.subservices import BaseVMFirewallRuleSubService
 
 log = logging.getLogger(__name__)
 

cloudbridge/cloud/providers/gcp/helpers.py → cloudbridge/providers/gcp/helpers.py

@@ -4,7 +4,7 @@ from googleapiclient.errors import HttpError
 
 import tenacity
 
-from cloudbridge.cloud.interfaces.exceptions import ProviderInternalException
+from cloudbridge.interfaces.exceptions import ProviderInternalException
 
 
 def gcp_projects(provider):

cloudbridge/cloud/providers/gcp/provider.py → cloudbridge/providers/gcp/provider.py

@@ -15,8 +15,8 @@ from googleapiclient import discovery
 from oauth2client.client import GoogleCredentials
 from oauth2client.service_account import ServiceAccountCredentials
 
-from cloudbridge.cloud.base import BaseCloudProvider
-from cloudbridge.cloud.interfaces.exceptions import ProviderConnectionException
+from cloudbridge.base import BaseCloudProvider
+from cloudbridge.interfaces.exceptions import ProviderConnectionException
 
 from .services import GCPComputeService
 from .services import GCPNetworkingService

cloudbridge/cloud/providers/gcp/resources.py → cloudbridge/providers/gcp/resources.py

@@ -15,34 +15,34 @@ from collections import namedtuple
 
 import googleapiclient
 
-from cloudbridge.cloud.base.resources import BaseAttachmentInfo
-from cloudbridge.cloud.base.resources import BaseBucket
-from cloudbridge.cloud.base.resources import BaseBucketObject
-from cloudbridge.cloud.base.resources import BaseFloatingIP
-from cloudbridge.cloud.base.resources import BaseInstance
-from cloudbridge.cloud.base.resources import BaseInternetGateway
-from cloudbridge.cloud.base.resources import BaseKeyPair
-from cloudbridge.cloud.base.resources import BaseLaunchConfig
-from cloudbridge.cloud.base.resources import BaseMachineImage
-from cloudbridge.cloud.base.resources import BaseNetwork
-from cloudbridge.cloud.base.resources import BasePlacementZone
-from cloudbridge.cloud.base.resources import BaseRegion
-from cloudbridge.cloud.base.resources import BaseRouter
-from cloudbridge.cloud.base.resources import BaseSnapshot
-from cloudbridge.cloud.base.resources import BaseSubnet
-from cloudbridge.cloud.base.resources import BaseVMFirewall
-from cloudbridge.cloud.base.resources import BaseVMFirewallRule
-from cloudbridge.cloud.base.resources import BaseVMType
-from cloudbridge.cloud.base.resources import BaseVolume
-from cloudbridge.cloud.interfaces.resources import GatewayState
-from cloudbridge.cloud.interfaces.resources import InstanceState
-from cloudbridge.cloud.interfaces.resources import MachineImageState
-from cloudbridge.cloud.interfaces.resources import NetworkState
-from cloudbridge.cloud.interfaces.resources import RouterState
-from cloudbridge.cloud.interfaces.resources import SnapshotState
-from cloudbridge.cloud.interfaces.resources import SubnetState
-from cloudbridge.cloud.interfaces.resources import TrafficDirection
-from cloudbridge.cloud.interfaces.resources import VolumeState
+from cloudbridge.base.resources import BaseAttachmentInfo
+from cloudbridge.base.resources import BaseBucket
+from cloudbridge.base.resources import BaseBucketObject
+from cloudbridge.base.resources import BaseFloatingIP
+from cloudbridge.base.resources import BaseInstance
+from cloudbridge.base.resources import BaseInternetGateway
+from cloudbridge.base.resources import BaseKeyPair
+from cloudbridge.base.resources import BaseLaunchConfig
+from cloudbridge.base.resources import BaseMachineImage
+from cloudbridge.base.resources import BaseNetwork
+from cloudbridge.base.resources import BasePlacementZone
+from cloudbridge.base.resources import BaseRegion
+from cloudbridge.base.resources import BaseRouter
+from cloudbridge.base.resources import BaseSnapshot
+from cloudbridge.base.resources import BaseSubnet
+from cloudbridge.base.resources import BaseVMFirewall
+from cloudbridge.base.resources import BaseVMFirewallRule
+from cloudbridge.base.resources import BaseVMType
+from cloudbridge.base.resources import BaseVolume
+from cloudbridge.interfaces.resources import GatewayState
+from cloudbridge.interfaces.resources import InstanceState
+from cloudbridge.interfaces.resources import MachineImageState
+from cloudbridge.interfaces.resources import NetworkState
+from cloudbridge.interfaces.resources import RouterState
+from cloudbridge.interfaces.resources import SnapshotState
+from cloudbridge.interfaces.resources import SubnetState
+from cloudbridge.interfaces.resources import TrafficDirection
+from cloudbridge.interfaces.resources import VolumeState
 
 from . import helpers
 from .subservices import GCPBucketObjectSubService

cloudbridge/cloud/providers/gcp/services.py → cloudbridge/providers/gcp/services.py

@@ -7,35 +7,35 @@ import uuid
 
 import googleapiclient
 
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.base.middleware import dispatch
-from cloudbridge.cloud.base.resources import ClientPagedResultList
-from cloudbridge.cloud.base.resources import ServerPagedResultList
-from cloudbridge.cloud.base.services import BaseBucketObjectService
-from cloudbridge.cloud.base.services import BaseBucketService
-from cloudbridge.cloud.base.services import BaseComputeService
-from cloudbridge.cloud.base.services import BaseFloatingIPService
-from cloudbridge.cloud.base.services import BaseGatewayService
-from cloudbridge.cloud.base.services import BaseImageService
-from cloudbridge.cloud.base.services import BaseInstanceService
-from cloudbridge.cloud.base.services import BaseKeyPairService
-from cloudbridge.cloud.base.services import BaseNetworkService
-from cloudbridge.cloud.base.services import BaseNetworkingService
-from cloudbridge.cloud.base.services import BaseRegionService
-from cloudbridge.cloud.base.services import BaseRouterService
-from cloudbridge.cloud.base.services import BaseSecurityService
-from cloudbridge.cloud.base.services import BaseSnapshotService
-from cloudbridge.cloud.base.services import BaseStorageService
-from cloudbridge.cloud.base.services import BaseSubnetService
-from cloudbridge.cloud.base.services import BaseVMFirewallRuleService
-from cloudbridge.cloud.base.services import BaseVMFirewallService
-from cloudbridge.cloud.base.services import BaseVMTypeService
-from cloudbridge.cloud.base.services import BaseVolumeService
-from cloudbridge.cloud.interfaces.exceptions import DuplicateResourceException
-from cloudbridge.cloud.interfaces.exceptions import InvalidParamException
-from cloudbridge.cloud.interfaces.resources import TrafficDirection
-from cloudbridge.cloud.interfaces.resources import VMFirewall
-from cloudbridge.cloud.providers.gcp import helpers
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.base.middleware import dispatch
+from cloudbridge.base.resources import ClientPagedResultList
+from cloudbridge.base.resources import ServerPagedResultList
+from cloudbridge.base.services import BaseBucketObjectService
+from cloudbridge.base.services import BaseBucketService
+from cloudbridge.base.services import BaseComputeService
+from cloudbridge.base.services import BaseFloatingIPService
+from cloudbridge.base.services import BaseGatewayService
+from cloudbridge.base.services import BaseImageService
+from cloudbridge.base.services import BaseInstanceService
+from cloudbridge.base.services import BaseKeyPairService
+from cloudbridge.base.services import BaseNetworkService
+from cloudbridge.base.services import BaseNetworkingService
+from cloudbridge.base.services import BaseRegionService
+from cloudbridge.base.services import BaseRouterService
+from cloudbridge.base.services import BaseSecurityService
+from cloudbridge.base.services import BaseSnapshotService
+from cloudbridge.base.services import BaseStorageService
+from cloudbridge.base.services import BaseSubnetService
+from cloudbridge.base.services import BaseVMFirewallRuleService
+from cloudbridge.base.services import BaseVMFirewallService
+from cloudbridge.base.services import BaseVMTypeService
+from cloudbridge.base.services import BaseVolumeService
+from cloudbridge.interfaces.exceptions import DuplicateResourceException
+from cloudbridge.interfaces.exceptions import InvalidParamException
+from cloudbridge.interfaces.resources import TrafficDirection
+from cloudbridge.interfaces.resources import VMFirewall
+from cloudbridge.providers.gcp import helpers
 
 from .resources import GCPBucket
 from .resources import GCPBucketObject

cloudbridge/cloud/providers/gcp/subservices.py → cloudbridge/providers/gcp/subservices.py

@@ -1,10 +1,10 @@
 import logging
 
-from cloudbridge.cloud.base.subservices import BaseBucketObjectSubService
-from cloudbridge.cloud.base.subservices import BaseFloatingIPSubService
-from cloudbridge.cloud.base.subservices import BaseGatewaySubService
-from cloudbridge.cloud.base.subservices import BaseSubnetSubService
-from cloudbridge.cloud.base.subservices import BaseVMFirewallRuleSubService
+from cloudbridge.base.subservices import BaseBucketObjectSubService
+from cloudbridge.base.subservices import BaseFloatingIPSubService
+from cloudbridge.base.subservices import BaseGatewaySubService
+from cloudbridge.base.subservices import BaseSubnetSubService
+from cloudbridge.base.subservices import BaseVMFirewallRuleSubService
 
 
 log = logging.getLogger(__name__)

cloudbridge/cloud/providers/openstack/helpers.py → cloudbridge/providers/openstack/helpers.py

@@ -4,7 +4,7 @@ Helper functions
 import itertools
 import logging as log
 
-from cloudbridge.cloud.base.resources import ServerPagedResultList
+from cloudbridge.base.resources import ServerPagedResultList
 
 
 def os_result_limit(provider, requested_limit=None):

cloudbridge/cloud/providers/openstack/provider.py → cloudbridge/providers/openstack/provider.py

@@ -17,8 +17,8 @@ from openstack import connection
 
 from swiftclient import client as swift_client
 
-from cloudbridge.cloud.base import BaseCloudProvider
-from cloudbridge.cloud.base.helpers import get_env
+from cloudbridge.base import BaseCloudProvider
+from cloudbridge.base.helpers import get_env
 
 from .services import OpenStackComputeService
 from .services import OpenStackNetworkingService

cloudbridge/cloud/providers/openstack/resources.py → cloudbridge/providers/openstack/resources.py

@@ -23,33 +23,33 @@ from swiftclient.service import SwiftService
 from swiftclient.service import SwiftUploadObject
 from swiftclient.utils import generate_temp_url
 
-from cloudbridge.cloud.base.resources import BaseAttachmentInfo
-from cloudbridge.cloud.base.resources import BaseBucket
-from cloudbridge.cloud.base.resources import BaseBucketObject
-from cloudbridge.cloud.base.resources import BaseFloatingIP
-from cloudbridge.cloud.base.resources import BaseInstance
-from cloudbridge.cloud.base.resources import BaseInternetGateway
-from cloudbridge.cloud.base.resources import BaseKeyPair
-from cloudbridge.cloud.base.resources import BaseMachineImage
-from cloudbridge.cloud.base.resources import BaseNetwork
-from cloudbridge.cloud.base.resources import BasePlacementZone
-from cloudbridge.cloud.base.resources import BaseRegion
-from cloudbridge.cloud.base.resources import BaseRouter
-from cloudbridge.cloud.base.resources import BaseSnapshot
-from cloudbridge.cloud.base.resources import BaseSubnet
-from cloudbridge.cloud.base.resources import BaseVMFirewall
-from cloudbridge.cloud.base.resources import BaseVMFirewallRule
-from cloudbridge.cloud.base.resources import BaseVMType
-from cloudbridge.cloud.base.resources import BaseVolume
-from cloudbridge.cloud.interfaces.resources import GatewayState
-from cloudbridge.cloud.interfaces.resources import InstanceState
-from cloudbridge.cloud.interfaces.resources import MachineImageState
-from cloudbridge.cloud.interfaces.resources import NetworkState
-from cloudbridge.cloud.interfaces.resources import RouterState
-from cloudbridge.cloud.interfaces.resources import SnapshotState
-from cloudbridge.cloud.interfaces.resources import SubnetState
-from cloudbridge.cloud.interfaces.resources import TrafficDirection
-from cloudbridge.cloud.interfaces.resources import VolumeState
+from cloudbridge.base.resources import BaseAttachmentInfo
+from cloudbridge.base.resources import BaseBucket
+from cloudbridge.base.resources import BaseBucketObject
+from cloudbridge.base.resources import BaseFloatingIP
+from cloudbridge.base.resources import BaseInstance
+from cloudbridge.base.resources import BaseInternetGateway
+from cloudbridge.base.resources import BaseKeyPair
+from cloudbridge.base.resources import BaseMachineImage
+from cloudbridge.base.resources import BaseNetwork
+from cloudbridge.base.resources import BasePlacementZone
+from cloudbridge.base.resources import BaseRegion
+from cloudbridge.base.resources import BaseRouter
+from cloudbridge.base.resources import BaseSnapshot
+from cloudbridge.base.resources import BaseSubnet
+from cloudbridge.base.resources import BaseVMFirewall
+from cloudbridge.base.resources import BaseVMFirewallRule
+from cloudbridge.base.resources import BaseVMType
+from cloudbridge.base.resources import BaseVolume
+from cloudbridge.interfaces.resources import GatewayState
+from cloudbridge.interfaces.resources import InstanceState
+from cloudbridge.interfaces.resources import MachineImageState
+from cloudbridge.interfaces.resources import NetworkState
+from cloudbridge.interfaces.resources import RouterState
+from cloudbridge.interfaces.resources import SnapshotState
+from cloudbridge.interfaces.resources import SubnetState
+from cloudbridge.interfaces.resources import TrafficDirection
+from cloudbridge.interfaces.resources import VolumeState
 
 from .subservices import OpenStackBucketObjectSubService
 from .subservices import OpenStackFloatingIPSubService

cloudbridge/cloud/providers/openstack/services.py → cloudbridge/providers/openstack/services.py

@@ -16,43 +16,43 @@ from openstack.exceptions import ResourceNotFound
 
 from swiftclient import ClientException as SwiftClientException
 
-import cloudbridge.cloud.base.helpers as cb_helpers
-from cloudbridge.cloud.base.middleware import dispatch
-from cloudbridge.cloud.base.resources import BaseLaunchConfig
-from cloudbridge.cloud.base.resources import ClientPagedResultList
-from cloudbridge.cloud.base.services import BaseBucketObjectService
-from cloudbridge.cloud.base.services import BaseBucketService
-from cloudbridge.cloud.base.services import BaseComputeService
-from cloudbridge.cloud.base.services import BaseFloatingIPService
-from cloudbridge.cloud.base.services import BaseGatewayService
-from cloudbridge.cloud.base.services import BaseImageService
-from cloudbridge.cloud.base.services import BaseInstanceService
-from cloudbridge.cloud.base.services import BaseKeyPairService
-from cloudbridge.cloud.base.services import BaseNetworkService
-from cloudbridge.cloud.base.services import BaseNetworkingService
-from cloudbridge.cloud.base.services import BaseRegionService
-from cloudbridge.cloud.base.services import BaseRouterService
-from cloudbridge.cloud.base.services import BaseSecurityService
-from cloudbridge.cloud.base.services import BaseSnapshotService
-from cloudbridge.cloud.base.services import BaseStorageService
-from cloudbridge.cloud.base.services import BaseSubnetService
-from cloudbridge.cloud.base.services import BaseVMFirewallRuleService
-from cloudbridge.cloud.base.services import BaseVMFirewallService
-from cloudbridge.cloud.base.services import BaseVMTypeService
-from cloudbridge.cloud.base.services import BaseVolumeService
-from cloudbridge.cloud.interfaces.exceptions \
+import cloudbridge.base.helpers as cb_helpers
+from cloudbridge.base.middleware import dispatch
+from cloudbridge.base.resources import BaseLaunchConfig
+from cloudbridge.base.resources import ClientPagedResultList
+from cloudbridge.base.services import BaseBucketObjectService
+from cloudbridge.base.services import BaseBucketService
+from cloudbridge.base.services import BaseComputeService
+from cloudbridge.base.services import BaseFloatingIPService
+from cloudbridge.base.services import BaseGatewayService
+from cloudbridge.base.services import BaseImageService
+from cloudbridge.base.services import BaseInstanceService
+from cloudbridge.base.services import BaseKeyPairService
+from cloudbridge.base.services import BaseNetworkService
+from cloudbridge.base.services import BaseNetworkingService
+from cloudbridge.base.services import BaseRegionService
+from cloudbridge.base.services import BaseRouterService
+from cloudbridge.base.services import BaseSecurityService
+from cloudbridge.base.services import BaseSnapshotService
+from cloudbridge.base.services import BaseStorageService
+from cloudbridge.base.services import BaseSubnetService
+from cloudbridge.base.services import BaseVMFirewallRuleService
+from cloudbridge.base.services import BaseVMFirewallService
+from cloudbridge.base.services import BaseVMTypeService
+from cloudbridge.base.services import BaseVolumeService
+from cloudbridge.interfaces.exceptions \
     import DuplicateResourceException
-from cloudbridge.cloud.interfaces.exceptions import InvalidParamException
-from cloudbridge.cloud.interfaces.exceptions import InvalidValueException
-from cloudbridge.cloud.interfaces.resources import KeyPair
-from cloudbridge.cloud.interfaces.resources import MachineImage
-from cloudbridge.cloud.interfaces.resources import Network
-from cloudbridge.cloud.interfaces.resources import Snapshot
-from cloudbridge.cloud.interfaces.resources import Subnet
-from cloudbridge.cloud.interfaces.resources import TrafficDirection
-from cloudbridge.cloud.interfaces.resources import VMFirewall
-from cloudbridge.cloud.interfaces.resources import VMType
-from cloudbridge.cloud.interfaces.resources import Volume
+from cloudbridge.interfaces.exceptions import InvalidParamException
+from cloudbridge.interfaces.exceptions import InvalidValueException
+from cloudbridge.interfaces.resources import KeyPair
+from cloudbridge.interfaces.resources import MachineImage
+from cloudbridge.interfaces.resources import Network
+from cloudbridge.interfaces.resources import Snapshot
+from cloudbridge.interfaces.resources import Subnet
+from cloudbridge.interfaces.resources import TrafficDirection
+from cloudbridge.interfaces.resources import VMFirewall
+from cloudbridge.interfaces.resources import VMType
+from cloudbridge.interfaces.resources import Volume
 
 from . import helpers as oshelpers
 from .resources import OpenStackBucket

cloudbridge/cloud/providers/openstack/subservices.py → cloudbridge/providers/openstack/subservices.py

@@ -1,10 +1,10 @@
 import logging
 
-from cloudbridge.cloud.base.subservices import BaseBucketObjectSubService
-from cloudbridge.cloud.base.subservices import BaseFloatingIPSubService
-from cloudbridge.cloud.base.subservices import BaseGatewaySubService
-from cloudbridge.cloud.base.subservices import BaseSubnetSubService
-from cloudbridge.cloud.base.subservices import BaseVMFirewallRuleSubService
+from cloudbridge.base.subservices import BaseBucketObjectSubService
+from cloudbridge.base.subservices import BaseFloatingIPSubService
+from cloudbridge.base.subservices import BaseGatewaySubService
+from cloudbridge.base.subservices import BaseSubnetSubService
+from cloudbridge.base.subservices import BaseVMFirewallRuleSubService
 
 
 log = logging.getLogger(__name__)

docs/api_docs/cloud/exceptions.rst

@@ -5,30 +5,30 @@ Exceptions
 
 CloudBridgeBaseException
 ------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.exceptions.CloudBridgeBaseException
+.. autoclass:: cloudbridge.interfaces.exceptions.CloudBridgeBaseException
     :members:
 
 WaitStateException
 ------------------
-.. autoclass:: cloudbridge.cloud.interfaces.exceptions.WaitStateException
+.. autoclass:: cloudbridge.interfaces.exceptions.WaitStateException
     :members:
 
 InvalidConfigurationException
 -----------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.exceptions.InvalidConfigurationException
+.. autoclass:: cloudbridge.interfaces.exceptions.InvalidConfigurationException
     :members:
 
 ProviderConnectionException
 -----------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.exceptions.ProviderConnectionException
+.. autoclass:: cloudbridge.interfaces.exceptions.ProviderConnectionException
     :members:
 
 InvalidLabelException
 -----------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.exceptions.InvalidLabelException
+.. autoclass:: cloudbridge.interfaces.exceptions.InvalidLabelException
     :members:
 
 InvalidValueException
 -----------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.exceptions.InvalidValueException
+.. autoclass:: cloudbridge.interfaces.exceptions.InvalidValueException
     :members:

docs/api_docs/cloud/providers.rst

@@ -3,11 +3,11 @@ Providers
 
 CloudProvider
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.provider.CloudProvider
+.. autoclass:: cloudbridge.interfaces.provider.CloudProvider
     :members:
     :special-members: __init__
 
 ContainerProvider
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.provider.ContainerProvider
+.. autoclass:: cloudbridge.interfaces.provider.ContainerProvider
     :members:

docs/api_docs/cloud/resources.rst

@@ -5,166 +5,166 @@ Resources
 
 CloudServiceType
 ------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.CloudServiceType
+.. autoclass:: cloudbridge.interfaces.resources.CloudServiceType
     :members:
 
 CloudResource
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.CloudResource
+.. autoclass:: cloudbridge.interfaces.resources.CloudResource
     :members:
 
 Configuration
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Configuration
+.. autoclass:: cloudbridge.interfaces.resources.Configuration
     :members:
 
 ObjectLifeCycleMixin
 --------------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.ObjectLifeCycleMixin
+.. autoclass:: cloudbridge.interfaces.resources.ObjectLifeCycleMixin
     :members:
 
 PageableObjectMixin
 --------------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.PageableObjectMixin
+.. autoclass:: cloudbridge.interfaces.resources.PageableObjectMixin
     :members:
 
 ResultList
 ----------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.ResultList
+.. autoclass:: cloudbridge.interfaces.resources.ResultList
     :members:
 
 InstanceState
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.InstanceState
+.. autoclass:: cloudbridge.interfaces.resources.InstanceState
     :members:
 
 Instance
 --------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Instance
+.. autoclass:: cloudbridge.interfaces.resources.Instance
     :members:
 
 MachineImageState
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.MachineImageState
+.. autoclass:: cloudbridge.interfaces.resources.MachineImageState
     :members:
 
 LaunchConfig
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.LaunchConfig
+.. autoclass:: cloudbridge.interfaces.resources.LaunchConfig
     :members:
 
 MachineImage
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.MachineImage
+.. autoclass:: cloudbridge.interfaces.resources.MachineImage
     :members:
 
 NetworkState
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.NetworkState
+.. autoclass:: cloudbridge.interfaces.resources.NetworkState
     :members:
 
 Network
 -------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Network
+.. autoclass:: cloudbridge.interfaces.resources.Network
     :members:
 
 SubnetState
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.SubnetState
+.. autoclass:: cloudbridge.interfaces.resources.SubnetState
     :members:
 
 Subnet
 ------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Subnet
+.. autoclass:: cloudbridge.interfaces.resources.Subnet
     :members:
 
 FloatingIP
 ----------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.FloatingIP
+.. autoclass:: cloudbridge.interfaces.resources.FloatingIP
     :members:
 
 RouterState
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.RouterState
+.. autoclass:: cloudbridge.interfaces.resources.RouterState
     :members:
 
 Router
 ------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Router
+.. autoclass:: cloudbridge.interfaces.resources.Router
     :members:
 
 Gateway
 --------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Gateway
+.. autoclass:: cloudbridge.interfaces.resources.Gateway
     :members:
 
 InternetGateway
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.InternetGateway
+.. autoclass:: cloudbridge.interfaces.resources.InternetGateway
     :members:
 
 VolumeState
 -----------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.VolumeState
+.. autoclass:: cloudbridge.interfaces.resources.VolumeState
     :members:
 
 Volume
 ------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Volume
+.. autoclass:: cloudbridge.interfaces.resources.Volume
     :members:
 
 SnapshotState
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.SnapshotState
+.. autoclass:: cloudbridge.interfaces.resources.SnapshotState
     :members:
 
 Snapshot
 --------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Snapshot
+.. autoclass:: cloudbridge.interfaces.resources.Snapshot
     :members:
 
 KeyPair
 -------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.KeyPair
+.. autoclass:: cloudbridge.interfaces.resources.KeyPair
     :members:
 
 Region
 ------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Region
+.. autoclass:: cloudbridge.interfaces.resources.Region
     :members:
 
 PlacementZone
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.PlacementZone
+.. autoclass:: cloudbridge.interfaces.resources.PlacementZone
     :members:
 
 VMType
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.VMType
+.. autoclass:: cloudbridge.interfaces.resources.VMType
     :members:
 
 VMFirewall
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.VMFirewall
+.. autoclass:: cloudbridge.interfaces.resources.VMFirewall
     :members:
 
 VMFirewallRule
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.VMFirewallRule
+.. autoclass:: cloudbridge.interfaces.resources.VMFirewallRule
     :members:
     :undoc-members:
 
 TrafficDirection
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.TrafficDirection
+.. autoclass:: cloudbridge.interfaces.resources.TrafficDirection
     :members:
 
 BucketObject
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.BucketObject
+.. autoclass:: cloudbridge.interfaces.resources.BucketObject
     :members:
 
 Bucket
 ---------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.Bucket
+.. autoclass:: cloudbridge.interfaces.resources.Bucket
     :members:

docs/api_docs/cloud/services.rst

@@ -5,95 +5,95 @@ Services
 
 CloudService
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.CloudService
+.. autoclass:: cloudbridge.interfaces.services.CloudService
     :members:
 
 ComputeService
 --------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.ComputeService
+.. autoclass:: cloudbridge.interfaces.services.ComputeService
     :members:
 
 InstanceService
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.InstanceService
+.. autoclass:: cloudbridge.interfaces.services.InstanceService
     :members:
 
 VolumeService
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.VolumeService
+.. autoclass:: cloudbridge.interfaces.services.VolumeService
     :members:
 
 SnapshotService
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.SnapshotService
+.. autoclass:: cloudbridge.interfaces.services.SnapshotService
     :members:
 
 StorageService
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.StorageService
+.. autoclass:: cloudbridge.interfaces.services.StorageService
     :members:
 
 ImageService
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.ImageService
+.. autoclass:: cloudbridge.interfaces.services.ImageService
     :members:
 
 NetworkingService
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.NetworkingService
+.. autoclass:: cloudbridge.interfaces.services.NetworkingService
     :members:
 
 NetworkService
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.NetworkService
+.. autoclass:: cloudbridge.interfaces.services.NetworkService
     :members:
 
 SubnetService
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.SubnetService
+.. autoclass:: cloudbridge.interfaces.services.SubnetService
     :members:
 
 FloatingIPService
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.FloatingIPSubService
+.. autoclass:: cloudbridge.interfaces.resources.FloatingIPSubService
     :members:
 
 RouterService
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.RouterService
+.. autoclass:: cloudbridge.interfaces.services.RouterService
     :members:
 
 GatewayService
 -----------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.GatewaySubService
+.. autoclass:: cloudbridge.interfaces.resources.GatewaySubService
     :members:
 
 BucketService
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.BucketService
+.. autoclass:: cloudbridge.interfaces.services.BucketService
     :members:
 
 SecurityService
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.SecurityService
+.. autoclass:: cloudbridge.interfaces.services.SecurityService
     :members:
 
 KeyPairService
 --------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.KeyPairService
+.. autoclass:: cloudbridge.interfaces.services.KeyPairService
     :members:
 
 VMFirewallService
 --------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.VMFirewallService
+.. autoclass:: cloudbridge.interfaces.services.VMFirewallService
     :members:
 
 VMTypeService
 --------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.VMTypeService
+.. autoclass:: cloudbridge.interfaces.services.VMTypeService
     :members:
 
 RegionService
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.RegionService
+.. autoclass:: cloudbridge.interfaces.services.RegionService
     :members:

docs/getting_started.rst

@@ -28,7 +28,7 @@ AWS:
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     config = {'aws_access_key': 'AKIAJW2XCYO4AF55XFEQ',
               'aws_secret_key': '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'}
@@ -39,7 +39,7 @@ OpenStack (with Keystone authentication v2):
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     config = {'os_username': 'username',
               'os_password': 'password',
@@ -54,7 +54,7 @@ OpenStack (with Keystone authentication v3):
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     config = {'os_username': 'username',
               'os_password': 'password',
@@ -70,7 +70,7 @@ Azure:
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     config = {'azure_subscription_id': 'REPLACE WITH ACTUAL VALUE',
               'azure_client_id': 'REPLACE WITH ACTUAL VALUE',
@@ -83,7 +83,7 @@ Google Compute Cloud:
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     config = {'gcp_project_name': 'project name',
               'gcp_service_creds_file': 'service_file.json',
@@ -147,7 +147,7 @@ a private network.
 
 .. code-block:: python
 
-    from cloudbridge.cloud.interfaces.resources import TrafficDirection
+    from cloudbridge.interfaces.resources import TrafficDirection
     fw = provider.security.vm_firewalls.create(
         label='cb-firewall', description='A VM firewall used by
         CloudBridge', network=net)
@@ -269,7 +269,7 @@ To wrap things up, let's clean up all the resources we have created
 
 .. code-block:: python
 
-    from cloudbridge.cloud.interfaces import InstanceState
+    from cloudbridge.interfaces import InstanceState
     inst.delete()
     inst.wait_for([InstanceState.DELETED, InstanceState.UNKNOWN],
                    terminal_states=[InstanceState.ERROR])  # Blocking call

docs/index.rst

@@ -18,7 +18,7 @@ look like the following.
 
 .. code-block:: python
 
-	from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+	from cloudbridge.factory import CloudProviderFactory, ProviderList
 
 	provider = CloudProviderFactory().create_provider(ProviderList.AWS, {})
 	print(provider.compute.instances.list())

docs/topics/event_system.rst

@@ -69,7 +69,7 @@ wishes to extend the chain of handlers with their own code:
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     provider = CloudProviderFactory().create_provider(ProviderList.FIRST, {})
     id = 'thisIsAnID'
@@ -81,7 +81,7 @@ can do so without modifying CloudBridge code:
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     provider = CloudProviderFactory().create_provider(ProviderList.AZURE, {})
 

docs/topics/provider_development.rst

@@ -17,7 +17,7 @@ add a class variable named ``PROVIDER_ID``.
 
 .. code-block:: python
 
-    from cloudbridge.cloud.base import BaseCloudProvider
+    from cloudbridge.base import BaseCloudProvider
 
 
     class GCPCloudProvider(BaseCloudProvider):
@@ -94,7 +94,7 @@ Service in turn.
 
 .. code-block:: python
 
-    from cloudbridge.cloud.base.services import BaseSecurityService
+    from cloudbridge.base.services import BaseSecurityService
 
 
     class GCPSecurityService(BaseSecurityService):
@@ -137,9 +137,9 @@ next implement these services.
 
 .. code-block:: python
 
-    from cloudbridge.cloud.base.services import BaseKeyPairService
-    from cloudbridge.cloud.base.services import BaseSecurityGroupService
-    from cloudbridge.cloud.base.services import BaseSecurityService
+    from cloudbridge.base.services import BaseKeyPairService
+    from cloudbridge.base.services import BaseSecurityGroupService
+    from cloudbridge.base.services import BaseSecurityService
 
 
     class GCPSecurityService(BaseSecurityService):

docs/topics/setup.rst

@@ -21,7 +21,7 @@ will override environment values.
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     ## For AWS
     config = {'aws_access_key' : '<your_access_key>',
@@ -268,7 +268,7 @@ OPENSTACK):
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     provider = CloudProviderFactory().create_provider(ProviderList.AWS, {})
 
@@ -313,7 +313,7 @@ Once the file is created, you can create a connection as follows, replacing
 
 .. code-block:: python
 
-    from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
+    from cloudbridge.factory import CloudProviderFactory, ProviderList
 
     provider = CloudProviderFactory().create_provider(ProviderList.AWS, {})
 

setup.cfg

@@ -2,7 +2,7 @@
 branch = True
 source = cloudbridge
 omit =
-  cloudbridge/cloud/interfaces/*
+  cloudbridge/interfaces/*
   cloudbridge/__init__.py
 
 [nosetests]

test/helpers/__init__.py

@@ -5,14 +5,14 @@ import sys
 import unittest
 import uuid
 
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.factory import CloudProviderFactory
-from cloudbridge.cloud.interfaces import CloudProvider
-from cloudbridge.cloud.interfaces import InstanceState
-from cloudbridge.cloud.interfaces import TestMockHelperMixin
-from cloudbridge.cloud.interfaces.resources import FloatingIpState
-from cloudbridge.cloud.interfaces.resources import NetworkState
-from cloudbridge.cloud.interfaces.resources import SubnetState
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.factory import CloudProviderFactory
+from cloudbridge.interfaces import CloudProvider
+from cloudbridge.interfaces import InstanceState
+from cloudbridge.interfaces import TestMockHelperMixin
+from cloudbridge.interfaces.resources import FloatingIpState
+from cloudbridge.interfaces.resources import NetworkState
+from cloudbridge.interfaces.resources import SubnetState
 
 
 def parse_bool(val):

test/helpers/standard_interface_tests.py

@@ -9,14 +9,14 @@ import uuid
 
 import tenacity
 
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.interfaces.exceptions \
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.interfaces.exceptions \
     import InvalidNameException
-from cloudbridge.cloud.interfaces.exceptions import InvalidParamException
-from cloudbridge.cloud.interfaces.resources import LabeledCloudResource
-from cloudbridge.cloud.interfaces.resources import ObjectLifeCycleMixin
-from cloudbridge.cloud.interfaces.resources import ResultList
-from cloudbridge.cloud.providers.aws.services import AWSImageService
+from cloudbridge.interfaces.exceptions import InvalidParamException
+from cloudbridge.interfaces.resources import LabeledCloudResource
+from cloudbridge.interfaces.resources import ObjectLifeCycleMixin
+from cloudbridge.interfaces.resources import ResultList
+from cloudbridge.providers.aws.services import AWSImageService
 
 import test.helpers as helpers
 

test/test_base_helpers.py

@@ -1,7 +1,7 @@
 import unittest
 
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.interfaces.exceptions import InvalidParamException
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.interfaces.exceptions import InvalidParamException
 
 
 class BaseHelpersTestCase(unittest.TestCase):

test/test_block_store_service.py

@@ -2,14 +2,14 @@ import time
 
 import six
 
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.factory import ProviderList
-from cloudbridge.cloud.interfaces import SnapshotState
-from cloudbridge.cloud.interfaces import VolumeState
-from cloudbridge.cloud.interfaces.provider import TestMockHelperMixin
-from cloudbridge.cloud.interfaces.resources import AttachmentInfo
-from cloudbridge.cloud.interfaces.resources import Snapshot
-from cloudbridge.cloud.interfaces.resources import Volume
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.factory import ProviderList
+from cloudbridge.interfaces import SnapshotState
+from cloudbridge.interfaces import VolumeState
+from cloudbridge.interfaces.provider import TestMockHelperMixin
+from cloudbridge.interfaces.resources import AttachmentInfo
+from cloudbridge.interfaces.resources import Snapshot
+from cloudbridge.interfaces.resources import Volume
 
 from test import helpers
 from test.helpers import ProviderTestBase

test/test_cloud_factory.py

@@ -1,11 +1,10 @@
 import unittest
 
-from cloudbridge.cloud import factory
-from cloudbridge.cloud import interfaces
-from cloudbridge.cloud.factory import CloudProviderFactory
-from cloudbridge.cloud.interfaces import TestMockHelperMixin
-from cloudbridge.cloud.interfaces.provider import CloudProvider
-from cloudbridge.cloud.providers.aws import AWSCloudProvider
+from cloudbridge import factory, interfaces
+from cloudbridge.factory import CloudProviderFactory
+from cloudbridge.interfaces import TestMockHelperMixin
+from cloudbridge.interfaces.provider import CloudProvider
+from cloudbridge.providers.aws import AWSCloudProvider
 
 
 class CloudFactoryTestCase(unittest.TestCase):

test/test_cloud_helpers.py

@@ -2,9 +2,9 @@ import itertools
 
 import six
 
-from cloudbridge.cloud.base.helpers import get_env
-from cloudbridge.cloud.base.resources import ClientPagedResultList
-from cloudbridge.cloud.base.resources import ServerPagedResultList
+from cloudbridge.base.helpers import get_env
+from cloudbridge.base.resources import ClientPagedResultList
+from cloudbridge.base.resources import ServerPagedResultList
 
 from test.helpers import ProviderTestBase
 

test/test_compute_service.py

@@ -2,15 +2,15 @@ import ipaddress
 
 import six
 
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.base.resources import BaseNetwork
-from cloudbridge.cloud.factory import ProviderList
-from cloudbridge.cloud.interfaces import InstanceState
-from cloudbridge.cloud.interfaces import InvalidConfigurationException
-from cloudbridge.cloud.interfaces.exceptions import WaitStateException
-from cloudbridge.cloud.interfaces.resources import Instance
-from cloudbridge.cloud.interfaces.resources import SnapshotState
-from cloudbridge.cloud.interfaces.resources import VMType
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.base.resources import BaseNetwork
+from cloudbridge.factory import ProviderList
+from cloudbridge.interfaces import InstanceState
+from cloudbridge.interfaces import InvalidConfigurationException
+from cloudbridge.interfaces.exceptions import WaitStateException
+from cloudbridge.interfaces.resources import Instance
+from cloudbridge.interfaces.resources import SnapshotState
+from cloudbridge.interfaces.resources import VMType
 
 from test import helpers
 from test.helpers import ProviderTestBase

test/test_image_service.py

@@ -1,7 +1,7 @@
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.interfaces import MachineImageState
-from cloudbridge.cloud.interfaces.resources import Instance
-from cloudbridge.cloud.interfaces.resources import MachineImage
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.interfaces import MachineImageState
+from cloudbridge.interfaces.resources import Instance
+from cloudbridge.interfaces.resources import MachineImage
 
 from test import helpers
 from test.helpers import ProviderTestBase

test/test_interface.py

@@ -1,10 +1,10 @@
 import unittest
 
 import cloudbridge
-from cloudbridge.cloud import interfaces
-from cloudbridge.cloud.factory import CloudProviderFactory
-from cloudbridge.cloud.interfaces import TestMockHelperMixin
-from cloudbridge.cloud.interfaces.exceptions import ProviderConnectionException
+from cloudbridge import interfaces
+from cloudbridge.factory import CloudProviderFactory
+from cloudbridge.interfaces import TestMockHelperMixin
+from cloudbridge.interfaces.exceptions import ProviderConnectionException
 
 from test.helpers import ProviderTestBase
 

test/test_middleware_system.py

@@ -4,10 +4,10 @@ from pyeventsystem.events import SimpleEventDispatcher
 from pyeventsystem.middleware import SimpleMiddlewareManager
 from pyeventsystem.middleware import implement
 
-from cloudbridge.cloud.base.middleware import EventDebugLoggingMiddleware
-from cloudbridge.cloud.base.middleware import ExceptionWrappingMiddleware
-from cloudbridge.cloud.interfaces.exceptions import CloudBridgeBaseException
-from cloudbridge.cloud.interfaces.exceptions import \
+from cloudbridge.base.middleware import EventDebugLoggingMiddleware
+from cloudbridge.base.middleware import ExceptionWrappingMiddleware
+from cloudbridge.interfaces.exceptions import CloudBridgeBaseException
+from cloudbridge.interfaces.exceptions import \
     InvalidConfigurationException
 
 from .helpers import skipIfPython
@@ -82,7 +82,7 @@ class EventDebugLoggingMiddlewareTestCase(unittest.TestCase):
         some_obj = SomeDummyClass()
         manager.add(some_obj)
 
-        with self.assertLogs('cloudbridge.cloud.base.middleware',
+        with self.assertLogs('cloudbridge.base.middleware',
                              level='DEBUG') as cm:
             dispatcher.dispatch(self, EVENT_NAME,
                                 "named_param", keyword_param="hello")

test/test_network_service.py

@@ -1,11 +1,11 @@
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.base.resources import BaseNetwork
-from cloudbridge.cloud.interfaces.resources import FloatingIP
-from cloudbridge.cloud.interfaces.resources import Network
-from cloudbridge.cloud.interfaces.resources import NetworkState
-from cloudbridge.cloud.interfaces.resources import RouterState
-from cloudbridge.cloud.interfaces.resources import Subnet
-from cloudbridge.cloud.interfaces.resources import SubnetState
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.base.resources import BaseNetwork
+from cloudbridge.interfaces.resources import FloatingIP
+from cloudbridge.interfaces.resources import Network
+from cloudbridge.interfaces.resources import NetworkState
+from cloudbridge.interfaces.resources import RouterState
+from cloudbridge.interfaces.resources import Subnet
+from cloudbridge.interfaces.resources import SubnetState
 
 import test.helpers as helpers
 from test.helpers import ProviderTestBase

test/test_object_life_cycle.py

@@ -1,6 +1,6 @@
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.interfaces import VolumeState
-from cloudbridge.cloud.interfaces.exceptions import WaitStateException
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.interfaces import VolumeState
+from cloudbridge.interfaces.exceptions import WaitStateException
 
 from test import helpers
 from test.helpers import ProviderTestBase

test/test_object_store_service.py

@@ -7,11 +7,11 @@ from unittest import skip
 
 import requests
 
-from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.interfaces.exceptions import DuplicateResourceException
-from cloudbridge.cloud.interfaces.provider import TestMockHelperMixin
-from cloudbridge.cloud.interfaces.resources import Bucket
-from cloudbridge.cloud.interfaces.resources import BucketObject
+from cloudbridge.base import helpers as cb_helpers
+from cloudbridge.interfaces.exceptions import DuplicateResourceException
+from cloudbridge.interfaces.provider import TestMockHelperMixin
+from cloudbridge.interfaces.resources import Bucket
+from cloudbridge.interfaces.resources import BucketObject
 
 from test import helpers
 from test.helpers import ProviderTestBase

test/test_region_service.py

@@ -1,6 +1,6 @@
 import six
 
-from cloudbridge.cloud.interfaces import Region
+from cloudbridge.interfaces import Region
 
 from test import helpers
 from test.helpers import ProviderTestBase

test/test_security_service.py

@@ -1,10 +1,10 @@
 """Test cloudbridge.security modules."""
-import cloudbridge.cloud.base.helpers as cb_helpers
-from cloudbridge.cloud.interfaces.exceptions import DuplicateResourceException
-from cloudbridge.cloud.interfaces.resources import KeyPair
-from cloudbridge.cloud.interfaces.resources import TrafficDirection
-from cloudbridge.cloud.interfaces.resources import VMFirewall
-from cloudbridge.cloud.interfaces.resources import VMFirewallRule
+import cloudbridge.base.helpers as cb_helpers
+from cloudbridge.interfaces.exceptions import DuplicateResourceException
+from cloudbridge.interfaces.resources import KeyPair
+from cloudbridge.interfaces.resources import TrafficDirection
+from cloudbridge.interfaces.resources import VMFirewall
+from cloudbridge.interfaces.resources import VMFirewallRule
 
 from test import helpers
 from test.helpers import ProviderTestBase