Merge "Fix some inconsistency in docstrings"

This commit is contained in:
Jenkins 2015-12-01 08:34:33 +00:00 committed by Gerrit Code Review
commit d160c29b7e
4 changed files with 5 additions and 5 deletions

View File

@ -43,7 +43,7 @@ def create_test_server(clients, validatable=False, validation_resources=None,
:param wait_until: Server status to wait for the server to reach after
its creation.
:param volume_backed: Whether the instance is volume backed or not.
:returns a tuple
:returns: a tuple
"""
# TODO(jlanoux) add support of wait_until PINGABLE/SSHABLE

View File

@ -83,7 +83,7 @@ def get_tenant_network(creds_provider, compute_networks_client,
is the network to be used, and it's not visible to the tenant
:param shared_network_name: name of the shared network to be used if no
tenant network is available in the creds provider
:return a dict with 'id' and 'name' of the network
:returns: a dict with 'id' and 'name' of the network
"""
caller = misc_utils.find_test_caller()
net_creds = creds_provider.get_primary_creds()

View File

@ -696,8 +696,8 @@ class NetworkScenarioTest(ScenarioTest):
def cidr_in_use(cidr, tenant_id):
"""Check cidr existence
:return True if subnet with cidr already exist in tenant
False else
:returns: True if subnet with cidr already exist in tenant
False else
"""
cidr_in_use = self._list_subnets(tenant_id=tenant_id, cidr=cidr)
return len(cidr_in_use) != 0

View File

@ -495,7 +495,7 @@ class BaseTestCase(testtools.testcase.WithAttributes,
:param credential_type: string - primary, alt or admin
:param roles: list of roles
:returns the created client manager
:returns: the created client manager
:raises skipException: if the requested credentials are not available
"""
if all([roles, credential_type]):