openstack
/
fuel-ostf
Code Issues Proposed changes

Populate test cache if it's empty 

In commit e232d498a4 bug (#1367359)
when there were no TestRuns for cluster when OSTF tests were started
without asking for a lost of available TestRuns.

In the same case when tests cache is empty not all required
objects (ClusterTestingPattern) will be created in DB that are
needed to correctly run tests.

Now we force cache repopulation if it's empty.

Additionally removed some dead code that is a duplicate
of modified one in this changestet.

Change-Id: If7dd352f2a48c27b7aa9f41c6c5a4528021a8208
Closes-Bug: #1387733
This commit is contained in:
Sebastian Kalinowski 2014-11-13 11:08:03 +01:00
parent 720cc1308c
commit b21dc974e8
3 changed files with 7 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuel_plugin/ostf_adapter/mixins.py
View File

@ -180,6 +180,13 @@ def _get_cluster_depl_tags(cluster_id, token=None):
def _add_cluster_testing_pattern(session, cluster_data):
to_database = []
global TEST_REPOSITORY
# populate cache if it's empty
if not TEST_REPOSITORY:
cache_test_repository(session)
for test_set in TEST_REPOSITORY:
if nose_utils.process_deployment_tags(
cluster_data['deployment_tags'],

15
fuel_plugin/ostf_adapter/storage/simple_cache.py
View File

@ -1,15 +0,0 @@
# Copyright 2013 Mirantis, Inc.
#
# 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.
TEST_REPOSITORY = []

56
fuel_plugin/ostf_adapter/storage/storage_utils.py
View File

@ -1,56 +0,0 @@
# Copyright 2013 Mirantis, Inc.
#
# 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.
from fuel_plugin.ostf_adapter.storage.simple_cache import TEST_REPOSITORY
from fuel_plugin.ostf_adapter.storage import models
from fuel_plugin.ostf_adapter.nose_plugin.nose_utils import \
process_deployment_tags
def update_all_running_test_runs(session):
session.query(models.TestRun). \
filter_by(status='running'). \
update({'status': 'finished'}, synchronize_session=False)
session.query(models.Test). \
filter(models.Test.status.in_(('running', 'wait_running'))). \
update({'status': 'stopped'}, synchronize_session=False)
def add_cluster_testing_pattern(session, cluster_data):
with session.begin(subtransactions=True):
to_database = []
for test_set in TEST_REPOSITORY:
if process_deployment_tags(
cluster_data['deployment_tags'],
test_set['deployment_tags']
):
testing_pattern = dict()
testing_pattern['cluster_id'] = cluster_data['cluster_id']
testing_pattern['test_set_id'] = test_set['test_set_id']
testing_pattern['tests'] = []
for test in test_set['tests']:
if process_deployment_tags(
cluster_data['deployment_tags'],
test['deployment_tags']
):
testing_pattern['tests'].append(test['name'])
to_database.append(
models.ClusterTestingPattern(**testing_pattern)
)
session.add_all(to_database)