Renamed BaseProviderService to BaseCloudService. Renamed

CloudProviderServiceType to CloudServiceType for consistency.

cloudbridge/cloud/base.py

@@ -104,7 +104,7 @@ class BaseCloudProvider(CloudProvider):
         """
         Checks whether this provider supports a given service.
 
-        :type service_type: str or :class:``.CloudProviderServiceType``
+        :type service_type: str or :class:``.CloudServiceType``
         :param service_type: Type of service to check support for.
 
         :rtype: bool
@@ -686,7 +686,7 @@ class BaseBucket(BasePageableObjectMixin, Bucket, BaseCloudResource):
                                       self.name)
 
 
-class BaseProviderService(CloudService):
+class BaseCloudService(CloudService):
 
     def __init__(self, provider):
         self._provider = provider
@@ -696,54 +696,54 @@ class BaseProviderService(CloudService):
         return self._provider
 
 
-class BaseComputeService(ComputeService, BaseProviderService):
+class BaseComputeService(ComputeService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseComputeService, self).__init__(provider)
 
 
 class BaseVolumeService(
-        BasePageableObjectMixin, VolumeService, BaseProviderService):
+        BasePageableObjectMixin, VolumeService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseVolumeService, self).__init__(provider)
 
 
 class BaseSnapshotService(
-        BasePageableObjectMixin, SnapshotService, BaseProviderService):
+        BasePageableObjectMixin, SnapshotService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseSnapshotService, self).__init__(provider)
 
 
-class BaseBlockStoreService(BlockStoreService, BaseProviderService):
+class BaseBlockStoreService(BlockStoreService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseBlockStoreService, self).__init__(provider)
 
 
 class BaseImageService(
-        BasePageableObjectMixin, ImageService, BaseProviderService):
+        BasePageableObjectMixin, ImageService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseImageService, self).__init__(provider)
 
 
 class BaseObjectStoreService(
-        BasePageableObjectMixin, ObjectStoreService, BaseProviderService):
+        BasePageableObjectMixin, ObjectStoreService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseObjectStoreService, self).__init__(provider)
 
 
-class BaseSecurityService(SecurityService, BaseProviderService):
+class BaseSecurityService(SecurityService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseSecurityService, self).__init__(provider)
 
 
 class BaseKeyPairService(
-        BasePageableObjectMixin, KeyPairService, BaseProviderService):
+        BasePageableObjectMixin, KeyPairService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseKeyPairService, self).__init__(provider)
@@ -767,14 +767,14 @@ class BaseKeyPairService(
 
 
 class BaseSecurityGroupService(
-        BasePageableObjectMixin, SecurityGroupService, BaseProviderService):
+        BasePageableObjectMixin, SecurityGroupService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseSecurityGroupService, self).__init__(provider)
 
 
 class BaseInstanceTypesService(
-        BasePageableObjectMixin, InstanceTypesService, BaseProviderService):
+        BasePageableObjectMixin, InstanceTypesService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseInstanceTypesService, self).__init__(provider)
@@ -789,14 +789,14 @@ class BaseInstanceTypesService(
 
 
 class BaseInstanceService(
-        BasePageableObjectMixin, InstanceService, BaseProviderService):
+        BasePageableObjectMixin, InstanceService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseInstanceService, self).__init__(provider)
 
 
 class BaseRegionService(
-        BasePageableObjectMixin, RegionService, BaseProviderService):
+        BasePageableObjectMixin, RegionService, BaseCloudService):
 
     def __init__(self, provider):
         super(BaseRegionService, self).__init__(provider)

cloudbridge/cloud/interfaces/__init__.py

@@ -2,7 +2,7 @@
 Public interface exports
 """
 from .impl import CloudProvider  # noqa
-from .resources import CloudProviderServiceType  # noqa
+from .resources import CloudServiceType  # noqa
 from .resources import InstanceState  # noqa
 from .resources import InvalidConfigurationException  # noqa
 from .resources import LaunchConfig  # noqa

cloudbridge/cloud/interfaces/impl.py

@@ -63,12 +63,12 @@ class CloudProvider(object):
 
         .. code-block:: python
 
-            if provider.has_service(CloudProviderServiceType.OBJECT_STORE):
+            if provider.has_service(CloudServiceType.OBJECT_STORE):
                print("Provider supports object store services")
                provider.object_store.list()
 
 
-        :type service_type: :class:`.CloudProviderServiceType`
+        :type service_type: :class:`.CloudServiceType`
         :param service_type: Type of service to check support for.
 
         :rtype: :class:`bool`
@@ -155,7 +155,7 @@ class CloudProvider(object):
 
         .. code-block:: python
 
-            if provider.has_service(CloudProviderServiceType.OBJECT_STORE):
+            if provider.has_service(CloudServiceType.OBJECT_STORE):
                print("Provider supports object store services")
                print(provider.object_store.list())
 

cloudbridge/cloud/interfaces/resources.py

@@ -4,7 +4,7 @@ Specifications for data objects exposed through a provider or service
 from abc import ABCMeta, abstractmethod, abstractproperty
 
 
-class CloudProviderServiceType(object):
+class CloudServiceType(object):
 
     """
     Defines possible service types that are offered by providers.
@@ -12,7 +12,7 @@ class CloudProviderServiceType(object):
     Providers can implement the ``has_service`` method and clients can check
     for the availability of a service with::
 
-        if (provider.has_service(CloudProviderServiceTypes.OBJECTSTORE))
+        if (provider.has_service(CloudServiceTypes.OBJECTSTORE))
             ...
 
     """

docs/api_docs/cloud/resources.rst

@@ -3,9 +3,9 @@ Resources
 
 .. contents:: :local:
 
-CloudProviderServiceType
+CloudServiceType
 ------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.CloudProviderServiceType
+.. autoclass:: cloudbridge.cloud.interfaces.resources.CloudServiceType
     :members:
 
 CloudBridgeBaseException

test/test_interface.py

@@ -19,7 +19,7 @@ class CloudInterfaceTestCase(ProviderTestBase):
         has_service with a valid service type should return
         a boolean and raise no exceptions
         """
-        for key, value in interfaces.CloudProviderServiceType.__dict__.items():
+        for key, value in interfaces.CloudServiceType.__dict__.items():
             if not key.startswith("__"):
                 self.provider.has_service(value)