From 5515c5291cc0ebacad59973c87ba696b5ffc5efa Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Tue, 23 Feb 2016 17:21:10 +0100
Subject: [PATCH] Pass datastore details when required (again)

This is another set of fixes to integration tests, as the datastore is not
inherited by the parent job when a backup or a replica is created.

See also:
- Ib3e78bb68aaf992177b9d9cd1d89e84fb54830ed
- Ice626b3d3f73e75222b1080afa58232e03459a8e

Also, fix the fake guestagent so that it works with the increased
timing coming from the fixed (now working) tests.

Change-Id: I8d2b5a4627eb9292ba4535696f9565a3c20a0783
---
 trove/tests/api/backups.py                          | 2 ++
 trove/tests/api/replication.py                      | 2 ++
 trove/tests/fakes/guestagent.py                     | 2 +-
 trove/tests/scenario/runners/replication_runners.py | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/trove/tests/api/backups.py b/trove/tests/api/backups.py
index db1154715d..61b88ad137 100644
--- a/trove/tests/api/backups.py
+++ b/trove/tests/api/backups.py
@@ -338,6 +338,8 @@ class RestoreUsingBackup(object):
             instance_info.name + "_restore",
             instance_info.dbaas_flavor_href,
             instance_info.volume,
+            datastore=instance_info.dbaas_datastore,
+            datastore_version=instance_info.dbaas_datastore_version,
             restorePoint=restorePoint)
         assert_equal(200, instance_info.dbaas.last_http_code)
         assert_equal("BUILD", result.status)
diff --git a/trove/tests/api/replication.py b/trove/tests/api/replication.py
index ac00d5c012..44f3de3dc4 100644
--- a/trove/tests/api/replication.py
+++ b/trove/tests/api/replication.py
@@ -128,6 +128,8 @@ class CreateReplicationSlave(object):
                       instance_info.name + "_slave",
                       instance_info.dbaas_flavor_href,
                       instance_info.volume,
+                      datastore=instance_info.dbaas_datastore,
+                      datastore_version=instance_info.dbaas_datastore_version,
                       replica_of="Missing replica source")
         assert_equal(404, instance_info.dbaas.last_http_code)
 
diff --git a/trove/tests/fakes/guestagent.py b/trove/tests/fakes/guestagent.py
index 43fb11e6f2..d39379a173 100644
--- a/trove/tests/fakes/guestagent.py
+++ b/trove/tests/fakes/guestagent.py
@@ -322,7 +322,7 @@ class FakeGuest(object):
             backup.checksum = 'fake-md5-sum'
             backup.size = BACKUP_SIZE
             backup.save()
-        eventlet.spawn_after(7.5, finish_create_backup)
+        eventlet.spawn_after(8, finish_create_backup)
 
     def mount_volume(self, device_path=None, mount_point=None):
         pass
diff --git a/trove/tests/scenario/runners/replication_runners.py b/trove/tests/scenario/runners/replication_runners.py
index 7fe8aefcbd..7f763803dd 100644
--- a/trove/tests/scenario/runners/replication_runners.py
+++ b/trove/tests/scenario/runners/replication_runners.py
@@ -68,6 +68,8 @@ class ReplicationRunner(TestRunner):
             self.instance_info.name + replica_name,
             self.instance_info.dbaas_flavor_href,
             self.instance_info.volume, replica_of=master_id,
+            datastore=self.instance_info.dbaas_datastore,
+            datastore_version=self.instance_info.dbaas_datastore_version,
             nics=self.instance_info.nics,
             replica_count=replica_count)
         replica_id = replica.id