Remove redundant code in nova_client.Client

'a and a or b' is equal to 'a or b', the redundant code can be
removed.

This patch also fixes the docstring of __init__, which actually
initializes a nova client object, not returns.

Change-Id: I0815928a2b597452048a1cc6c2170259a53ccaf9
Closes-Bug: #1264099
This commit is contained in:
ZhiQiang Fan 2013-12-25 20:50:34 +08:00
parent dfed6ac2a3
commit 818a046e36

View File

@ -41,11 +41,12 @@ def logged(func):
class Client(object):
"""A client which gets information via python-novaclient."""
def __init__(self):
"""Returns a nova Client object."""
"""Initialize a nova client object."""
conf = cfg.CONF.service_credentials
tenant = conf.os_tenant_id and conf.os_tenant_id or conf.os_tenant_name
tenant = conf.os_tenant_id or conf.os_tenant_name
self.nova_client = nova_client.Client(
username=conf.os_username,
api_key=conf.os_password,