openstack/python-novaclient
Code Issues Proposed changes

Merge "Change Service repr to use self.id always"

Browse Source
This commit is contained in:
Jenkins
2017-07-26 20:23:46 +00:00
committed by Gerrit Code Review
parent 2e307bb3e8 2f16685403
commit a67c82eff3
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
novaclient/tests/unit/v2/test_services.py
View File

@@ -34,18 +34,11 @@ class ServicesTest(utils.TestCase):
svs = self.cs.services.list()
self.assert_request_id(svs, fakes.FAKE_REQUEST_ID_LIST)
self.cs.assert_called('GET', '/os-services')
expect_uuid_id = (
api_versions.APIVersion(self.api_version) >=
api_versions.APIVersion('2.53'))
for s in svs:
self.assertIsInstance(s, self._get_service_type())
self.assertEqual('nova-compute', s.binary)
self.assertEqual('host1', s.host)
if expect_uuid_id:
stringified = '<Service: %s>' % s.id
else:
stringified = '<Service: %s>' % s.binary
self.assertEqual(stringified, str(s))
self.assertEqual('<Service: %s>' % s.id, str(s))
def test_list_services_with_hostname(self):
svs = self.cs.services.list(host='host2')

5
novaclient/v2/services.py
View File

@@ -20,15 +20,10 @@ from six.moves import urllib
from novaclient import api_versions
from novaclient import base
from novaclient import utils
class Service(base.Resource):
def __repr__(self):
# If the id is int-like, then represent the service using it's binary
# name, otherwise use the UUID ID.
if utils.is_integer_like(self.id):
return "<Service: %s>" % self.binary
return "<Service: %s>" % self.id
def _add_details(self, info):