diff options
author | Tim Rozet <trozet@redhat.com> | 2018-01-15 15:07:07 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-01-15 15:07:07 +0000 |
commit | f867d216c135c30d3c86a28bf52495639ff4e890 (patch) | |
tree | 6ea6a2607b14d518926108c89aedb1d437810ce8 /apex/tests/test_apex_overcloud_deploy.py | |
parent | b4697b5cd6c5c0432fcd12ca78785f425e5fcf5b (diff) | |
parent | 847f7673f8ba68583c85eee5c30d7657f82ad50f (diff) |
Merge "Fixes including default SDN env file in deploy cmd"
Diffstat (limited to 'apex/tests/test_apex_overcloud_deploy.py')
-rw-r--r-- | apex/tests/test_apex_overcloud_deploy.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py index 59e9048f..8ff98a8d 100644 --- a/apex/tests/test_apex_overcloud_deploy.py +++ b/apex/tests/test_apex_overcloud_deploy.py @@ -7,6 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +import os import sys import unittest @@ -26,6 +27,7 @@ from apex.overcloud.deploy import generate_ceph_key from apex.overcloud.deploy import prep_storage_env from apex.overcloud.deploy import external_network_cmds from apex.overcloud.deploy import create_congress_cmds +from apex.overcloud.deploy import SDN_FILE_MAP from nose.tools import ( assert_regexp_matches, @@ -70,6 +72,14 @@ class TestOvercloudDeploy(unittest.TestCase): res = '/usr/share/openstack-tripleo-heat-templates/environments/test' assert_equal(build_sdn_env_list(ds, sdn_map), [res]) + def test_build_sdn_env_list_with_default(self): + ds = {'sdn_controller': 'opendaylight', + 'vpn': True} + prefix = '/usr/share/openstack-tripleo-heat-templates/environments' + res = [os.path.join(prefix, 'neutron-opendaylight.yaml'), + os.path.join(prefix, 'neutron-bgpvpn-opendaylight.yaml')] + assert_equal(build_sdn_env_list(ds, SDN_FILE_MAP), res) + @patch('apex.overcloud.deploy.prep_storage_env') @patch('apex.overcloud.deploy.build_sdn_env_list') @patch('builtins.open', mock_open()) |