openstack/cinder
Code Issues Proposed changes

Merge "Make cinder-manage service list to print full host"

Browse Source
This commit is contained in:
Jenkins 2017-08-24 14:48:38 +00:00 committed by Gerrit Code Review
commit 89ae4aae3d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/cmd/manage.py
View File

@ -551,7 +551,7 @@ class ServiceCommands(BaseCommand):
rpc_version = svc.rpc_current_version rpc_version = svc.rpc_current_version
object_version = svc.object_current_version object_version = svc.object_current_version
cluster = svc.cluster_name or '' cluster = svc.cluster_name or ''
print(print_format % (svc.binary, svc.host.partition('.')[0], print(print_format % (svc.binary, svc.host,
svc.availability_zone, status, art, svc.availability_zone, status, art,
updated_at, rpc_version, object_version, updated_at, rpc_version, object_version,
cluster)) cluster))

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

@ -667,7 +667,7 @@ class TestCinderManageCmd(test.TestCase):
object_version = service['object_current_version'] object_version = service['object_current_version']
cluster = service.get('cluster_name', '') cluster = service.get('cluster_name', '')
service_format = format % (service['binary'], service_format = format % (service['binary'],
service['host'].partition('.')[0], service['host'],
service['availability_zone'], service['availability_zone'],
'enabled', 'enabled',
':-)', ':-)',