From 8e9ecc53e8c9cad699fa145dfc8dc581703c5058 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Thu, 16 Apr 2020 18:59:07 +0200 Subject: [PATCH] Openstack -> OpenStack --- .../openstack/charm_tests/ceilometer/tests.py | 4 +-- zaza/openstack/charm_tests/cinder/tests.py | 2 +- .../charm_tests/cinder_backup/tests.py | 2 +- zaza/openstack/charm_tests/gnocchi/tests.py | 2 +- zaza/openstack/charm_tests/heat/tests.py | 2 +- zaza/openstack/charm_tests/kerberos/tests.py | 6 ++--- zaza/openstack/charm_tests/neutron/setup.py | 2 +- zaza/openstack/configure/network.py | 2 +- zaza/openstack/utilities/openstack.py | 26 +++++++++---------- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/zaza/openstack/charm_tests/ceilometer/tests.py b/zaza/openstack/charm_tests/ceilometer/tests.py index 53c3594..eb50cb0 100644 --- a/zaza/openstack/charm_tests/ceilometer/tests.py +++ b/zaza/openstack/charm_tests/ceilometer/tests.py @@ -43,7 +43,7 @@ class CeilometerTest(test_utils.OpenStackBaseTest): @property def services(self): - """Return a list of services for the selected Openstack release.""" + """Return a list of services for the selected OpenStack release.""" services = [] if self.application_name == 'ceilometer-agent': @@ -86,7 +86,7 @@ class CeilometerTest(test_utils.OpenStackBaseTest): def restartable_services(self): """Return a list of services that are known to be restartable. - For the selected Openstack release these services are known to be able + For the selected OpenStack release these services are known to be able to be stopped and started with no issues. """ # Due to Bug #1861321 ceilometer-collector does not reliably diff --git a/zaza/openstack/charm_tests/cinder/tests.py b/zaza/openstack/charm_tests/cinder/tests.py index ea75fe9..cdccce6 100644 --- a/zaza/openstack/charm_tests/cinder/tests.py +++ b/zaza/openstack/charm_tests/cinder/tests.py @@ -153,7 +153,7 @@ class CinderTests(test_utils.OpenStackBaseTest): @property def services(self): - """Return a list services for the selected Openstack release.""" + """Return a list services for the selected OpenStack release.""" services = ['cinder-scheduler', 'cinder-volume'] if (openstack_utils.get_os_release() >= openstack_utils.get_os_release('xenial_ocata')): diff --git a/zaza/openstack/charm_tests/cinder_backup/tests.py b/zaza/openstack/charm_tests/cinder_backup/tests.py index ae1ca50..b3f7ce7 100644 --- a/zaza/openstack/charm_tests/cinder_backup/tests.py +++ b/zaza/openstack/charm_tests/cinder_backup/tests.py @@ -40,7 +40,7 @@ class CinderBackupTest(test_utils.OpenStackBaseTest): @property def services(self): - """Return a list services for the selected Openstack release.""" + """Return a list services for the selected OpenStack release.""" current_release = openstack_utils.get_os_release() services = ['cinder-scheduler', 'cinder-volume'] if (current_release >= diff --git a/zaza/openstack/charm_tests/gnocchi/tests.py b/zaza/openstack/charm_tests/gnocchi/tests.py index e73bab7..f789cff 100644 --- a/zaza/openstack/charm_tests/gnocchi/tests.py +++ b/zaza/openstack/charm_tests/gnocchi/tests.py @@ -28,7 +28,7 @@ class GnocchiTest(test_utils.OpenStackBaseTest): @property def services(self): - """Return a list of services for the selected Openstack release.""" + """Return a list of services for the selected OpenStack release.""" return ['haproxy', 'gnocchi-metricd', 'apache2'] def test_200_api_connection(self): diff --git a/zaza/openstack/charm_tests/heat/tests.py b/zaza/openstack/charm_tests/heat/tests.py index a0e2a23..d69217f 100644 --- a/zaza/openstack/charm_tests/heat/tests.py +++ b/zaza/openstack/charm_tests/heat/tests.py @@ -54,7 +54,7 @@ class HeatBasicDeployment(test_utils.OpenStackBaseTest): @property def services(self): - """Return a list services for the selected Openstack release. + """Return a list services for the selected OpenStack release. :returns: List of services :rtype: [str] diff --git a/zaza/openstack/charm_tests/kerberos/tests.py b/zaza/openstack/charm_tests/kerberos/tests.py index e122352..0f627b7 100644 --- a/zaza/openstack/charm_tests/kerberos/tests.py +++ b/zaza/openstack/charm_tests/kerberos/tests.py @@ -31,7 +31,7 @@ class CharmKeystoneKerberosTest(BaseKeystoneTest): super(CharmKeystoneKerberosTest, cls).setUpClass() def test_keystone_kerberos_authentication(self): - """Validate auth to Openstack through the kerberos method.""" + """Validate auth to OpenStack through the kerberos method.""" logging.info('Retrieving a kerberos token with kinit for admin user') ubuntu_test_host = zaza.model.get_units('ubuntu-test-host')[0] @@ -46,7 +46,7 @@ class CharmKeystoneKerberosTest(BaseKeystoneTest): ) assert result['Code'] == '0', result['Stderr'] - logging.info('Fetching user/project info in Openstack') + logging.info('Fetching user/project info in OpenStack') domain_name = 'k8s' project_name = 'k8s' keystone_session = openstack_utils.get_overcloud_keystone_session() @@ -56,7 +56,7 @@ class CharmKeystoneKerberosTest(BaseKeystoneTest): project_id = keystone_client.projects.find(name=project_name).id keystone_hostname = get_unit_full_hostname('keystone') - logging.info('Retrieving an Openstack token to validate auth') + logging.info('Retrieving an OpenStack token to validate auth') cmd = 'openstack token issue -f value -c id ' \ '--os-auth-url http://{}:5000/krb/v3 ' \ '--os-project-id {} ' \ diff --git a/zaza/openstack/charm_tests/neutron/setup.py b/zaza/openstack/charm_tests/neutron/setup.py index e6f19a5..e8f2439 100644 --- a/zaza/openstack/charm_tests/neutron/setup.py +++ b/zaza/openstack/charm_tests/neutron/setup.py @@ -81,7 +81,7 @@ def basic_overcloud_network(limit_gws=None): # Get keystone session keystone_session = openstack_utils.get_overcloud_keystone_session() - # Handle network for Openstack-on-Openstack scenarios + # Handle network for OpenStack-on-OpenStack scenarios if juju_utils.get_provider_type() == "openstack": undercloud_ks_sess = openstack_utils.get_undercloud_keystone_session() network.setup_gateway_ext_port(network_config, diff --git a/zaza/openstack/configure/network.py b/zaza/openstack/configure/network.py index 12b8d9e..649992c 100755 --- a/zaza/openstack/configure/network.py +++ b/zaza/openstack/configure/network.py @@ -284,7 +284,7 @@ def run_from_cli(**kwargs): network_config = generic_utils.get_network_config( net_topology, ignore_env_vars, net_topology_file) - # Handle network for Openstack-on-Openstack scenarios + # Handle network for OpenStack-on-OpenStack scenarios if juju_utils.get_provider_type() == "openstack": undercloud_ks_sess = openstack_utils.get_undercloud_keystone_session( verify=cacert) diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py index de324e4..875071b 100644 --- a/zaza/openstack/utilities/openstack.py +++ b/zaza/openstack/utilities/openstack.py @@ -14,7 +14,7 @@ """Module for interacting with OpenStack. -This module contains a number of functions for interacting with Openstack. +This module contains a number of functions for interacting with OpenStack. """ from .os_versions import ( OPENSTACK_CODENAMES, @@ -168,11 +168,11 @@ def get_cacert(): return KEYSTONE_LOCAL_CACERT -# Openstack Client helpers +# OpenStack Client helpers def get_ks_creds(cloud_creds, scope='PROJECT'): """Return the credentials for authenticating against keystone. - :param cloud_creds: Openstack RC environment credentials + :param cloud_creds: OpenStack RC environment credentials :type cloud_creds: dict :param scope: Authentication scope: PROJECT or DOMAIN :type scope: string @@ -375,7 +375,7 @@ def get_keystone_scope(model_name=None): def get_keystone_session(openrc_creds, scope='PROJECT', verify=None): """Return keystone session. - :param openrc_creds: Openstack RC credentials + :param openrc_creds: OpenStack RC credentials :type openrc_creds: dict :param verify: Control TLS certificate verification behaviour :type verify: any (True - use system certs, @@ -444,7 +444,7 @@ def get_keystone_session_client(session, client_api_version=3): def get_keystone_client(openrc_creds, verify=None): """Return authenticated keystoneclient and set auth_ref for service_catalog. - :param openrc_creds: Openstack RC credentials + :param openrc_creds: OpenStack RC credentials :type openrc_creds: dict :param verify: Control TLS certificate verification behaviour :type verify: any @@ -1602,7 +1602,7 @@ def get_undercloud_auth(): return auth_settings -# Openstack Client helpers +# OpenStack Client helpers def get_keystone_ip(model_name=None): """Return the IP address to use when communicating with keystone api. @@ -2115,7 +2115,7 @@ def create_ssh_key(nova_client, keypair_name, replace=False): :param nova_client: Authenticated nova client :type nova_client: novaclient.v2.client.Client - :param keypair_name: Label to apply to keypair in Openstack. + :param keypair_name: Label to apply to keypair in OpenStack. :type keypair_name: str :param replace: Whether to replace the existing keypair if it already exists. @@ -2138,7 +2138,7 @@ def create_ssh_key(nova_client, keypair_name, replace=False): def get_private_key_file(keypair_name): """Location of the file containing the private key with the given label. - :param keypair_name: Label of keypair in Openstack. + :param keypair_name: Label of keypair in OpenStack. :type keypair_name: str :returns: Path to file containing key :rtype: str @@ -2149,7 +2149,7 @@ def get_private_key_file(keypair_name): def write_private_key(keypair_name, key): """Store supplied private key in file. - :param keypair_name: Label of keypair in Openstack. + :param keypair_name: Label of keypair in OpenStack. :type keypair_name: str :param key: PEM Encoded Private Key :type key: str @@ -2161,7 +2161,7 @@ def write_private_key(keypair_name, key): def get_private_key(keypair_name): """Return private key. - :param keypair_name: Label of keypair in Openstack. + :param keypair_name: Label of keypair in OpenStack. :type keypair_name: str :returns: PEM Encoded Private Key :rtype: str @@ -2175,11 +2175,11 @@ def get_private_key(keypair_name): def get_public_key(nova_client, keypair_name): - """Return public key from Openstack. + """Return public key from OpenStack. :param nova_client: Authenticated nova client :type nova_client: novaclient.v2.client.Client - :param keypair_name: Label of keypair in Openstack. + :param keypair_name: Label of keypair in OpenStack. :type keypair_name: str :returns: OpenSSH Encoded Public Key :rtype: str or None @@ -2196,7 +2196,7 @@ def valid_key_exists(nova_client, keypair_name): :param nova_client: Authenticated nova client :type nova_client: novaclient.v2.client.Client - :param keypair_name: Label of keypair in Openstack. + :param keypair_name: Label of keypair in OpenStack. :type keypair_name: str """ pub_key = get_public_key(nova_client, keypair_name)