openstack
/
manila
Code Issues Proposed changes

Use v3 cinder client for share volume 

Since cinder has been deprecated v2 api since Pike, So the
v3 cinder client should be used here to create share volume.
Also remove previously deprecated cinder client options.


Change-Id: I314f36637ab45faa638732238c438bf00cc641ea
Closes-Bug: #1733786
This commit is contained in:
junboli 2017-11-23 16:40:36 +08:00 committed by Tom Barron
parent 595f4ec354
commit 1ad8682614
2 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manila/tests/volume/test_cinder.py
View File

@ -54,12 +54,6 @@ class CinderclientTestCase(test.TestCase):
cinder.client_auth, 'AuthClientLoader')
fake_context = 'fake_context'
data = {
'DEFAULT': {
'cinder_admin_username': 'foo_username',
'cinder_admin_password': 'foo_password',
'cinder_admin_tenant_name': 'foo_tenant_name',
'cinder_admin_auth_url': 'foo_auth_url',
},
'cinder': {
'api_insecure': True,
'ca_certificates_file': 'foo_ca_certificates_file',
@ -75,13 +69,7 @@ class CinderclientTestCase(test.TestCase):
mock_client_loader.assert_called_once_with(
client_class=cinder.cinder_client.Client,
exception_module=cinder.cinder_exception,
cfg_group=cinder.CINDER_GROUP,
deprecated_opts_for_v2={
'username': data['DEFAULT']['cinder_admin_username'],
'password': data['DEFAULT']['cinder_admin_password'],
'tenant_name': data['DEFAULT']['cinder_admin_tenant_name'],
'auth_url': data['DEFAULT']['cinder_admin_auth_url'],
},
cfg_group=cinder.CINDER_GROUP
)
mock_client_loader.return_value.get_client.assert_called_once_with(
fake_context,

51
manila/volume/cinder.py
View File

@ -20,7 +20,7 @@ Handles all requests relating to volumes + cinder.
import copy
from cinderclient import exceptions as cinder_exception
from cinderclient.v2 import client as cinder_client
from cinderclient.v3 import client as cinder_client
from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
import six
@ -35,45 +35,6 @@ from manila.i18n import _
CINDER_GROUP = 'cinder'
AUTH_OBJ = None
cinder_deprecated_opts = [
cfg.StrOpt('cinder_catalog_info',
default='volume:cinder:publicURL',
help='Info to match when looking for cinder in the service '
'catalog. Format is separated values of the form: '
'<service_type>:<service_name>:<endpoint_type>',
deprecated_group='DEFAULT',
deprecated_for_removal=True,
deprecated_reason="This option isn't used any longer."),
cfg.StrOpt('cinder_admin_username',
default='cinder',
help='Cinder admin username.',
deprecated_group='DEFAULT',
deprecated_for_removal=True,
deprecated_reason="This option isn't used any longer. Please "
"use [cinder] username instead."),
cfg.StrOpt('cinder_admin_password',
help='Cinder admin password.',
deprecated_group='DEFAULT',
deprecated_for_removal=True,
deprecated_reason="This option isn't used any longer. Please "
"use [cinder] password instead."),
cfg.StrOpt('cinder_admin_tenant_name',
default='service',
help='Cinder admin tenant name.',
deprecated_group='DEFAULT',
deprecated_for_removal=True,
deprecated_reason="This option isn't used any longer. Please "
"use [cinder] tenant_name instead."),
cfg.StrOpt('cinder_admin_auth_url',
default='http://localhost:5000/v2.0',
help='Identity service URL.',
deprecated_group='DEFAULT',
deprecated_for_removal=True,
deprecated_reason="This option isn't used any longer. Please "
"use [cinder] auth_url instead.")
]
cinder_opts = [
cfg.BoolOpt('cross_az_attach',
default=True,
@ -104,7 +65,6 @@ cinder_opts = [
]
CONF = cfg.CONF
CONF.register_opts(cinder_deprecated_opts)
CONF.register_opts(core_opts)
CONF.register_opts(cinder_opts, CINDER_GROUP)
ks_loading.register_session_conf_options(CONF, CINDER_GROUP)
@ -118,17 +78,10 @@ def list_opts():
def cinderclient(context):
global AUTH_OBJ
if not AUTH_OBJ:
deprecated_opts_for_v2 = {
'username': CONF.cinder_admin_username,
'password': CONF.cinder_admin_password,
'tenant_name': CONF.cinder_admin_tenant_name,
'auth_url': CONF.cinder_admin_auth_url,
}
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)
cfg_group=CINDER_GROUP)
return AUTH_OBJ.get_client(context,
insecure=CONF[CINDER_GROUP].api_insecure,
cacert=CONF[CINDER_GROUP].ca_certificates_file,