diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-26 20:23:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-26 20:23:46 +0000 |
| commit | a67c82eff3b1deafc6a2ae3d451a5868d9cb64cd (patch) | |
| tree | 03910ede174f922645e413288f69169dc71d9346 | |
| parent | 2e307bb3e8c92c68e4de7829df60055e9b573c40 (diff) | |
| parent | 2f1668540331beb7a586919ec5f32b8d6b3881dd (diff) | |
| download | python-novaclient-a67c82eff3b1deafc6a2ae3d451a5868d9cb64cd.tar.gz | |
Merge "Change Service repr to use self.id always"
| -rw-r--r-- | novaclient/tests/unit/v2/test_services.py | 9 | ||||
| -rw-r--r-- | novaclient/v2/services.py | 5 |
2 files changed, 1 insertions, 13 deletions
diff --git a/novaclient/tests/unit/v2/test_services.py b/novaclient/tests/unit/v2/test_services.py index 0c0434af..ddc75eeb 100644 --- a/novaclient/tests/unit/v2/test_services.py +++ b/novaclient/tests/unit/v2/test_services.py @@ -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') diff --git a/novaclient/v2/services.py b/novaclient/v2/services.py index 3fe877d3..f3d1255d 100644 --- a/novaclient/v2/services.py +++ b/novaclient/v2/services.py @@ -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): |