openstack
/
glance_store
Code Issues Proposed changes

Merge "Sheepdog: fix command execution failure"

This commit is contained in:
Jenkins 2017-07-18 16:32:20 +00:00 committed by Gerrit Code Review
parent 7ac6e99f4b 2497c6f601
commit 7b88334e02
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glance_store/_drivers/sheepdog.py
View File

@ -124,17 +124,14 @@ class SheepdogImage(object):
self.chunk_size = chunk_size
def _run_command(self, command, data, *params):
cmd = ("collie vdi %(command)s -a %(addr)s -p %(port)d %(name)s "
"%(params)s" %
{"command": command,
"addr": self.addr,
"port": self.port,
"name": self.name,
"params": " ".join(map(str, params))})
cmd = ['collie', 'vdi']
cmd.extend(command.split(' '))
cmd.extend(['-a', self.addr, '-p', self.port, self.name])
cmd.extend(params)
try:
return processutils.execute(
cmd, process_input=data)[0]
*cmd, process_input=data)[0]
except processutils.ProcessExecutionError as exc:
LOG.error(exc)
raise glance_store.BackendException(exc)

13
glance_store/tests/unit/test_sheepdog_store.py
View File

@ -58,14 +58,11 @@ class TestSheepdogImage(oslotest.base.BaseTestCase):
sheepdog.DEFAULT_CHUNKSIZE,
)
image._run_command('create', None)
expected_cmd = ('collie vdi %(command)s'
' -a %(addr)s -p %(port)d %(name)s ') % {
'command': 'create',
'addr': '127.0.0.1',
'port': 7000,
'name': '6bd59e6e-c410-11e5-ab67-0a73f1fda51b',
}
actual_cmd = mock_execute.call_args[0][0]
expected_cmd = (
'collie', 'vdi', 'create', '-a', '127.0.0.1', '-p', 7000,
'6bd59e6e-c410-11e5-ab67-0a73f1fda51b',
)
actual_cmd = mock_execute.call_args[0]
self.assertEqual(expected_cmd, actual_cmd)