openstack
/
trove
Code Issues Proposed changes

Merge "Use configured datastore on instance creation"

This commit is contained in:
Jenkins 2016-01-06 16:52:28 +00:00 committed by Gerrit Code Review
parent b5c83633ec 0be181013a
commit 0f3c41f51c
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trove/tests/api/configurations.py
View File

@ -585,6 +585,9 @@ class StartInstanceWithConfiguration(ConfigurationsTestBase):
flavor_href = instance_info.dbaas_flavor_href
configuration_instance.dbaas_flavor_href = flavor_href
configuration_instance.volume = instance_info.volume
configuration_instance.dbaas_datastore = instance_info.dbaas_datastore
configuration_instance.dbaas_datastore_version = \
instance_info.dbaas_datastore_version
result = instance_info.dbaas.instances.create(
configuration_instance.name,
@ -593,6 +596,8 @@ class StartInstanceWithConfiguration(ConfigurationsTestBase):
configuration_instance.databases,
configuration_instance.users,
availability_zone="nova",
datastore=configuration_instance.dbaas_datastore,
datastore_version=configuration_instance.dbaas_datastore_version,
configuration=configuration_href)
assert_equal(200, instance_info.dbaas.last_http_code)
assert_equal("BUILD", result.status)

2
trove/tests/api/mgmt/malformed_json.py
View File

@ -45,6 +45,8 @@ class MalformedJson(object):
self.instance = self.dbaas.instances.create(
name="qe_instance",
flavor_id=instance_info.dbaas_flavor_href,
datastore=instance_info.dbaas_datastore,
datastore_version=instance_info.dbaas_datastore_version,
volume=volume,
databases=[{"name": "firstdb", "character_set": "latin2",
"collate": "latin2_general_ci"}])

2
trove/tests/api/replication.py
View File

@ -80,6 +80,8 @@ def create_slave():
instance_info.name + "_slave",
instance_info.dbaas_flavor_href,
instance_info.volume,
datastore=instance_info.dbaas_datastore,
datastore_version=instance_info.dbaas_datastore_version,
slave_of=instance_info.id)
assert_equal(200, instance_info.dbaas.last_http_code)
assert_equal("BUILD", result.status)