diff options
| -rw-r--r-- | snaps/openstack/create_keypairs.py | 8 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_keypairs_tests.py | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/snaps/openstack/create_keypairs.py b/snaps/openstack/create_keypairs.py index 83cfbbc..03ff7ec 100644 --- a/snaps/openstack/create_keypairs.py +++ b/snaps/openstack/create_keypairs.py @@ -130,4 +130,10 @@ class KeypairSettings: self.private_filepath = kwargs.get('private_filepath') if not self.name: - raise Exception('Name is a required attribute') + raise KeypairSettingsError('Name is a required attribute') + + +class KeypairSettingsError(Exception): + """ + Exception to be thrown when keypair settings are incorrect + """ diff --git a/snaps/openstack/tests/create_keypairs_tests.py b/snaps/openstack/tests/create_keypairs_tests.py index 29fe843..aeeefaf 100644 --- a/snaps/openstack/tests/create_keypairs_tests.py +++ b/snaps/openstack/tests/create_keypairs_tests.py @@ -16,7 +16,8 @@ import unittest import uuid import os -from snaps.openstack.create_keypairs import KeypairSettings, OpenStackKeypair +from snaps.openstack.create_keypairs import ( + KeypairSettings, OpenStackKeypair, KeypairSettingsError) from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase from snaps.openstack.utils import nova_utils @@ -29,11 +30,11 @@ class KeypairSettingsUnitTests(unittest.TestCase): """ def test_no_params(self): - with self.assertRaises(Exception): + with self.assertRaises(KeypairSettingsError): KeypairSettings() def test_empty_config(self): - with self.assertRaises(Exception): + with self.assertRaises(KeypairSettingsError): KeypairSettings(**dict()) def test_name_only(self): @@ -84,7 +85,7 @@ class KeypairSettingsUnitTests(unittest.TestCase): def test_config_all(self): settings = KeypairSettings( **{'name': 'foo', 'public_filepath': '/foo/bar.pub', - 'private_filepath': '/foo/bar'}) + 'private_filepath': '/foo/bar'}) self.assertEqual('foo', settings.name) self.assertEqual('/foo/bar.pub', settings.public_filepath) self.assertEqual('/foo/bar', settings.private_filepath) |