diff options
| -rw-r--r-- | deploy/prepare/execute.py | 2 | ||||
| -rw-r--r-- | tests/prepare/test_execute.py | 55 |
2 files changed, 56 insertions, 1 deletions
diff --git a/deploy/prepare/execute.py b/deploy/prepare/execute.py index 2b46119d..11939b8d 100644 --- a/deploy/prepare/execute.py +++ b/deploy/prepare/execute.py @@ -16,7 +16,7 @@ KOLLA_CONF_PATH = '/etc/kolla/config' def _make_dirs(path): if not os.path.isdir(path): - os.makedirs(path, mode=0644) + os.makedirs(path, mode=0744) def _write_conf_file(conf_file, conf): diff --git a/tests/prepare/test_execute.py b/tests/prepare/test_execute.py new file mode 100644 index 00000000..6eb27025 --- /dev/null +++ b/tests/prepare/test_execute.py @@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corp and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +import os +import pytest + +import deploy.prepare.execute +from deploy.prepare.execute import ( + _set_qemu_compute, + _set_default_floating_pool, + _set_trusts_auth +) + +deploy.prepare.execute.KOLLA_CONF_PATH = '/tmp' + + +@pytest.fixture(scope="module") +def kolla_conf_file_nov_path(): + return os.path.join(deploy.prepare.execute.KOLLA_CONF_PATH, 'nova') + + +@pytest.fixture(scope="module") +def kolla_conf_file_heat_dir(): + return os.path.join(deploy.prepare.execute.KOLLA_CONF_PATH, 'heat') + + +@pytest.fixture(scope="module") +def conf_file_dir(data_root): + return os.path.join(data_root, 'lab_conf') + + +def test__set_qemu_compute(kolla_conf_file_nov_path): + _set_qemu_compute() + exp_conf_file = os.path.join(kolla_conf_file_nov_path, 'nova-compute.conf') + assert os.path.isfile(exp_conf_file) + + +def test__set_default_floating_pool(kolla_conf_file_nov_path, conf_file_dir): + network_conf_file = os.path.join(conf_file_dir, 'network_virtual1.yml') + _set_default_floating_pool(network_conf_file) + exp_conf_file = os.path.join(kolla_conf_file_nov_path, 'nova-api.conf') + assert os.path.isfile(exp_conf_file) + + +def test__set_trusts_auth(kolla_conf_file_heat_dir): + _set_trusts_auth() + exp_conf_file_1 = os.path.join(kolla_conf_file_heat_dir, 'heat-api.conf') + exp_conf_file_2 = os.path.join(kolla_conf_file_heat_dir, 'heat-engine.conf') + assert (os.path.isfile(exp_conf_file_1) and os.path.isfile(exp_conf_file_2)) |