On the 019_datastore_fix.py migration script the upgrade method was
calling the has_instances_wo_datastore_version as a function pointer
instead of passing the instance_table in and calling the function. This
meant the if block was always true because it was just checking if the
function exists and the create_legacy_version method was called everytime
causing the "Legacy MySQL" datastore to be inserted even if there was no
legacy trove instances. Now inject the instace_table into the
has_instances_wo_datastore_version and everything works as expected.
Updated the datastore integration tests to not rely on the Legacy MySQL
datastore to exist by using the 10000000-0000-0000-0000-000000000001 GUID.
Instead the test now asserts against the data_store by the name
"Test_Datastore_1" which is the datastore the integration test
intended to validate against.
Reviewed: https:/ /review. openstack. org/138563 /git.openstack. org/cgit/ openstack/ trove/commit/ ?id=a6358494d1c c17f7b56ff8e515 be88e67cd428dc
Committed: https:/
Submitter: Jenkins
Branch: master
commit a6358494d1cc17f 7b56ff8e515be88 e67cd428dc
Author: Edmond Kotowski <email address hidden>
Date: Tue Dec 2 14:10:49 2014 -0800
Legacy MySQL datastore is shown on datastore-list
On the 019_datastore_ fix.py migration script the upgrade method was wo_datastore_ version as a function pointer legacy_ version method was called everytime instances_ wo_datastore_ version and everything works as expected.
calling the has_instances_
instead of passing the instance_table in and calling the function. This
meant the if block was always true because it was just checking if the
function exists and the create_
causing the "Legacy MySQL" datastore to be inserted even if there was no
legacy trove instances. Now inject the instace_table into the
has_
Updated the datastore integration tests to not rely on the Legacy MySQL 0000-0000- 0000-0000000000 01 GUID. Datastore_ 1" which is the datastore the integration test
datastore to exist by using the 10000000-
Instead the test now asserts against the data_store by the name
"Test_
intended to validate against.
Closes-Bug: 1396427 ea150f6408d63b8 1412e196939
Change-Id: Ifff33a962cc8d6