瀏覽代碼

Revert "Moves connection provider methods in BaseEndpointProvider"

This reverts commit 4cd69121db600c3f2718d5f504400d98dd146740.
Alessandro Pilotti 9 年之前
父節點
當前提交
f8b06780a4
共有 1 個文件被更改,包括 14 次插入14 次删除
  1. 14 14
      coriolis/providers/base.py

+ 14 - 14
coriolis/providers/base.py

@@ -19,20 +19,6 @@ class BaseProvider(object):
     def platform(self):
     def platform(self):
         raise NotImplementedError("Missing provider platform attribute.")
         raise NotImplementedError("Missing provider platform attribute.")
 
 
-    def get_os_morphing_tools(self, conn, osmorphing_info):
-        raise exception.OSMorphingToolsNotFound()
-
-
-class BaseEndpointProvider(BaseProvider):
-    __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
-        """
-        pass
-
     @property
     @property
     def connection_info_schema(self):
     def connection_info_schema(self):
         raise NotImplementedError("Missing connection info schema.")
         raise NotImplementedError("Missing connection info schema.")
@@ -50,6 +36,20 @@ class BaseEndpointProvider(BaseProvider):
                 "Error validating provider '%s' connection "
                 "Error validating provider '%s' connection "
                 "info: %s" % str(ex)) from ex
                 "info: %s" % str(ex)) from ex
 
 
+    def get_os_morphing_tools(self, conn, osmorphing_info):
+        raise exception.OSMorphingToolsNotFound()
+
+
+class BaseEndpointProvider(BaseProvider):
+    __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
+        """
+        pass
+
 
 
 class BaseImportProvider(BaseProvider):
 class BaseImportProvider(BaseProvider):
     __metaclass__ = abc.ABCMeta
     __metaclass__ = abc.ABCMeta