diff --git a/designate/backend/agent_backend/impl_denominator.py b/designate/backend/agent_backend/impl_denominator.py index 835a2b2dc..caa1e8a6c 100644 --- a/designate/backend/agent_backend/impl_denominator.py +++ b/designate/backend/agent_backend/impl_denominator.py @@ -69,7 +69,7 @@ class Denominator(object): def _base(self): call = ['denominator', '-q', '-n', self.config.name] - # NOTE: When path to denominator configuration file is ommitted, + # NOTE: When path to denominator configuration file is omitted, # ~/.denominatorconfig file will be used by default. if self.config.config_file: call.extend(['-C', self.config.config_file]) diff --git a/designate/central/service.py b/designate/central/service.py index ba542ebeb..23639ee80 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -2673,7 +2673,7 @@ class Service(service.RPCService, service.Service): zone_import.message = 'An SOA record is required.' zone_import.status = 'ERROR' except Exception as e: - msg = _LE('An undefined error occured during zone import') + msg = _LE('An undefined error occurred during zone import') LOG.exception(msg) msg = 'An undefined error occurred. %s' % e.message[:130] zone_import.message = msg @@ -2700,7 +2700,7 @@ class Service(service.RPCService, service.Service): zone_import.status = 'ERROR' zone_import.message = e.message except Exception as e: - msg = _LE('An undefined error occured during zone ' + msg = _LE('An undefined error occurred during zone ' 'import creation') LOG.exception(msg) msg = 'An undefined error occurred. %s' % e.message[:130] diff --git a/designate/manage/pool.py b/designate/manage/pool.py index 9825e99a6..68b60de70 100644 --- a/designate/manage/pool.py +++ b/designate/manage/pool.py @@ -46,7 +46,7 @@ class PoolCommands(base.Commands): try: pools = self.central_api.find_pools(self.context) except messaging.exceptions.MessagingTimeout: - LOG.critical(_LC("No response recieved from designate-central. " + LOG.critical(_LC("No response received from designate-central. " "Check it is running, and retry")) with open(file, 'w') as stream: yaml.dump( @@ -62,7 +62,7 @@ class PoolCommands(base.Commands): try: pools = self.central_api.find_pools(self.context) except messaging.exceptions.MessagingTimeout: - LOG.critical(_LC("No response recieved from designate-central. " + LOG.critical(_LC("No response received from designate-central. " "Check it is running, and retry")) r_pools = objects.PoolList() for pool in pools: @@ -91,7 +91,7 @@ class PoolCommands(base.Commands): default_flow_style=False)) except messaging.exceptions.MessagingTimeout: - LOG.critical(_LC("No response recieved from designate-central. " + LOG.critical(_LC("No response received from designate-central. " "Check it is running, and retry")) @base.args('--file', help='The path to the yaml file describing the pools', @@ -152,7 +152,7 @@ class PoolCommands(base.Commands): LOG.info(_LI('Creating new pool: %s'), pool) self.central_api.create_pool(self.context, pool) except messaging.exceptions.MessagingTimeout: - LOG.critical(_LC("No response recieved from designate-central." + LOG.critical(_LC("No response received from designate-central." " Check it is running, and retry")) if delete: @@ -176,7 +176,7 @@ class PoolCommands(base.Commands): self.central_api.delete_pool(self.context, p.id) except messaging.exceptions.MessagingTimeout: - LOG.critical(_LC("No response recieved from " + LOG.critical(_LC("No response received from " "designate-central. " "Check it is running, and retry")) diff --git a/designate/tests/unit/test_objects/test_adapters.py b/designate/tests/unit/test_objects/test_adapters.py index 991ba6daf..00b52fdd1 100644 --- a/designate/tests/unit/test_objects/test_adapters.py +++ b/designate/tests/unit/test_objects/test_adapters.py @@ -37,13 +37,13 @@ class DesignateTestAdapter(adapters.DesignateAdapter): } -class DesignateTestPersistantObject( +class DesignateTestPersistentObject( objects.DesignateObject, objects.base.PersistentObjectMixin): pass class DesignateDateTimeAdaptor(adapters.DesignateAdapter): - ADAPTER_OBJECT = DesignateTestPersistantObject + ADAPTER_OBJECT = DesignateTestPersistentObject ADAPTER_FORMAT = 'TEST_API' MODIFICATIONS = { @@ -65,7 +65,7 @@ class DesignateAdapterTest(oslotest.base.BaseTestCase): adapters.DesignateAdapter.render('TEST_API', objects.DesignateObject()) def test_datetime_format(self): - test_obj = DesignateTestPersistantObject() + test_obj = DesignateTestPersistentObject() test_obj.created_at = timeutils.utcnow() test_dict = adapters.DesignateAdapter.render('TEST_API', test_obj)