From d40b93e9abbd0cc359d8cdd19a7627ecc918d3d6 Mon Sep 17 00:00:00 2001 From: Noam Bloom Date: Thu, 2 Jun 2016 11:16:57 +0300 Subject: [PATCH] Added Template&Confs to Tempest Env When tempests runs on zuul it'll copy templates and static physical configuration files from the vitrage_tempest dir to /etc/vitrage/ Change-Id: If961d099ce04c200cf9d03486fc891088b6dffd2 --- devstack/post_test_hook.sh | 5 ++++- .../tests/api/datasources/test_static_physical.py | 9 ++++++--- ...iguration.yaml => static_physical_configuration.yaml} | 0 3 files changed, 10 insertions(+), 4 deletions(-) rename vitrage_tempest_tests/tests/resources/static_physical/{tempest_configuration.yaml => static_physical_configuration.yaml} (100%) diff --git a/devstack/post_test_hook.sh b/devstack/post_test_hook.sh index 7c8cda8d5..db79869b3 100644 --- a/devstack/post_test_hook.sh +++ b/devstack/post_test_hook.sh @@ -29,7 +29,10 @@ fi (cd $DEVSTACK_PATH/tempest/; sudo pip install -r requirements.txt -r test-requirements.txt) (cd $DEVSTACK_PATH/tempest/; sudo oslo-config-generator --config-file etc/config-generator.tempest.conf --output-file etc/tempest.conf) -(cd $DEVSTACK_PATH/; sudo sh -c 'cat vitrage/devstack/files/tempest/tempest.conf >> tempest/etc/tempest.conf') +(cd $DEVSTACK_PATH/; sudo sh -c 'cp -rf vitrage/devstack/files/tempest/tempest.conf /etc/tempest.conf') +(cd $DEVSTACK_PATH/; sudo sh -c 'cp -rf vitrage/vitrage_tempest_tests/tests/resources/static_physical/* /etc/vitrage/static_datasources/') +(cd $DEVSTACK_PATH/; sudo sh -c 'cp -rf vitrage/vitrage_tempest_tests/tests/resources/templates/api/* /etc/vitrage/templates/') + sudo cp $DEVSTACK_PATH/tempest/etc/logging.conf.sample $DEVSTACK_PATH/tempest/etc/logging.conf diff --git a/vitrage_tempest_tests/tests/api/datasources/test_static_physical.py b/vitrage_tempest_tests/tests/api/datasources/test_static_physical.py index 0e4659607..f9ee906f0 100644 --- a/vitrage_tempest_tests/tests/api/datasources/test_static_physical.py +++ b/vitrage_tempest_tests/tests/api/datasources/test_static_physical.py @@ -50,14 +50,16 @@ class TestStaticPhysical(BaseApiTest): # template file file_path = '/opt/stack/vitrage/vitrage_tempest_tests/tests/' \ - 'resources/static_physical/tempest_configuration.yaml' + 'resources/static_physical/' \ + 'static_physical_configuration.yaml' with open(file_path, 'rb') as f: template_data = f.read() template_data = template_data.replace('tmp-devstack', hostname) # new file new_file = open( - '/etc/vitrage/static_datasources/tempest_configuration.yaml', 'wb') + '/etc/vitrage/static_datasources/' + 'static_physical_configuration.yaml', 'wb') new_file.write(template_data) new_file.close() @@ -65,7 +67,8 @@ class TestStaticPhysical(BaseApiTest): @staticmethod def _delete_switches(): - path = '/etc/vitrage/static_datasources/tempest_configuration.yaml' + path = '/etc/vitrage/static_datasources/' \ + 'static_physical_configuration.yaml' if os.path.exists(path): os.remove(path) diff --git a/vitrage_tempest_tests/tests/resources/static_physical/tempest_configuration.yaml b/vitrage_tempest_tests/tests/resources/static_physical/static_physical_configuration.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/static_physical/tempest_configuration.yaml rename to vitrage_tempest_tests/tests/resources/static_physical/static_physical_configuration.yaml