openstack/manila
Code Issues Proposed changes

Capitalize global var for clients

Browse Source 
TrivialFix

Change-Id: I84d67546e541b29f127057e6c7da990db71f6955
This commit is contained in:
Marc Koderer 2016-03-23 10:00:55 +01:00
parent d7fd4c76a0
commit 8f7df3fc53
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manila/compute/nova.py
View File

@ -31,6 +31,7 @@ from manila import exception
from manila.i18n import _
NOVA_GROUP = 'nova'
AUTH_OBJ = None
nova_deprecated_opts = [
cfg.StrOpt('nova_admin_username',
@ -107,24 +108,22 @@ LOG = log.getLogger(__name__)
def list_opts():
return client_auth.AuthClientLoader.list_opts(NOVA_GROUP)
auth_obj = None
def novaclient(context):
global auth_obj
if not auth_obj:
global AUTH_OBJ
if not AUTH_OBJ:
deprecated_opts_for_v2 = {
'username': CONF.nova_admin_username,
'password': CONF.nova_admin_password,
'tenant_name': CONF.nova_admin_tenant_name,
'auth_url': CONF.nova_admin_auth_url,
}
auth_obj = client_auth.AuthClientLoader(
AUTH_OBJ = client_auth.AuthClientLoader(
client_class=nova_client.Client,
exception_module=nova_exception,
cfg_group=NOVA_GROUP,
deprecated_opts_for_v2=deprecated_opts_for_v2)
return auth_obj.get_client(context,
return AUTH_OBJ.get_client(context,
version=CONF[NOVA_GROUP].api_microversion,
insecure=CONF[NOVA_GROUP].api_insecure,
cacert=CONF[NOVA_GROUP].ca_certificates_file)

12
manila/volume/cinder.py
View File

@ -34,6 +34,7 @@ from manila import exception
from manila.i18n import _
CINDER_GROUP = 'cinder'
AUTH_OBJ = None
cinder_deprecated_opts = [
cfg.StrOpt('cinder_catalog_info',
@ -113,24 +114,21 @@ def list_opts():
return client_auth.AuthClientLoader.list_opts(CINDER_GROUP)
auth_obj = None
def cinderclient(context):
global auth_obj
if not auth_obj:
global AUTH_OBJ
if not AUTH_OBJ:
deprecated_opts_for_v2 = {
'username': CONF.nova_admin_username,
'password': CONF.nova_admin_password,
'tenant_name': CONF.nova_admin_tenant_name,
'auth_url': CONF.nova_admin_auth_url,
}
auth_obj = client_auth.AuthClientLoader(
AUTH_OBJ = client_auth.AuthClientLoader(
client_class=cinder_client.Client,
exception_module=cinder_exception,
cfg_group=CINDER_GROUP,
deprecated_opts_for_v2=deprecated_opts_for_v2)
return auth_obj.get_client(context,
return AUTH_OBJ.get_client(context,
insecure=CONF[CINDER_GROUP].api_insecure,
cacert=CONF[CINDER_GROUP].ca_certificates_file,
retries=CONF[CINDER_GROUP].http_retries)