openstack/python-novaclient
Code Issues Proposed changes

Merge "Fix Serivce class AttributeError"

Browse Source
This commit is contained in:
Jenkins 2014-02-10 01:20:13 +00:00 committed by Gerrit Code Review
commit b6c6084ce3
2 changed files with 2 additions and 1 deletions
novaclient
tests/v1_1
test_services.py
v1_1
services.py

1
novaclient/tests/v1_1/test_services.py

@ -37,6 +37,7 @@ class ServicesTest(utils.TestCase):
self.assertIsInstance(s, self._get_service_type()) self.assertIsInstance(s, self._get_service_type())
self.assertEqual(s.binary, 'nova-compute') self.assertEqual(s.binary, 'nova-compute')
self.assertEqual(s.host, 'host1') self.assertEqual(s.host, 'host1')
self.assertTrue(str(s).startswith('<Service: '))
def test_list_services_with_hostname(self): def test_list_services_with_hostname(self):
svs = self.cs.services.list(host='host2') svs = self.cs.services.list(host='host2')

2
novaclient/v1_1/services.py

@ -21,7 +21,7 @@ from novaclient import base
class Service(base.Resource): class Service(base.Resource):
def __repr__(self): def __repr__(self):
return "<Service: %s>" % self.service return "<Service: %s>" % self.binary
def _add_details(self, info): def _add_details(self, info):
dico = 'resource' in info and info['resource'] or info dico = 'resource' in info and info['resource'] or info