a6358494d1
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. Closes-Bug: 1396427 Change-Id: Ifff33a962cc8d6ea150f6408d63b81412e196939
261 lines
8.9 KiB
Python
261 lines
8.9 KiB
Python
# Copyright 2013 OpenStack Foundation
|
|
# Copyright 2013 Rackspace Hosting
|
|
# Copyright 2013 Hewlett-Packard Development Company, L.P.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import functools
|
|
import gettext
|
|
import os
|
|
import urllib
|
|
import sys
|
|
import traceback
|
|
|
|
from trove.common import cfg
|
|
from trove.common import utils
|
|
from trove.openstack.common import log as logging
|
|
from trove.tests.config import CONFIG
|
|
from wsgi_intercept.httplib2_intercept import install as wsgi_install
|
|
import proboscis
|
|
import wsgi_intercept
|
|
from trove.openstack.common.rpc import service as rpc_service
|
|
|
|
import eventlet
|
|
eventlet.monkey_patch(thread=False)
|
|
|
|
CONF = cfg.CONF
|
|
original_excepthook = sys.excepthook
|
|
|
|
|
|
def add_support_for_localization():
|
|
"""Adds support for localization in the logging.
|
|
|
|
If ../nova/__init__.py exists, add ../ to Python search path, so that
|
|
it will override what happens to be installed in
|
|
/usr/(local/)lib/python...
|
|
|
|
"""
|
|
path = os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)
|
|
possible_topdir = os.path.normpath(path)
|
|
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
|
|
sys.path.insert(0, possible_topdir)
|
|
|
|
gettext.install('nova', unicode=1)
|
|
|
|
|
|
def initialize_trove(config_file):
|
|
from trove.openstack.common import pastedeploy
|
|
|
|
cfg.CONF(args=[],
|
|
project='trove',
|
|
default_config_files=[config_file])
|
|
logging.setup(None)
|
|
topic = CONF.taskmanager_queue
|
|
|
|
from trove.taskmanager import manager
|
|
manager_impl = manager.Manager()
|
|
taskman_service = rpc_service.Service(None, topic=topic,
|
|
manager=manager_impl)
|
|
taskman_service.start()
|
|
|
|
return pastedeploy.paste_deploy_app(config_file, 'trove', {})
|
|
|
|
|
|
def datastore_init():
|
|
# Adds the datastore for mysql (needed to make most calls work).
|
|
from trove.datastore import models
|
|
from trove.configuration.models import DatastoreConfigurationParameters
|
|
|
|
models.DBDatastore.create(id=CONFIG.dbaas_datastore_id,
|
|
name=CONFIG.dbaas_datastore,
|
|
default_version_id=
|
|
CONFIG.dbaas_datastore_version_id)
|
|
|
|
models.DBDatastore.create(id=utils.generate_uuid(),
|
|
name=CONFIG.dbaas_datastore_name_no_versions,
|
|
default_version_id=None)
|
|
|
|
main_dsv = models.DBDatastoreVersion.create(
|
|
id=CONFIG.dbaas_datastore_version_id,
|
|
datastore_id=
|
|
CONFIG.dbaas_datastore_id,
|
|
name=CONFIG.dbaas_datastore_version,
|
|
manager="mysql",
|
|
image_id=
|
|
'c00000c0-00c0-0c00-00c0-000c000000cc',
|
|
packages='test packages',
|
|
active=1)
|
|
models.DBDatastoreVersion.create(id="d00000d0-00d0-0d00-00d0-000d000000dd",
|
|
datastore_id=
|
|
CONFIG.dbaas_datastore_id,
|
|
name='mysql_inactive_version',
|
|
manager="mysql",
|
|
image_id=
|
|
'c00000c0-00c0-0c00-00c0-000c000000cc',
|
|
packages=None, active=0)
|
|
|
|
def add_parm(name, data_type, max_size, min_size=0, restart_required=0):
|
|
DatastoreConfigurationParameters.create(
|
|
datastore_version_id=main_dsv.id,
|
|
name=name,
|
|
restart_required=restart_required,
|
|
max_size=max_size,
|
|
min_size=0,
|
|
data_type=data_type,
|
|
deleted=0,
|
|
deleted_at=None)
|
|
|
|
add_parm('key_buffer_size', 'integer', 4294967296)
|
|
add_parm('connect_timeout', 'integer', 65535)
|
|
add_parm('join_buffer_size', 'integer', 4294967296)
|
|
add_parm('local_infile', 'integer', 1)
|
|
add_parm('collation_server', 'string', None, None)
|
|
add_parm('innodb_buffer_pool_size', 'integer', 57671680,
|
|
restart_required=1)
|
|
|
|
|
|
def initialize_database():
|
|
from trove.db import get_db_api
|
|
from trove.db.sqlalchemy import session
|
|
db_api = get_db_api()
|
|
db_api.drop_db(CONF) # Destroys the database, if it exists.
|
|
db_api.db_sync(CONF)
|
|
session.configure_db(CONF)
|
|
datastore_init()
|
|
db_api.configure_db(CONF)
|
|
|
|
|
|
def initialize_fakes(app):
|
|
# Set up WSGI interceptor. This sets up a fake host that responds each
|
|
# time httplib tries to communicate to localhost, port 8779.
|
|
def wsgi_interceptor(*args, **kwargs):
|
|
|
|
def call_back(env, start_response):
|
|
path_info = env.get('PATH_INFO')
|
|
if path_info:
|
|
env['PATH_INFO'] = urllib.unquote(path_info)
|
|
#print("%s %s" % (args, kwargs))
|
|
return app.__call__(env, start_response)
|
|
|
|
return call_back
|
|
|
|
wsgi_intercept.add_wsgi_intercept('localhost',
|
|
CONF.bind_port,
|
|
wsgi_interceptor)
|
|
from trove.tests.util import event_simulator
|
|
event_simulator.monkey_patch()
|
|
from trove.tests.fakes import taskmanager
|
|
taskmanager.monkey_patch()
|
|
|
|
|
|
def parse_args_for_test_config():
|
|
test_conf = 'etc/tests/localhost.test.conf'
|
|
repl = False
|
|
new_argv = []
|
|
for index in range(len(sys.argv)):
|
|
arg = sys.argv[index]
|
|
print(arg)
|
|
if arg[:14] == "--test-config=":
|
|
test_conf = arg[14:]
|
|
elif arg == "--repl":
|
|
repl = True
|
|
else:
|
|
new_argv.append(arg)
|
|
sys.argv = new_argv
|
|
return test_conf, repl
|
|
|
|
|
|
def run_tests(repl):
|
|
"""Runs all of the tests."""
|
|
|
|
if repl:
|
|
# Actually show errors in the repl.
|
|
sys.excepthook = original_excepthook
|
|
|
|
def no_thanks(exit_code):
|
|
print("Tests finished with exit code %d." % exit_code)
|
|
sys.exit = no_thanks
|
|
|
|
proboscis.TestProgram().run_and_exit()
|
|
|
|
if repl:
|
|
import code
|
|
code.interact()
|
|
|
|
|
|
def import_tests():
|
|
# F401 unused imports needed for tox tests
|
|
from trove.tests.api import backups # noqa
|
|
from trove.tests.api import header # noqa
|
|
from trove.tests.api import limits # noqa
|
|
from trove.tests.api import flavors # noqa
|
|
from trove.tests.api import versions # noqa
|
|
from trove.tests.api import instances as rd_instances # noqa
|
|
from trove.tests.api import instances_actions as rd_actions # noqa
|
|
from trove.tests.api import instances_delete # noqa
|
|
from trove.tests.api import instances_mysql_down # noqa
|
|
from trove.tests.api import instances_resize # noqa
|
|
from trove.tests.api import configurations # noqa
|
|
from trove.tests.api import databases # noqa
|
|
from trove.tests.api import datastores # noqa
|
|
from trove.tests.api import replication # noqa
|
|
from trove.tests.api import root # noqa
|
|
from trove.tests.api import root_on_create # noqa
|
|
from trove.tests.api import users # noqa
|
|
from trove.tests.api import user_access # noqa
|
|
from trove.tests.api.mgmt import accounts # noqa
|
|
from trove.tests.api.mgmt import admin_required # noqa
|
|
from trove.tests.api.mgmt import hosts # noqa
|
|
from trove.tests.api.mgmt import instances as mgmt_instances # noqa
|
|
from trove.tests.api.mgmt import instances_actions as mgmt_actions # noqa
|
|
from trove.tests.api.mgmt import storage # noqa
|
|
from trove.tests.api.mgmt import malformed_json # noqa
|
|
from trove.tests.db import migrations # noqa
|
|
|
|
|
|
def main(import_func):
|
|
try:
|
|
wsgi_install()
|
|
add_support_for_localization()
|
|
# Load Trove app
|
|
# Paste file needs absolute path
|
|
config_file = os.path.realpath('etc/trove/trove.conf.test')
|
|
# 'etc/trove/test-api-paste.ini'
|
|
app = initialize_trove(config_file)
|
|
# Initialize sqlite database.
|
|
initialize_database()
|
|
# Swap out WSGI, httplib, and other components with test doubles.
|
|
initialize_fakes(app)
|
|
|
|
# Initialize the test configuration.
|
|
test_config_file, repl = parse_args_for_test_config()
|
|
CONFIG.load_from_file(test_config_file)
|
|
|
|
import_func()
|
|
|
|
from trove.tests.util import event_simulator
|
|
event_simulator.run_main(functools.partial(run_tests, repl))
|
|
|
|
except Exception as e:
|
|
# Printing the error manually like this is necessary due to oddities
|
|
# with sys.excepthook.
|
|
print("Run tests failed: %s" % e)
|
|
traceback.print_exc()
|
|
raise
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main(import_tests)
|