Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated rds status from shutdown to stopped to match aws (#1347)

Browse Source
This commit is contained in:
justinsr20 2017-11-20 19:07:36 +10:00 committed by Terry Cain
parent 04c5198a0c
commit 17b8396a9c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/rds2/models.py
View File

@ -753,13 +753,13 @@ class RDS2Backend(BaseBackend):
raise InvalidDBInstanceStateError(db_instance_identifier, 'stop') raise InvalidDBInstanceStateError(db_instance_identifier, 'stop')
if db_snapshot_identifier: if db_snapshot_identifier:
self.create_snapshot(db_instance_identifier, db_snapshot_identifier) self.create_snapshot(db_instance_identifier, db_snapshot_identifier)
database.status = 'shutdown' database.status = 'stopped'
return database return database
def start_database(self, db_instance_identifier): def start_database(self, db_instance_identifier):
database = self.describe_databases(db_instance_identifier)[0] database = self.describe_databases(db_instance_identifier)[0]
# todo: bunch of different error messages to be generated from this api call # todo: bunch of different error messages to be generated from this api call
if database.status != 'shutdown': if database.status != 'stopped':
raise InvalidDBInstanceStateError(db_instance_identifier, 'start') raise InvalidDBInstanceStateError(db_instance_identifier, 'start')
database.status = 'available' database.status = 'available'
return database return database

8
tests/test_rds2/test_rds2.py
View File

@ -50,7 +50,7 @@ def test_stop_database():
# test stopping database should shutdown # test stopping database should shutdown
response = conn.stop_db_instance(DBInstanceIdentifier=mydb['DBInstanceIdentifier']) response = conn.stop_db_instance(DBInstanceIdentifier=mydb['DBInstanceIdentifier'])
response['ResponseMetadata']['HTTPStatusCode'].should.equal(200) response['ResponseMetadata']['HTTPStatusCode'].should.equal(200)
response['DBInstance']['DBInstanceStatus'].should.equal('shutdown') response['DBInstance']['DBInstanceStatus'].should.equal('stopped')
# test rdsclient error when trying to stop an already stopped database # test rdsclient error when trying to stop an already stopped database
conn.stop_db_instance.when.called_with(DBInstanceIdentifier=mydb['DBInstanceIdentifier']).should.throw(ClientError) conn.stop_db_instance.when.called_with(DBInstanceIdentifier=mydb['DBInstanceIdentifier']).should.throw(ClientError)
# test stopping a stopped database with snapshot should error and no snapshot should exist for that call # test stopping a stopped database with snapshot should error and no snapshot should exist for that call
@ -76,10 +76,10 @@ def test_start_database():
mydb['DBInstanceStatus'].should.equal('available') mydb['DBInstanceStatus'].should.equal('available')
# test starting an already started database should error # test starting an already started database should error
conn.start_db_instance.when.called_with(DBInstanceIdentifier=mydb['DBInstanceIdentifier']).should.throw(ClientError) conn.start_db_instance.when.called_with(DBInstanceIdentifier=mydb['DBInstanceIdentifier']).should.throw(ClientError)
# stop and test start - should go from shutdown to available, create snapshot and check snapshot # stop and test start - should go from stopped to available, create snapshot and check snapshot
response = conn.stop_db_instance(DBInstanceIdentifier=mydb['DBInstanceIdentifier'], DBSnapshotIdentifier='rocky4570-rds-snap') response = conn.stop_db_instance(DBInstanceIdentifier=mydb['DBInstanceIdentifier'], DBSnapshotIdentifier='rocky4570-rds-snap')
response['ResponseMetadata']['HTTPStatusCode'].should.equal(200) response['ResponseMetadata']['HTTPStatusCode'].should.equal(200)
response['DBInstance']['DBInstanceStatus'].should.equal('shutdown') response['DBInstance']['DBInstanceStatus'].should.equal('stopped')
response = conn.describe_db_snapshots() response = conn.describe_db_snapshots()
response['DBSnapshots'][0]['DBSnapshotIdentifier'].should.equal('rocky4570-rds-snap') response['DBSnapshots'][0]['DBSnapshotIdentifier'].should.equal('rocky4570-rds-snap')
response = conn.start_db_instance(DBInstanceIdentifier=mydb['DBInstanceIdentifier']) response = conn.start_db_instance(DBInstanceIdentifier=mydb['DBInstanceIdentifier'])
@ -93,7 +93,7 @@ def test_start_database():
# test stopping database not invoking snapshot should succeed. # test stopping database not invoking snapshot should succeed.
response = conn.stop_db_instance(DBInstanceIdentifier=mydb['DBInstanceIdentifier']) response = conn.stop_db_instance(DBInstanceIdentifier=mydb['DBInstanceIdentifier'])
response['ResponseMetadata']['HTTPStatusCode'].should.equal(200) response['ResponseMetadata']['HTTPStatusCode'].should.equal(200)
response['DBInstance']['DBInstanceStatus'].should.equal('shutdown') response['DBInstance']['DBInstanceStatus'].should.equal('stopped')
@mock_rds2 @mock_rds2