openstack
/
charms.openstack
Code Issues Proposed changes

Merge "fix typos in documentation and codes"

This commit is contained in:
Zuul 2018-07-17 21:08:38 +00:00 committed by Gerrit Code Review
parent 51d00c45e2 2b8d66466d
commit 454f88ee25
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -323,7 +323,7 @@ That if `required_relations` is `['identity-service']`, then the
`identity-service.available` states.
If the charm author requires additional states to be checked for an interface,
then the method `states_to_check` should be overriden in the derived class and
then the method `states_to_check` should be overridden in the derived class and
additional states, the status and error message provided. See the code for
further details.

8
charms_openstack/charm/classes.py
View File

@ -181,7 +181,7 @@ class OpenStackAPICharm(OpenStackCharm):
# If None, then the default ConfigurationAdapter is used.
configuration_class = os_adapters.APIConfigurationAdapter
# These can be overriden in the derived charm class to allow specialism of
# These can be overridden in the derived charm class to allow specialism of
# config files. These values are read in the APIConfigurationAdapter and
# used to furnish the dictionary provided from the property
# 'wsgi_worker_context'. e.g. config.wsgi_worker_context.processes would
@ -238,13 +238,13 @@ class OpenStackAPICharm(OpenStackCharm):
def get_amqp_credentials(self):
"""Provide the default amqp username and vhost as a tuple.
This needs to be overriden in a derived class to provide the username
This needs to be overridden in a derived class to provide the username
and vhost to the amqp interface IF the default amqp handlers are being
used.
:returns (username, host): two strings to send to the amqp provider.
"""
raise RuntimeError(
"get_amqp_credentials() needs to be overriden in the derived "
"get_amqp_credentials() needs to be overridden in the derived "
"class")
def get_database_setup(self):
@ -270,7 +270,7 @@ class OpenStackAPICharm(OpenStackCharm):
:returns [{'database': ...}, ...]: credentials for multiple databases
"""
raise RuntimeError(
"get_database_setup() needs to be overriden in the derived "
"get_database_setup() needs to be overridden in the derived "
"class")
def get_certificate_requests(self):

4
unit_tests/charms_openstack/charm/test_classes.py
View File

@ -335,12 +335,12 @@ class TestOpenStackAPICharm(BaseOpenStackCharmTest):
self.assertEqual(self.target.token_cache_pkgs(), [])
def test_get_amqp_credentials(self):
# verify that the instance throws an error if not overriden
# verify that the instance throws an error if not overridden
with self.assertRaises(RuntimeError):
self.target.get_amqp_credentials()
def test_get_database_setup(self):
# verify that the instance throws an error if not overriden
# verify that the instance throws an error if not overridden
with self.assertRaises(RuntimeError):
self.target.get_database_setup()