Adding apex/overcloud/* unittests

Change-Id: I02cd512ba1ddaee2538bee7739e27b136112a0c6
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/apex/deploy.py b/apex/deploy.py
index 5ec0f7f..4b1ef85 100644 (file)
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -32,7 +32,7 @@ from apex.common.exceptions import ApexDeployException
 from apex.network import jumphost
 from apex.undercloud import undercloud as uc_lib
 from apex.overcloud import config as oc_cfg
-from apex.overcloud import overcloud_deploy
+from apex.overcloud import deploy as oc_deploy
 
 APEX_TEMP_DIR = tempfile.mkdtemp(prefix='apex_tmp')
 ANSIBLE_PATH = 'ansible/playbooks'
@@ -341,14 +341,14 @@ def main():
         # Prepare overcloud-full.qcow2
         logging.info("Preparing Overcloud for deployment...")
         sdn_image = os.path.join(args.image_dir, SDN_IMAGE)
-        overcloud_deploy.prep_image(deploy_settings, sdn_image, APEX_TEMP_DIR,
-                                    root_pw=root_pw)
+        oc_deploy.prep_image(deploy_settings, sdn_image, APEX_TEMP_DIR,
+                             root_pw=root_pw)
         opnfv_env = os.path.join(args.deploy_dir, args.env_file)
-        overcloud_deploy.prep_env(deploy_settings, net_settings, inventory,
-                                  opnfv_env, net_env_target, APEX_TEMP_DIR)
-        overcloud_deploy.create_deploy_cmd(deploy_settings, net_settings,
-                                           inventory, APEX_TEMP_DIR,
-                                           args.virtual, args.env_file)
+        oc_deploy.prep_env(deploy_settings, net_settings, inventory,
+                           opnfv_env, net_env_target, APEX_TEMP_DIR)
+        oc_deploy.create_deploy_cmd(deploy_settings, net_settings,
+                                    inventory, APEX_TEMP_DIR,
+                                    args.virtual, args.env_file)
         deploy_playbook = os.path.join(args.lib_dir, ANSIBLE_PATH,
                                        'deploy_overcloud.yml')
         virt_env = 'virtual-environment.yaml'
@@ -391,7 +391,7 @@ def main():
                                      'UserKnownHostsFile=/dev/null -o ' \
                                      'LogLevel=error'
         deploy_vars['external_network_cmds'] = \
-            overcloud_deploy.external_network_cmds(net_settings)
+            oc_deploy.external_network_cmds(net_settings)
         # TODO(trozet): just parse all ds_opts as deploy vars one time
         ds_opts = deploy_settings['deploy_options']
         deploy_vars['gluon'] = ds_opts['gluon']
@@ -405,7 +405,7 @@ def main():
         overcloudrc = os.path.join(APEX_TEMP_DIR, 'overcloudrc')
         if ds_opts['congress']:
             deploy_vars['congress_datasources'] = \
-                overcloud_deploy.create_congress_cmds(overcloudrc)
+                oc_deploy.create_congress_cmds(overcloudrc)
             deploy_vars['congress'] = True
         else:
             deploy_vars['congress'] = False

diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/deploy.py
similarity index 100%
rename from apex/overcloud/overcloud_deploy.py
rename to apex/overcloud/deploy.py

diff --git a/apex/tests/test_apex_overcloud_config.py b/apex/tests/test_apex_overcloud_config.py
new file mode 100644 (file)
index 0000000..4496553
--- /dev/null
+++ b/apex/tests/test_apex_overcloud_config.py
@@ -0,0 +1,80 @@
+##############################################################################
+# Copyright (c) 2016 Dan Radez (dradez@redhat.com) (Red Hat)
+#
+# 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 unittest
+
+from mock import patch
+from mock import MagicMock
+from mock import mock_open
+
+from apex.overcloud.config import create_nic_template
+from apex.common.exceptions import ApexDeployException
+
+from nose.tools import (
+    assert_regexp_matches,
+    assert_raises,
+    assert_equal)
+
+
+class TestOvercloudConfig(unittest.TestCase):
+    @classmethod
+    def setup_class(cls):
+        """This method is run once for each class before any tests are run"""
+
+    @classmethod
+    def teardown_class(cls):
+        """This method is run once for each class _after_ all tests are run"""
+
+    def setup(self):
+        """This method is run once before _each_ test method is executed"""
+
+    def teardown(self):
+        """This method is run once after _each_ test method is executed"""
+
+    def test_create_nic_template_invalid_role(self):
+        assert_raises(ApexDeployException, create_nic_template,
+                      None, None, None, None, None)
+
+    @patch('apex.overcloud.config.Environment')
+    @patch('builtins.open', mock_open(read_data=None), create=True)
+    def test_create_nic_template_ctl_fdio(self, mock_env):
+        network_settings = MagicMock()
+        deploy_settings = MagicMock()
+        deploy_settings.get.return_value = {'dataplane': 'fdio',
+                                            'sdn_controller': 'opendaylight'}
+
+        create_nic_template(network_settings, deploy_settings,
+                            'controller', 'template_dir', 'target_dir')
+
+    @patch('apex.overcloud.config.Environment')
+    @patch('builtins.open', mock_open(read_data=None), create=True)
+    def test_create_nic_template_ctl_ovs_dpdk(self, mock_env):
+        network_settings = MagicMock()
+        deploy_settings = MagicMock()
+        deploy_settings.get.return_value = {'dataplane': 'ovs_dpdk',
+                                            'sdn_controller': 'opendaylight',
+                                            'sfc': True}
+        create_nic_template(network_settings, deploy_settings,
+                            'controller', 'template_dir', 'target_dir')
+
+    @patch('apex.overcloud.config.Environment')
+    @patch('builtins.open', mock_open(read_data=None), create=True)
+    def test_create_nic_template_comp_fdio(self, mock_env):
+        network_settings = MagicMock()
+        deploy_settings = MagicMock()
+        deploy_settings.get.return_value = {'performance':
+                                            {'Compute':
+                                             {'vpp':
+                                              {'uio-driver': 'test',
+                                               'interface-options': 'test'}}},
+                                            'dvr': True,
+                                            'dataplane': 'fdio',
+                                            'sdn_controller': 'opendaylight'}
+        create_nic_template(network_settings, deploy_settings,
+                            'compute', 'template_dir', 'target_dir')

diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py
new file mode 100644 (file)
index 0000000..1df10e4
--- /dev/null
+++ b/apex/tests/test_apex_overcloud_deploy.py
@@ -0,0 +1,403 @@
+##############################################################################
+# Copyright (c) 2016 Dan Radez (dradez@redhat.com) (Red Hat)
+#
+# 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 sys
+import unittest
+
+from mock import patch
+from mock import MagicMock
+from mock import mock_open
+from io import StringIO
+
+from apex.common import constants as con
+from apex.common.exceptions import ApexDeployException
+from apex.overcloud.deploy import build_sdn_env_list
+from apex.overcloud.deploy import create_deploy_cmd
+from apex.overcloud.deploy import prep_image
+from apex.overcloud.deploy import make_ssh_key
+from apex.overcloud.deploy import prep_env
+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 nose.tools import (
+    assert_regexp_matches,
+    assert_raises,
+    assert_in,
+    assert_not_in,
+    assert_greater,
+    assert_equal)
+
+
+class TestOvercloudDeploy(unittest.TestCase):
+    @classmethod
+    def setup_class(cls):
+        """This method is run once for each class before any tests are run"""
+
+    @classmethod
+    def teardown_class(cls):
+        """This method is run once for each class _after_ all tests are run"""
+
+    def setup(self):
+        """This method is run once before _each_ test method is executed"""
+
+    def teardown(self):
+        """This method is run once after _each_ test method is executed"""
+
+    def test_build_sdn_env_list(self):
+        ds = {'sdn_controller': 'opendaylight'}
+        sdn_map = {'opendaylight': 'test'}
+        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_dict(self):
+        ds = {'opendaylight': True,
+              'sdn_controller': None}
+        sdn_map = {'opendaylight': {}}
+        assert_equal(build_sdn_env_list(ds, sdn_map), [])
+
+    def test_build_sdn_env_list_tuple(self):
+        ds = {'opendaylight': 'test',
+              'sdn_controller': None}
+        sdn_map = {'opendaylight': ('test', 'test')}
+        res = '/usr/share/openstack-tripleo-heat-templates/environments/test'
+        assert_equal(build_sdn_env_list(ds, sdn_map), [res])
+
+    @patch('apex.overcloud.deploy.prep_storage_env')
+    @patch('apex.overcloud.deploy.build_sdn_env_list')
+    @patch('builtins.open', mock_open())
+    def test_create_deploy_cmd(self, mock_sdn_list, mock_prep_storage):
+        mock_sdn_list.return_value = []
+        ds = {'deploy_options': MagicMock(),
+              'global_params': MagicMock()}
+        ds['global_params'].__getitem__.side_effect = \
+            lambda i: True if i == 'ha_enabled' else MagicMock()
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: True if i == 'congress' else MagicMock()
+        ds['deploy_options'].__contains__.side_effect = \
+            lambda i: True if i == 'congress' else MagicMock()
+        ns = {'ntp': ['ntp']}
+        inv = MagicMock()
+        inv.get_node_counts.return_value = (3, 2)
+        virt = True
+        result_cmd = create_deploy_cmd(ds, ns, inv, '/tmp', virt)
+        assert_in('--ntp-server ntp', result_cmd)
+        assert_in('enable_tacker.yaml', result_cmd)
+        assert_in('enable_congress.yaml', result_cmd)
+        assert_in('enable_barometer.yaml', result_cmd)
+        assert_in('virtual-environment.yaml', result_cmd)
+        assert_in('--control-scale 3', result_cmd)
+        assert_in('--compute-scale 2', result_cmd)
+
+    @patch('apex.overcloud.deploy.prep_storage_env')
+    @patch('apex.overcloud.deploy.build_sdn_env_list')
+    @patch('builtins.open', mock_open())
+    def test_create_deploy_cmd_no_ha_bm(self, mock_sdn_list,
+                                        mock_prep_storage):
+        mock_sdn_list.return_value = []
+        ds = {'deploy_options': MagicMock(),
+              'global_params': MagicMock()}
+        ds['global_params'].__getitem__.side_effect = \
+            lambda i: False if i == 'ha_enabled' else MagicMock()
+        ns = {'ntp': ['ntp']}
+        inv = MagicMock()
+        inv.get_node_counts.return_value = (3, 2)
+        virt = False
+        result_cmd = create_deploy_cmd(ds, ns, inv, '/tmp', virt)
+        assert_in('--ntp-server ntp', result_cmd)
+        assert_in('--control-scale 1', result_cmd)
+        assert_in('--compute-scale 2', result_cmd)
+        assert_in('baremetal-environment.yaml', result_cmd)
+        assert_not_in('enable_tacker.yaml', result_cmd)
+        assert_not_in('enable_congress.yaml', result_cmd)
+        assert_not_in('enable_barometer.yaml', result_cmd)
+
+    @patch('apex.overcloud.deploy.prep_storage_env')
+    @patch('apex.overcloud.deploy.build_sdn_env_list')
+    def test_create_deploy_cmd_raises(self, mock_sdn_list, mock_prep_storage):
+        mock_sdn_list.return_value = []
+        ds = {'deploy_options': MagicMock(),
+              'global_params': MagicMock()}
+        ns = {}
+        inv = MagicMock()
+        inv.get_node_counts.return_value = (0, 0)
+        virt = False
+        assert_raises(ApexDeployException, create_deploy_cmd,
+                      ds, ns, inv, '/tmp', virt)
+
+    @patch('apex.overcloud.deploy.virt_utils')
+    @patch('apex.overcloud.deploy.shutil')
+    @patch('apex.overcloud.deploy.os.path')
+    @patch('builtins.open', mock_open())
+    def test_prep_image(self, mock_os_path, mock_shutil, mock_virt_utils):
+        ds_opts = {'dataplane': 'fdio',
+                   'sdn_controller': 'opendaylight',
+                   'odl_version': 'master'}
+        ds = {'deploy_options': MagicMock(),
+              'global_params': MagicMock()}
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: ds_opts.get(i, MagicMock())
+        prep_image(ds, 'undercloud.qcow2', '/tmp', root_pw='test')
+        mock_virt_utils.virt_customize.assert_called()
+
+    @patch('apex.overcloud.deploy.virt_utils')
+    @patch('apex.overcloud.deploy.shutil')
+    @patch('apex.overcloud.deploy.os.path')
+    @patch('builtins.open', mock_open())
+    def test_prep_image_sdn_false(self, mock_os_path, mock_shutil,
+                                  mock_virt_utils):
+        ds_opts = {'dataplane': 'fdio',
+                   'sdn_controller': False}
+        ds = {'deploy_options': MagicMock(),
+              'global_params': MagicMock()}
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: ds_opts.get(i, MagicMock())
+        prep_image(ds, 'undercloud.qcow2', '/tmp', root_pw='test')
+        mock_virt_utils.virt_customize.assert_called()
+
+    @patch('apex.overcloud.deploy.virt_utils')
+    @patch('apex.overcloud.deploy.shutil')
+    @patch('apex.overcloud.deploy.os.path')
+    @patch('builtins.open', mock_open())
+    def test_prep_image_sdn_odl(self, mock_os_path, mock_shutil,
+                                mock_virt_utils):
+        ds_opts = {'dataplane': 'ovs',
+                   'sdn_controller': 'opendaylight',
+                   'odl_version': con.DEFAULT_ODL_VERSION,
+                   'odl_vpp_netvirt': True}
+        ds = {'deploy_options': MagicMock(),
+              'global_params': MagicMock()}
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: ds_opts.get(i, MagicMock())
+        ds['deploy_options'].__contains__.side_effect = \
+            lambda i: True if i in ds_opts else MagicMock()
+        prep_image(ds, 'undercloud.qcow2', '/tmp', root_pw='test')
+        mock_virt_utils.virt_customize.assert_called()
+
+    @patch('apex.overcloud.deploy.virt_utils')
+    @patch('apex.overcloud.deploy.shutil')
+    @patch('apex.overcloud.deploy.os.path')
+    @patch('builtins.open', mock_open())
+    def test_prep_image_sdn_odl_not_def(self, mock_os_path,
+                                        mock_shutil, mock_virt_utils):
+        ds_opts = {'dataplane': 'ovs',
+                   'sdn_controller': 'opendaylight',
+                   'odl_version': 'uncommon'}
+        ds = {'deploy_options': MagicMock(),
+              'global_params': MagicMock()}
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: ds_opts.get(i, MagicMock())
+        prep_image(ds, 'undercloud.qcow2', '/tmp', root_pw='test')
+        mock_virt_utils.virt_customize.assert_called()
+
+    @patch('apex.overcloud.deploy.virt_utils')
+    @patch('apex.overcloud.deploy.shutil')
+    @patch('apex.overcloud.deploy.os.path')
+    @patch('builtins.open', mock_open())
+    def test_prep_image_sdn_ovn(self, mock_os_path, mock_shutil,
+                                mock_virt_utils):
+        ds_opts = {'dataplane': 'ovs',
+                   'sdn_controller': 'ovn'}
+        ds = {'deploy_options': MagicMock(),
+              'global_params': MagicMock()}
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: ds_opts.get(i, MagicMock())
+        prep_image(ds, 'undercloud.qcow2', '/tmp', root_pw='test')
+        mock_virt_utils.virt_customize.assert_called()
+
+    @patch('apex.overcloud.deploy.os.path.isfile')
+    def test_prep_image_no_image(self, mock_isfile):
+        mock_isfile.return_value = False
+        assert_raises(ApexDeployException, prep_image,
+                      {}, 'undercloud.qcow2', '/tmp')
+
+    def test_make_ssh_key(self):
+        priv, pub = make_ssh_key()
+        assert_in('-----BEGIN PRIVATE KEY-----', priv)
+        assert_in('ssh-rsa', pub)
+
+    @patch('apex.overcloud.deploy.fileinput')
+    @patch('apex.overcloud.deploy.shutil')
+    def test_prep_env(self, mock_shutil, mock_fileinput):
+        mock_fileinput.input.return_value = \
+            ['CloudDomain', 'replace_private_key', 'replace_public_key',
+             'opendaylight::vpp_routing_node', 'ControllerExtraConfig',
+             'NovaComputeExtraConfig', 'ComputeKernelArgs', 'HostCpusList',
+             'ComputeExtraConfigPre', 'resource_registry',
+             'NovaSchedulerDefaultFilters']
+        ds = {'deploy_options':
+              {'sdn_controller': 'opendaylight',
+               'odl_vpp_routing_node': 'test',
+               'dataplane': 'ovs_dpdk',
+               'performance': {'Compute': {'vpp': {'main-core': 'test',
+                                                   'corelist-workers': 'test'},
+                                           'ovs': {'dpdk_cores': 'test'},
+                                           'kernel': {'test': 'test'}},
+                               'Controller': {'vpp': 'test'}}}}
+        ns = {'domain_name': 'test.domain',
+              'networks':
+              {'tenant':
+               {'nic_mapping': {'controller':
+                                {'members': ['test']},
+                                'compute':
+                                {'members': ['test']}}}}}
+        inv = None
+        try:
+            # Swap stdout
+            saved_stdout = sys.stdout
+            out = StringIO()
+            sys.stdout = out
+            # run test
+            prep_env(ds, ns, inv, 'opnfv-env.yml', '/net-env.yml', '/tmp')
+            output = out.getvalue().strip()
+            assert_in('CloudDomain: test.domain', output)
+            assert_in('ssh-rsa', output)
+            assert_in('ComputeKernelArgs: \'test=test \'', output)
+            assert_in('fdio::vpp_cpu_main_core: \'test\'', output)
+        finally:
+            # put stdout back
+            sys.stdout = saved_stdout
+
+    @patch('apex.overcloud.deploy.fileinput')
+    @patch('apex.overcloud.deploy.shutil')
+    def test_prep_env_round_two(self, mock_shutil, mock_fileinput):
+        mock_fileinput.input.return_value = \
+            ['NeutronVPPAgentPhysnets']
+        ds = {'deploy_options':
+              {'sdn_controller': False,
+               'dataplane': 'fdio',
+               'performance': {'Compute': {},
+                               'Controller': {}}}}
+        ns = {'domain_name': 'test.domain',
+              'networks':
+              {'tenant':
+               {'nic_mapping': {'controller':
+                                {'members': ['test']},
+                                'compute':
+                                {'members': ['test']}}}}}
+        inv = None
+        try:
+            # Swap stdout
+            saved_stdout = sys.stdout
+            out = StringIO()
+            sys.stdout = out
+            # run test
+            prep_env(ds, ns, inv, 'opnfv-env.yml', '/net-env.yml', '/tmp')
+            output = out.getvalue().strip()
+            assert_in('NeutronVPPAgentPhysnets: \'datacentre:test\'', output)
+            assert_in('NeutronVPPAgentPhysnets', output)
+        finally:
+            # put stdout back
+            sys.stdout = saved_stdout
+
+    @patch('apex.overcloud.deploy.fileinput')
+    @patch('apex.overcloud.deploy.shutil')
+    def test_prep_env_round_three(self, mock_shutil, mock_fileinput):
+        mock_fileinput.input.return_value = \
+            ['OS::TripleO::Services::NeutronDhcpAgent',
+             'NeutronDhcpAgentsPerNetwork', 'ComputeServices']
+        ds = {'deploy_options':
+              {'sdn_controller': 'opendaylight',
+               'dataplane': 'fdio',
+               'dvr': True}}
+        ns = {'domain_name': 'test.domain',
+              'networks':
+              {'tenant':
+               {'nic_mapping': {'controller':
+                                {'members': ['test']},
+                                'compute':
+                                {'members': ['test']}}}}}
+        inv = MagicMock()
+        inv.get_node_counts.return_value = (3, 2)
+        try:
+            # Swap stdout
+            saved_stdout = sys.stdout
+            out = StringIO()
+            sys.stdout = out
+            # run test
+            prep_env(ds, ns, inv, 'opnfv-env.yml', '/net-env.yml', '/tmp')
+            output = out.getvalue().strip()
+            assert_in('NeutronDhcpAgentsPerNetwork: 2', output)
+        finally:
+            # put stdout back
+            sys.stdout = saved_stdout
+
+    def test_generate_ceph_key(self):
+        assert_equal(len(generate_ceph_key()), 40)
+
+    @patch('apex.overcloud.deploy.generate_ceph_key')
+    @patch('apex.overcloud.deploy.fileinput')
+    @patch('apex.overcloud.deploy.os.path.isfile')
+    @patch('builtins.open', mock_open())
+    def test_prep_storage_env(self, mock_isfile, mock_fileinput,
+                              mock_ceph_key):
+        mock_fileinput.input.return_value = \
+            ['CephClusterFSID', 'CephMonKey', 'CephAdminKey', 'random_key']
+        ds = {'deploy_options': MagicMock()}
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: '/dev/sdx' if i == 'ceph_device' else MagicMock()
+        ds['deploy_options'].__contains__.side_effect = \
+            lambda i: True if i == 'ceph_device' else MagicMock()
+        prep_storage_env(ds, '/tmp')
+
+    @patch('apex.overcloud.deploy.os.path.isfile')
+    @patch('builtins.open', mock_open())
+    def test_prep_storage_env_raises(self, mock_isfile):
+        mock_isfile.return_value = False
+        ds = {'deploy_options': MagicMock()}
+        assert_raises(ApexDeployException, prep_storage_env, ds, '/tmp')
+
+    def test_external_network_cmds(self):
+        cidr = MagicMock()
+        cidr.version = 6
+        ns_dict = {'networks':
+                   {'external': [{'floating_ip_range': (0, 1),
+                                  'nic_mapping':
+                                  {'compute': {'vlan': 'native'}},
+                                  'gateway': 'gw',
+                                  'cidr': cidr}]}}
+        ns = MagicMock()
+        ns.enabled_network_list = ['external']
+        ns.__getitem__.side_effect = lambda i: ns_dict.get(i, MagicMock())
+        cmds = ' '.join(external_network_cmds(ns))
+        assert_in('--external', cmds)
+        assert_in('--allocation-pool start=0,end=1', cmds)
+        assert_in('--gateway gw', cmds)
+        assert_in('--network external', cmds)
+
+    def test_external_network_cmds_no_ext(self):
+        cidr = MagicMock()
+        cidr.version = 6
+        ns_dict = {'apex':
+                   {'networks':
+                    {'admin':
+                     {'introspection_range': (0, 1),
+                      'nic_mapping':
+                      {'compute': {'vlan': '123'}},
+                      'gateway': 'gw',
+                      'cidr': cidr}}}}
+        ns = MagicMock()
+        ns.enabled_network_list = ['admin']
+        ns.__getitem__.side_effect = lambda i: ns_dict.get(i, MagicMock())
+        external_network_cmds(ns)
+        cmds = ' '.join(external_network_cmds(ns))
+        assert_in('--external', cmds)
+        assert_in('--allocation-pool start=0,end=1', cmds)
+        assert_in('--network external', cmds)
+        assert_in('--provider-network-type vlan', cmds)
+
+    @patch('apex.overcloud.deploy.parsers')
+    def test_create_congress_cmds(self, mock_parsers):
+        assert_greater(len(create_congress_cmds('overcloud_file')), 0)
+
+    @patch('apex.overcloud.deploy.parsers.parse_overcloudrc')
+    def test_create_congress_cmds_raises(self, mock_parsers):
+        mock_parsers.return_value.__getitem__.side_effect = KeyError()
+        assert_raises(KeyError, create_congress_cmds, 'overcloud_file')

diff --git a/tox.ini b/tox.ini
index cde191c..6d53f30 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ commands =
   --cover-tests \
   --cover-package=apex \
   --cover-xml \
-  --cover-min-percentage 94 \
+  --cover-min-percentage 95 \
   apex/tests
   coverage report