summaryrefslogtreecommitdiffstats
path: root/apex/tests
diff options
context:
space:
mode:
authorRicardo Noriega <rnoriega@redhat.com>2018-03-28 10:35:11 -0700
committerRicardo Noriega <rnoriega@redhat.com>2018-03-28 11:25:58 -0700
commitb047099b609eac330486f23913e8046d0f22c1ab (patch)
treea054622d413c4f4376aa39c52699262f808004ff /apex/tests
parentf6dbb3929d904b4d5a9ee01f8270051e29ac1ec3 (diff)
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 <rnoriega@redhat.com>
Diffstat (limited to 'apex/tests')
-rw-r--r--apex/tests/test_apex_overcloud_deploy.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py
index 54f95bb..6898d36 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}