summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-17 15:10:29 +0000
committerGerrit Code Review <review@openstack.org>2017-06-17 15:10:29 +0000
commit142f89d8f9594ed766079c85fd7086c606fe9aff (patch)
treef6c13cf7560f5ffb83d365311ceb4e395a126451
parenta42496e68dc0f52fbbd15e1be5b55c3b3b472ab1 (diff)
parentea57f451d7dd8a6b2b3d970c5b696e5901547dd0 (diff)
Merge "Removed instance reset_password from trove"
-rw-r--r--trove/instance/service.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/trove/instance/service.py b/trove/instance/service.py
index f42e1e3..39bc11b 100644
--- a/trove/instance/service.py
+++ b/trove/instance/service.py
@@ -15,7 +15,6 @@
15 15
16from oslo_log import log as logging 16from oslo_log import log as logging
17from oslo_utils import strutils 17from oslo_utils import strutils
18import webob.exc
19 18
20from trove.backup.models import Backup as backup_model 19from trove.backup.models import Backup as backup_model
21from trove.backup import views as backup_views 20from trove.backup import views as backup_views
@@ -74,7 +73,7 @@ class InstanceController(wsgi.Controller):
74 def action(self, req, body, tenant_id, id): 73 def action(self, req, body, tenant_id, id):
75 """ 74 """
76 Handles requests that modify existing instances in some manner. Actions 75 Handles requests that modify existing instances in some manner. Actions
77 could include 'resize', 'restart', 'reset_password' 76 could include 'resize', 'restart'
78 :param req: http request object 77 :param req: http request object
79 :param body: deserialized body of the request as a dict 78 :param body: deserialized body of the request as a dict
80 :param tenant_id: the tenant id for whom owns the instance 79 :param tenant_id: the tenant id for whom owns the instance
@@ -87,7 +86,6 @@ class InstanceController(wsgi.Controller):
87 _actions = { 86 _actions = {
88 'restart': self._action_restart, 87 'restart': self._action_restart,
89 'resize': self._action_resize, 88 'resize': self._action_resize,
90 'reset_password': self._action_reset_password,
91 'promote_to_replica_source': 89 'promote_to_replica_source':
92 self._action_promote_to_replica_source, 90 self._action_promote_to_replica_source,
93 'eject_replica_source': self._action_eject_replica_source, 91 'eject_replica_source': self._action_eject_replica_source,
@@ -161,9 +159,6 @@ class InstanceController(wsgi.Controller):
161 instance.resize_flavor(new_flavor_id) 159 instance.resize_flavor(new_flavor_id)
162 return wsgi.Result(None, 202) 160 return wsgi.Result(None, 202)
163 161
164 def _action_reset_password(self, context, instance, body):
165 raise webob.exc.HTTPNotImplemented()
166
167 def _action_promote_to_replica_source(self, context, req, instance, body): 162 def _action_promote_to_replica_source(self, context, req, instance, body):
168 self.authorize_instance_action( 163 self.authorize_instance_action(
169 context, 'promote_to_replica_source', instance) 164 context, 'promote_to_replica_source', instance)