Merged in aznashwan/coriolis (pull request #67)

Renamed providers.base.BaseResourcesEndpointProvider to BaseEndpointInstancesProvider with accompanying constant.

coriolis/constants.py

@@ -45,7 +45,7 @@ PROVIDER_TYPE_EXPORT = 2
 PROVIDER_TYPE_REPLICA_IMPORT = 4
 PROVIDER_TYPE_REPLICA_EXPORT = 8
 PROVIDER_TYPE_ENDPOINT = 16
-PROVIDER_TYPE_RESOURCES_ENDPOINT = 32
+PROVIDER_TYPE_ENDPOINT_INSTANCES = 32
 PROVIDER_TYPE_OS_MORPHING = 64
 PROVIDER_TYPE_ENDPOINT_NETWORKS = 128
 

coriolis/providers/base.py

@@ -31,16 +31,15 @@ class BaseEndpointProvider(BaseProvider):
         pass
 
 
-class BaseResourcesEndpointProvider(BaseEndpointProvider):
-    """ Defines operations for listing resources off of Endpoints """
+class BaseEndpointInstancesProvider(BaseEndpointProvider):
+    """ Defines operations for listing instances off of Endpoints """
     __metaclass__ = abc.ABCMeta
 
     @abc.abstractmethod
     def get_instances(self, ctxt, connection_info, limit=None,
                       last_seen_id=None, instance_name_pattern=None):
         """ Returns a list of instances """
-        raise NotImplementedError(
-            "The provider does not define an instance list method.")
+        raise NotImplementedError()
 
     @abc.abstractmethod
     def get_instance(self, ctxt, connection_info, instance_name):

coriolis/providers/factory.py

@@ -23,8 +23,8 @@ PROVIDER_TYPE_MAP = {
     constants.PROVIDER_TYPE_IMPORT: base.BaseImportProvider,
     constants.PROVIDER_TYPE_REPLICA_IMPORT: base.BaseReplicaImportProvider,
     constants.PROVIDER_TYPE_ENDPOINT: base.BaseEndpointProvider,
-    constants.PROVIDER_TYPE_RESOURCES_ENDPOINT:
-        base.BaseResourcesEndpointProvider,
+    constants.PROVIDER_TYPE_ENDPOINT_INSTANCES:
+        base.BaseEndpointInstancesProvider,
     constants.PROVIDER_TYPE_ENDPOINT_NETWORKS:
         base.BaseEndpointNetworksProvider,
     constants.PROVIDER_TYPE_OS_MORPHING: base.BaseImportInstanceProvider

coriolis/worker/rpc/server.py

@@ -170,7 +170,7 @@ class WorkerServerEndpoint(object):
     def get_endpoint_instances(self, ctxt, platform_name, connection_info,
                                marker, limit, instance_name_pattern):
         export_provider = providers_factory.get_provider(
-            platform_name, constants.PROVIDER_TYPE_RESOURCES_ENDPOINT, None)
+            platform_name, constants.PROVIDER_TYPE_ENDPOINT_INSTANCES, None)
 
         secret_connection_info = utils.get_secret_connection_info(
             ctxt, connection_info)
@@ -187,7 +187,7 @@ class WorkerServerEndpoint(object):
     def get_endpoint_instance(self, ctxt, platform_name, connection_info,
                               instance_name):
         provider = providers_factory.get_provider(
-            platform_name, constants.PROVIDER_TYPE_RESOURCES_ENDPOINT, None)
+            platform_name, constants.PROVIDER_TYPE_ENDPOINT_INSTANCES, None)
 
         secret_connection_info = utils.get_secret_connection_info(
             ctxt, connection_info)