openstack/cinder
Code Issues Proposed changes

Merge "Fix invalid services caused by enabled_backends"

Browse Source
This commit is contained in:
Jenkins 2016-09-08 17:05:11 +00:00 committed by Gerrit Code Review
commit 8753a3401b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/backup/manager.py
View File

@ -151,7 +151,7 @@ class BackupManager(manager.SchedulerDependentManager):
def _setup_volume_drivers(self): def _setup_volume_drivers(self):
if CONF.enabled_backends: if CONF.enabled_backends:
for backend in CONF.enabled_backends: for backend in filter(None, CONF.enabled_backends):
host = "%s@%s" % (CONF.host, backend) host = "%s@%s" % (CONF.host, backend)
mgr = importutils.import_object(CONF.volume_manager, mgr = importutils.import_object(CONF.volume_manager,
host=host, host=host,

2
cinder/cmd/all.py
View File

@ -89,7 +89,7 @@ def main():
# cinder-volume # cinder-volume
try: try:
if CONF.enabled_backends: if CONF.enabled_backends:
for backend in CONF.enabled_backends: for backend in filter(None, CONF.enabled_backends):
CONF.register_opt(volume_cmd.host_opt, group=backend) CONF.register_opt(volume_cmd.host_opt, group=backend)
backend_host = getattr(CONF, backend).backend_host backend_host = getattr(CONF, backend).backend_host
host = "%s@%s" % (backend_host or CONF.host, backend) host = "%s@%s" % (backend_host or CONF.host, backend)

2
cinder/cmd/volume.py
View File

@ -84,7 +84,7 @@ def main():
service_started = False service_started = False
if CONF.enabled_backends: if CONF.enabled_backends:
for backend in CONF.enabled_backends: for backend in filter(None, CONF.enabled_backends):
CONF.register_opt(host_opt, group=backend) CONF.register_opt(host_opt, group=backend)
backend_host = getattr(CONF, backend).backend_host backend_host = getattr(CONF, backend).backend_host
host = "%s@%s" % (backend_host or CONF.host, backend) host = "%s@%s" % (backend_host or CONF.host, backend)

6
cinder/tests/unit/test_cmd.py
View File

@ -171,7 +171,7 @@ class TestCinderAllCmd(test.TestCase):
def test_main_with_backend(self, log_setup, get_logger, monkey_patch, def test_main_with_backend(self, log_setup, get_logger, monkey_patch,
process_launcher, wsgi_service, service_create, process_launcher, wsgi_service, service_create,
rpc_init): rpc_init):
CONF.set_override('enabled_backends', ['backend1']) CONF.set_override('enabled_backends', ['', 'backend1', ''])
CONF.set_override('host', 'host') CONF.set_override('host', 'host')
launcher = process_launcher.return_value launcher = process_launcher.return_value
server = wsgi_service.return_value server = wsgi_service.return_value
@ -356,7 +356,7 @@ class TestCinderVolumeCmd(test.TestCase):
@mock.patch('oslo_log.log.setup') @mock.patch('oslo_log.log.setup')
def test_main_with_backends(self, log_setup, monkey_patch, service_create, def test_main_with_backends(self, log_setup, monkey_patch, service_create,
get_launcher): get_launcher):
backends = ['backend1', 'backend2'] backends = ['', 'backend1', 'backend2', '']
CONF.set_override('enabled_backends', backends) CONF.set_override('enabled_backends', backends)
CONF.set_override('host', 'host') CONF.set_override('host', 'host')
launcher = get_launcher.return_value launcher = get_launcher.return_value
@ -375,7 +375,7 @@ class TestCinderVolumeCmd(test.TestCase):
service_name='backend2', coordination=True, service_name='backend2', coordination=True,
cluster=None) cluster=None)
service_create.assert_has_calls([c1, c2]) service_create.assert_has_calls([c1, c2])
self.assertEqual(len(backends), launcher.launch_service.call_count) self.assertEqual(2, launcher.launch_service.call_count)
launcher.wait.assert_called_once_with() launcher.wait.assert_called_once_with()