openstack
/
trove
Code Issues Proposed changes

Merge "Removed instance reset_password from trove"

This commit is contained in:
Jenkins 2017-06-17 15:10:29 +00:00 committed by Gerrit Code Review
parent a42496e68d ea57f451d7
commit 142f89d8f9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
trove/instance/service.py
View File

@ -15,7 +15,6 @@
from oslo_log import log as logging
from oslo_utils import strutils
import webob.exc
from trove.backup.models import Backup as backup_model
from trove.backup import views as backup_views
@ -74,7 +73,7 @@ class InstanceController(wsgi.Controller):
def action(self, req, body, tenant_id, id):
"""
Handles requests that modify existing instances in some manner. Actions
could include 'resize', 'restart', 'reset_password'
could include 'resize', 'restart'
:param req: http request object
:param body: deserialized body of the request as a dict
:param tenant_id: the tenant id for whom owns the instance
@ -87,7 +86,6 @@ class InstanceController(wsgi.Controller):
_actions = {
'restart': self._action_restart,
'resize': self._action_resize,
'reset_password': self._action_reset_password,
'promote_to_replica_source':
self._action_promote_to_replica_source,
'eject_replica_source': self._action_eject_replica_source,
@ -161,9 +159,6 @@ class InstanceController(wsgi.Controller):
instance.resize_flavor(new_flavor_id)
return wsgi.Result(None, 202)
def _action_reset_password(self, context, instance, body):
raise webob.exc.HTTPNotImplemented()
def _action_promote_to_replica_source(self, context, req, instance, body):
self.authorize_instance_action(
context, 'promote_to_replica_source', instance)