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
This commit is contained in:
parent
1035f4ce7d
commit
5515c5291c
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue