diff --git a/trove/cluster/models.py b/trove/cluster/models.py index e038947549..9f0643df1b 100644 --- a/trove/cluster/models.py +++ b/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 diff --git a/trove/cluster/service.py b/trove/cluster/service.py index 3becb3990a..6dd55cc6d9 100644 --- a/trove/cluster/service.py +++ b/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 _ diff --git a/trove/cluster/views.py b/trove/cluster/views.py index 27a8241b01..43cf48c699 100644 --- a/trove/cluster/views.py +++ b/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 diff --git a/trove/common/cfg.py b/trove/common/cfg.py index f9f298b99e..28fc5e1f55 100644 --- a/trove/common/cfg.py +++ b/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.'), diff --git a/trove/common/remote.py b/trove/common/remote.py index ae3536747d..a5635fe6df 100644 --- a/trove/common/remote.py +++ b/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 diff --git a/trove/common/strategies/mongodb/__init__.py b/trove/common/strategies/cluster/__init__.py similarity index 100% rename from trove/common/strategies/mongodb/__init__.py rename to trove/common/strategies/cluster/__init__.py diff --git a/trove/common/strategies/base.py b/trove/common/strategies/cluster/base.py similarity index 100% rename from trove/common/strategies/base.py rename to trove/common/strategies/cluster/base.py diff --git a/trove/common/strategies/cluster/mongodb/__init__.py b/trove/common/strategies/cluster/mongodb/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/trove/common/strategies/mongodb/api.py b/trove/common/strategies/cluster/mongodb/api.py similarity index 99% rename from trove/common/strategies/mongodb/api.py rename to trove/common/strategies/cluster/mongodb/api.py index d4e9616aff..40695604d0 100644 --- a/trove/common/strategies/mongodb/api.py +++ b/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 diff --git a/trove/common/strategies/mongodb/guestagent.py b/trove/common/strategies/cluster/mongodb/guestagent.py similarity index 98% rename from trove/common/strategies/mongodb/guestagent.py rename to trove/common/strategies/cluster/mongodb/guestagent.py index 1797aefb93..e15805564e 100644 --- a/trove/common/strategies/mongodb/guestagent.py +++ b/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 diff --git a/trove/common/strategies/mongodb/taskmanager.py b/trove/common/strategies/cluster/mongodb/taskmanager.py similarity index 99% rename from trove/common/strategies/mongodb/taskmanager.py rename to trove/common/strategies/cluster/mongodb/taskmanager.py index 1e781cb4be..cbcf78fe37 100644 --- a/trove/common/strategies/mongodb/taskmanager.py +++ b/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 diff --git a/trove/common/strategy.py b/trove/common/strategies/cluster/strategy.py similarity index 100% rename from trove/common/strategy.py rename to trove/common/strategies/cluster/strategy.py diff --git a/trove/extensions/mgmt/clusters/views.py b/trove/extensions/mgmt/clusters/views.py index d94d158fd4..ee61ee662c 100644 --- a/trove/extensions/mgmt/clusters/views.py +++ b/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): diff --git a/trove/taskmanager/api.py b/trove/taskmanager/api.py index 7032bb4620..2f4de83540 100644 --- a/trove/taskmanager/api.py +++ b/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 diff --git a/trove/taskmanager/manager.py b/trove/taskmanager/manager.py index 90c397a612..1a21dee3af 100644 --- a/trove/taskmanager/manager.py +++ b/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 diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index 31d6b85134..849f7928fb 100755 --- a/trove/taskmanager/models.py +++ b/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 diff --git a/trove/tests/unittests/cluster/test_cluster.py b/trove/tests/unittests/cluster/test_cluster.py index 975f4f35ca..98975198c0 100644 --- a/trove/tests/unittests/cluster/test_cluster.py +++ b/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 diff --git a/trove/tests/unittests/cluster/test_cluster_controller.py b/trove/tests/unittests/cluster/test_cluster_controller.py index 8bdfc8f56e..1ec87b5afd 100644 --- a/trove/tests/unittests/cluster/test_cluster_controller.py +++ b/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 diff --git a/trove/tests/unittests/cluster/test_cluster_models.py b/trove/tests/unittests/cluster/test_cluster_models.py index 525d0d2ee1..9f3eb6829d 100644 --- a/trove/tests/unittests/cluster/test_cluster_models.py +++ b/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 diff --git a/trove/tests/unittests/cluster/test_cluster_views.py b/trove/tests/unittests/cluster/test_cluster_views.py index dcaf9da24b..a0d7492c46 100644 --- a/trove/tests/unittests/cluster/test_cluster_views.py +++ b/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 diff --git a/trove/tests/unittests/taskmanager/test_api.py b/trove/tests/unittests/taskmanager/test_api.py index 5c7919b4a2..24ecb8d066 100644 --- a/trove/tests/unittests/taskmanager/test_api.py +++ b/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 diff --git a/trove/tests/unittests/taskmanager/test_clusters.py b/trove/tests/unittests/taskmanager/test_clusters.py index 01af53217e..7a7386c004 100644 --- a/trove/tests/unittests/taskmanager/test_clusters.py +++ b/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 \ - as ClusterTasks +from trove.common.strategies.cluster.mongodb.taskmanager import ( + MongoDbClusterTasks as ClusterTasks) from trove.datastore import models as datastore_models from trove.instance.models import BaseInstance from trove.instance.models import DBInstance