openstack
/
trove
Code Issues Proposed changes

Fix replication scenario tests 

When the change for slave_of -> replica_of was reverted, the
test calls using the python interface (int-tests) were also
reverted.  Unfortunately the scenario tests were not, so they
are now broken.

This fix synchronizes the calls to all use replica_of, which is
the preferred argument.

Closes-Bug: #1558584
Change-Id: I45c8c5a21c141ee7ebd8b5616bac174fe99eb907
This commit is contained in:
Peter Stachowski 2016-03-17 10:01:56 -04:00
parent b3e3e61503
commit e36c1ca58b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1583,7 +1583,7 @@ class CheckInstance(AttrCheck):
self.instance['volume'], allowed_attrs,
msg="Volume")
def slave_of(self):
def replica_of(self):
if 'replica_of' not in self.instance:
self.fail("'replica_of' not found in instance.")
else:

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

@ -93,7 +93,7 @@ def create_slave():
nics=instance_info.nics,
datastore=instance_info.dbaas_datastore,
datastore_version=instance_info.dbaas_datastore_version,
slave_of=instance_info.id)
replica_of=instance_info.id)
assert_equal(200, instance_info.dbaas.last_http_code)
assert_equal("BUILD", result.status)
return result.id
@ -103,7 +103,7 @@ def validate_slave(master, slave):
new_slave = instance_info.dbaas.instances.get(slave.id)
assert_equal(200, instance_info.dbaas.last_http_code)
ns_dict = new_slave._info
CheckInstance(ns_dict).slave_of()
CheckInstance(ns_dict).replica_of()
assert_equal(master.id, ns_dict['replica_of']['id'])
@ -130,7 +130,7 @@ class CreateReplicationSlave(object):
instance_info.volume,
datastore=instance_info.dbaas_datastore,
datastore_version=instance_info.dbaas_datastore_version,
slave_of="Missing replica source")
replica_of="Missing replica source")
assert_equal(404, instance_info.dbaas.last_http_code)
@test