openstack/deb-heat
Code Issues Proposed changes

Fix imports for pep8 check

Browse Source 
pep8 seems to be ignoring these imports. Also fixes some docstrings.

Change-Id: I343eacb13608581e226806446f1b2f4670fd0ae2
This commit is contained in:
Rabi Mishra 2016-02-05 14:36:58 +05:30
parent f37991c079
commit e6b796ad61
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
heat_integrationtests/common/clients.py
View File

@ -12,22 +12,21 @@
import os import os
import ceilometerclient.client from ceilometerclient import client as ceilometer_client
import cinderclient.client from cinderclient import client as cinder_client
import heatclient.client from heatclient import client as heat_client
from keystoneclient.auth.identity.generic import password from keystoneclient.auth.identity.generic import password
import keystoneclient.client from keystoneclient import exceptions as kc_exceptions
import keystoneclient.exceptions
from keystoneclient import session from keystoneclient import session
import neutronclient.v2_0.client from neutronclient.v2_0 import client as neutron_client
import novaclient.client from novaclient import client as nova_client
import swiftclient from swiftclient import client as swift_client
class KeystoneWrapperClient(object): class KeystoneWrapperClient(object):
"""Wrapper object for keystone client """Wrapper object for keystone client
This Wraps keystone client,so we can encpasulate certain This wraps keystone client, so we can encpasulate certain
added properties like auth_token, project_id etc. added properties like auth_token, project_id etc.
""" """
def __init__(self, auth_plugin, verify=True): def __init__(self, auth_plugin, verify=True):
@ -92,10 +91,10 @@ class ClientManager(object):
if endpoint is None: if endpoint is None:
endpoint = self.identity_client.get_endpoint_url( endpoint = self.identity_client.get_endpoint_url(
'orchestration', self.conf.region) 'orchestration', self.conf.region)
except keystoneclient.exceptions.EndpointNotFound: except kc_exceptions.EndpointNotFound:
return None return None
else: else:
return heatclient.client.Client( return heat_client.Client(
self.HEATCLIENT_VERSION, self.HEATCLIENT_VERSION,
endpoint, endpoint,
token=token, token=token,
@ -134,7 +133,7 @@ class ClientManager(object):
) )
# Create our default Nova client to use in testing # Create our default Nova client to use in testing
return novaclient.client.Client( return nova_client.Client(
self.NOVACLIENT_VERSION, self.NOVACLIENT_VERSION,
*client_args, *client_args,
service_type='compute', service_type='compute',
@ -147,7 +146,7 @@ class ClientManager(object):
def _get_network_client(self): def _get_network_client(self):
dscv = self.conf.disable_ssl_certificate_validation dscv = self.conf.disable_ssl_certificate_validation
return neutronclient.v2_0.client.Client( return neutron_client.Client(
username=self.conf.username, username=self.conf.username,
password=self.conf.password, password=self.conf.password,
tenant_name=self.conf.tenant_name, tenant_name=self.conf.tenant_name,
@ -160,7 +159,7 @@ class ClientManager(object):
region = self.conf.region region = self.conf.region
endpoint_type = 'publicURL' endpoint_type = 'publicURL'
dscv = self.conf.disable_ssl_certificate_validation dscv = self.conf.disable_ssl_certificate_validation
return cinderclient.client.Client( return cinder_client.Client(
self.CINDERCLIENT_VERSION, self.CINDERCLIENT_VERSION,
self.conf.username, self.conf.username,
self.conf.password, self.conf.password,
@ -183,7 +182,7 @@ class ClientManager(object):
'os_options': {'endpoint_type': 'publicURL'}, 'os_options': {'endpoint_type': 'publicURL'},
'insecure': dscv, 'insecure': dscv,
} }
return swiftclient.client.Connection(**args) return swift_client.Connection(**args)
def _get_metering_client(self): def _get_metering_client(self):
dscv = self.conf.disable_ssl_certificate_validation dscv = self.conf.disable_ssl_certificate_validation
@ -191,7 +190,7 @@ class ClientManager(object):
try: try:
endpoint = self.identity_client.get_endpoint_url('metering', endpoint = self.identity_client.get_endpoint_url('metering',
self.conf.region) self.conf.region)
except keystoneclient.exceptions.EndpointNotFound: except kc_exceptions.EndpointNotFound:
return None return None
else: else:
args = { args = {
@ -211,5 +210,5 @@ class ClientManager(object):
{'user_domain_name': domain, {'user_domain_name': domain,
'project_domain_name': domain}) 'project_domain_name': domain})
return ceilometerclient.client.Client(self.CEILOMETER_VERSION, return ceilometer_client.Client(self.CEILOMETER_VERSION,
endpoint, **args) endpoint, **args)