Use configured datastore on instance creation

The datastore and its version is now always passed on instance creation for
integration tests.
Previously the default datastore (and version) were used, ignoring the
settings in the test configuration.

Change-Id: Ib3e78bb68aaf992177b9d9cd1d89e84fb54830ed
Depends-On: Ifa4496eb1c9e2fe053978c708e7fa1069f12cb3f

trove/tests/api/configurations.py

@@ -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)

trove/tests/api/mgmt/malformed_json.py

@@ -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"}])

trove/tests/api/replication.py

@@ -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)