Merge "Move cluster strategies to strategies/cluster"

trove/cluster/models.py

@@ -17,7 +17,7 @@ from trove.cluster.tasks import ClusterTask
 from trove.cluster.tasks import ClusterTasks
 from trove.common import cfg
 from trove.common import exception
-from trove.common import strategy
+from trove.common.strategies.cluster import strategy
 from trove.datastore import models as datastore_models
 from trove.db import models as dbmodels
 from trove.instance import models as inst_models

trove/cluster/service.py

@@ -21,9 +21,9 @@ from trove.common import cfg
 from trove.common import exception
 from trove.common import pagination
 from trove.common import apischema
-from trove.common import strategy
 from trove.common import utils
 from trove.common import wsgi
+from trove.common.strategies.cluster import strategy
 from trove.datastore import models as datastore_models
 from trove.openstack.common import log as logging
 from trove.common.i18n import _

trove/cluster/views.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from trove.common import strategy
+from trove.common.strategies.cluster import strategy
 from trove.common.views import create_links
 from trove.instance.views import InstanceDetailView
 from trove.openstack.common import log as logging

trove/common/cfg.py

@@ -678,16 +678,16 @@ mongodb_opts = [
     cfg.BoolOpt('cluster_support', default=True,
                 help='Enable clusters to be created and managed.'),
     cfg.StrOpt('api_strategy',
-               default='trove.common.strategies.mongodb.api.'
+               default='trove.common.strategies.cluster.mongodb.api.'
                        'MongoDbAPIStrategy',
                help='Class that implements datastore-specific API logic.'),
     cfg.StrOpt('taskmanager_strategy',
-               default='trove.common.strategies.mongodb.taskmanager.'
+               default='trove.common.strategies.cluster.mongodb.taskmanager.'
                        'MongoDbTaskManagerStrategy',
                help='Class that implements datastore-specific task manager '
                     'logic.'),
     cfg.StrOpt('guestagent_strategy',
-               default='trove.common.strategies.mongodb.guestagent.'
+               default='trove.common.strategies.cluster.mongodb.guestagent.'
                        'MongoDbGuestAgentStrategy',
                help='Class that implements datastore-specific Guest Agent API '
                     'logic.'),

trove/common/remote.py

@@ -17,7 +17,7 @@ from oslo.utils.importutils import import_class
 
 from trove.common import cfg
 from trove.common import exception
-from trove.common import strategy
+from trove.common.strategies.cluster import strategy
 
 from cinderclient.v2 import client as CinderClient
 from heatclient.v1 import client as HeatClient

trove/common/strategies/cluster/mongodb/api.py

@@ -21,7 +21,7 @@ from trove.cluster.views import ClusterView
 from trove.common import cfg
 from trove.common import exception
 from trove.common import remote
-from trove.common.strategies import base
+from trove.common.strategies.cluster import base
 from trove.common import utils
 from trove.common.views import create_links
 from trove.common import wsgi

trove/common/strategies/cluster/mongodb/guestagent.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 from trove.common import cfg
-from trove.common.strategies import base
+from trove.common.strategies.cluster import base
 from trove.guestagent import api as guest_api
 from trove.openstack.common import log as logging
 

trove/common/strategies/cluster/mongodb/taskmanager.py

@@ -19,7 +19,7 @@ from trove.common import cfg
 from trove.common.exception import PollTimeOut
 from trove.common.instance import ServiceStatuses
 from trove.common.remote import create_guest_client
-from trove.common.strategies import base
+from trove.common.strategies.cluster import base
 from trove.common import utils
 from trove.instance.models import DBInstance
 from trove.instance.models import Instance

trove/extensions/mgmt/clusters/views.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 from trove.cluster.views import ClusterView
-from trove.common import strategy
+from trove.common.strategies.cluster import strategy
 
 
 class MgmtClusterView(ClusterView):

trove/taskmanager/api.py

@@ -21,7 +21,7 @@ Routes all the requests to the task manager.
 from oslo import messaging
 from trove.common import cfg
 from trove.common import exception
-from trove.common import strategy
+from trove.common.strategies.cluster import strategy
 import trove.common.rpc.version as rpc_version
 from trove.guestagent import models as agent_models
 from trove import rpc

trove/taskmanager/manager.py

@@ -21,7 +21,7 @@ from trove.backup.models import Backup
 import trove.common.cfg as cfg
 import trove.common.rpc.version as rpc_version
 from trove.common import exception
-from trove.common import strategy
+from trove.common.strategies.cluster import strategy
 import trove.extensions.mgmt.instances.models as mgmtmodels
 from trove.openstack.common import log as logging
 from trove.openstack.common import periodic_task

trove/taskmanager/models.py

@@ -45,7 +45,7 @@ from trove.common.exception import TroveError
 from trove.common.exception import VolumeCreationFailure
 from trove.common.instance import ServiceStatuses
 from trove.common import instance as rd_instance
-from trove.common import strategy
+from trove.common.strategies.cluster import strategy
 from trove.common.remote import create_dns_client
 from trove.common.remote import create_heat_client
 from trove.common.remote import create_cinder_client

trove/tests/unittests/cluster/test_cluster.py

@@ -24,7 +24,7 @@ from trove.cluster.models import DBCluster
 from trove.common import cfg
 from trove.common import exception
 from trove.common import remote
-from trove.common.strategies.mongodb import api as mongodb_api
+from trove.common.strategies.cluster.mongodb import api as mongodb_api
 from trove.datastore import models as datastore_models
 from trove.instance import models as inst_models
 from trove.instance.models import DBInstance

trove/tests/unittests/cluster/test_cluster_controller.py

@@ -26,7 +26,7 @@ from trove.cluster.service import ClusterController
 from trove.cluster import views
 import trove.common.cfg as cfg
 from trove.common import exception
-from trove.common import strategy
+from trove.common.strategies.cluster import strategy
 from trove.common import utils
 from trove.datastore import models as datastore_models
 

trove/tests/unittests/cluster/test_cluster_models.py

@@ -17,7 +17,7 @@ from mock import Mock, patch
 from testtools import TestCase
 
 from trove.cluster import models
-from trove.common.strategies.mongodb.api import MongoDbCluster
+from trove.common.strategies.cluster.mongodb.api import MongoDbCluster
 from trove.datastore import models as datastore_models
 
 

trove/tests/unittests/cluster/test_cluster_views.py

@@ -21,7 +21,7 @@ from trove.cluster.views import ClusterInstanceDetailView
 from trove.cluster.views import ClusterView
 from trove.cluster.views import load_view
 from trove.common import cfg
-from trove.common.strategies.mongodb.api import MongoDbClusterView
+from trove.common.strategies.cluster.mongodb.api import MongoDbClusterView
 
 CONF = cfg.CONF
 

trove/tests/unittests/taskmanager/test_api.py

@@ -16,7 +16,8 @@
 from mock import Mock
 from testtools import TestCase
 
-from trove.common.strategies.mongodb.taskmanager import MongoDbTaskManagerAPI
+from trove.common.strategies.cluster.mongodb.taskmanager import (
+    MongoDbTaskManagerAPI)
 from trove.taskmanager import api as task_api
 
 

trove/tests/unittests/taskmanager/test_clusters.py

@@ -21,8 +21,8 @@ from mock import patch
 
 from trove.cluster.models import ClusterTasks as ClusterTaskStatus
 from trove.cluster.models import DBCluster
-from trove.common.strategies.mongodb.taskmanager import MongoDbClusterTasks \
+from trove.common.strategies.cluster.mongodb.taskmanager import (
-    as ClusterTasks
+    MongoDbClusterTasks as ClusterTasks)
 from trove.datastore import models as datastore_models
 from trove.instance.models import BaseInstance
 from trove.instance.models import DBInstance