From b047099b609eac330486f23913e8046d0f22c1ab Mon Sep 17 00:00:00 2001 From: Ricardo Noriega Date: Wed, 28 Mar 2018 10:35:11 -0700 Subject: Generalization of recursive function Now, SDN_MAP is not needed to have a boolean true value, but it will check internally posible value formats such dicts and tuples. Change-Id: Idaf492952a7dd9e48e16f42dcbf5c59d981dd535 Signed-off-by: Ricardo Noriega --- apex/tests/test_apex_overcloud_deploy.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'apex/tests/test_apex_overcloud_deploy.py') diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py index 54f95bb7..6898d36c 100644 --- a/apex/tests/test_apex_overcloud_deploy.py +++ b/apex/tests/test_apex_overcloud_deploy.py @@ -74,6 +74,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_string(self): + ds = {'sdn_controller': 'opendaylight', + 'sriov': 'xxx'} + prefix = '/usr/share/openstack-tripleo-heat-templates/environments' + res = [os.path.join(prefix, 'neutron-opendaylight.yaml'), + os.path.join(prefix, 'neutron-opendaylight-sriov.yaml')] + assert_equal(build_sdn_env_list(ds, SDN_FILE_MAP), res) + def test_build_sdn_env_list_with_default(self): ds = {'sdn_controller': 'opendaylight', 'vpn': True} -- cgit 1.2.3-korg