summaryrefslogtreecommitdiffstats
path: root/apex/tests
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-10-20 15:30:20 -0400
committerTim Rozet <trozet@redhat.com>2018-02-07 21:56:16 +0000
commit63000d6dba8990bd01683a6e210cf7e57f3664f7 (patch)
treef0145a867f2b6cf7b09bc0521a4279a4e6c221f6 /apex/tests
parent50f1d92e0aa0e5720adc44f23ed59a4cfc1c4b58 (diff)
Allow disabling ipxe for provisioning
JIRA: APEX-535 Change-Id: I52d17e962fc4a504db1ddbc20df0ac56a208f34b Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'apex/tests')
-rw-r--r--apex/tests/test_apex_undercloud.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/apex/tests/test_apex_undercloud.py b/apex/tests/test_apex_undercloud.py
index 9458bf9..c821ade 100644
--- a/apex/tests/test_apex_undercloud.py
+++ b/apex/tests/test_apex_undercloud.py
@@ -121,7 +121,8 @@ class TestUndercloud(unittest.TestCase):
mock_generate_config, mock_utils):
uc = Undercloud('img_path', 'tplt_path', external_network=True)
ns = MagicMock()
- uc.configure(ns, 'playbook', '/tmp/dir')
+ ds = MagicMock()
+ uc.configure(ns, ds, 'playbook', '/tmp/dir')
@patch('apex.undercloud.undercloud.utils')
@patch.object(Undercloud, 'generate_config', return_value={})
@@ -131,10 +132,11 @@ class TestUndercloud(unittest.TestCase):
mock_generate_config, mock_utils):
uc = Undercloud('img_path', 'tplt_path', external_network=True)
ns = MagicMock()
+ ds = MagicMock()
subps_err = subprocess.CalledProcessError(1, 'cmd')
mock_utils.run_ansible.side_effect = subps_err
assert_raises(ApexUndercloudException,
- uc.configure, ns, 'playbook', '/tmp/dir')
+ uc.configure, ns, ds, 'playbook', '/tmp/dir')
@patch('apex.undercloud.undercloud.os.remove')
@patch('apex.undercloud.undercloud.os.path')
@@ -192,5 +194,6 @@ class TestUndercloud(unittest.TestCase):
'dns-domain': 'dns',
'networks': {'admin': ns_net,
'external': [ns_net]}}
+ ds = {'global_params': {}}
- Undercloud('img_path', 'tplt_path').generate_config(ns)
+ Undercloud('img_path', 'tplt_path').generate_config(ns, ds)