openstack/vitrage
Code Issues Proposed changes

Merge "read heat templates file from resources dir"

Browse Source
This commit is contained in:
Zuul 2018-01-24 15:12:13 +00:00 committed by Gerrit Code Review
commit 728523a886
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/post_test_hook.sh
View File

@ -29,11 +29,7 @@ if [ "$DEVSTACK_GATE_USE_PYTHON3" == "True" ]; then
export PYTHON=python3 export PYTHON=python3
fi fi
sudo cp -rf $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/tests/resources/heat/heat_template.yaml /etc/vitrage/ sudo cp $DEVSTACK_PATH/tempest/etc/logging.conf.sample $DEVSTACK_PATH/tempest/etc/logging.conf
sudo cp -rf $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/tests/resources/heat/heat_nested_template.yaml /etc/vitrage/
sudo cp -rf $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/tests/resources/heat/server.yaml /etc/vitrage/
sudo cp -rf $DEVSTACK_PATH/tempest/etc/logging.conf.sample $DEVSTACK_PATH/tempest/etc/logging.conf
${PYTHON:-python} $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/add_legacy_dir_templates.py ${PYTHON:-python} $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/add_legacy_dir_templates.py

14
vitrage_tempest_tests/tests/datasources/test_heat_stack.py
View File

@ -16,6 +16,8 @@ from oslo_log import log as logging
from vitrage_tempest_tests.tests import utils from vitrage_tempest_tests.tests import utils
from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest
from vitrage_tempest_tests.tests.common.general_utils\
import tempest_resources_dir
from vitrage_tempest_tests.tests.common import heat_utils from vitrage_tempest_tests.tests.common import heat_utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -36,21 +38,19 @@ class TestHeatStack(BaseTopologyTest):
@utils.tempest_logger @utils.tempest_logger
def test_nested_heat_stack(self): def test_nested_heat_stack(self):
self._test_heat_stack( self._test_heat_stack(nested=True,
nested=True, tmpl_file='heat_nested_template.yaml')
template_file='/etc/vitrage/heat_nested_template.yaml')
@utils.tempest_logger @utils.tempest_logger
def test_heat_stack(self): def test_heat_stack(self):
self._test_heat_stack( self._test_heat_stack(nested=False, tmpl_file='heat_template.yaml')
nested=False, template_file='/etc/vitrage/heat_template.yaml')
def _test_heat_stack(self, nested, template_file): def _test_heat_stack(self, nested, tmpl_file):
"""heat stack test """heat stack test
This test validate correctness topology graph with heat stack module This test validate correctness topology graph with heat stack module
""" """
template_file = tempest_resources_dir() + '/heat/' + tmpl_file
try: try:
# Action # Action
heat_utils.create_stacks(self.NUM_STACKS, nested, template_file) heat_utils.create_stacks(self.NUM_STACKS, nested, template_file)

2
vitrage_tempest_tests/tests/resources/heat/heat_nested_template.yaml
View File

@ -9,4 +9,4 @@ resources:
properties: properties:
count: 1 count: 1
resource_def: resource_def:
type: file:///etc/vitrage/server.yaml type: server.yaml