Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "exception when running 'watcher service list'"

Browse Source
This commit is contained in:
Jenkins
2017-03-24 08:17:51 +00:00
committed by Gerrit Code Review
parent eb038e4af0 38a3cbc84a
commit 9e505d3d36
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
watcher/api/controllers/v1/service.py
View File

@@ -56,8 +56,8 @@ class Service(base.APIBase):
def _get_status(self): def _get_status(self):
return self._status return self._status
def _set_status(self, name): def _set_status(self, id):
service = objects.Service.get_by_name(pecan.request.context, name) service = objects.Service.get(pecan.request.context, id)
last_heartbeat = (service.last_seen_up or service.updated_at last_heartbeat = (service.last_seen_up or service.updated_at
or service.created_at) or service.created_at)
if isinstance(last_heartbeat, six.string_types): if isinstance(last_heartbeat, six.string_types):
@@ -108,7 +108,7 @@ class Service(base.APIBase):
for field in fields: for field in fields:
self.fields.append(field) self.fields.append(field)
setattr(self, field, kwargs.get( setattr(self, field, kwargs.get(
field if field != 'status' else 'name', wtypes.Unset)) field if field != 'status' else 'id', wtypes.Unset))
@staticmethod @staticmethod
def _convert_with_links(service, url, expand=True): def _convert_with_links(service, url, expand=True):

11
watcher/tests/api/v1/test_services.py
View File

@@ -78,13 +78,18 @@ class TestListService(api_base.FunctionalTest):
def test_many(self): def test_many(self):
service_list = [] service_list = []
for idx in range(1, 6): for idx in range(1, 4):
service = obj_utils.create_test_service( service = obj_utils.create_test_service(
self.context, id=idx, host='CONTROLLER', self.context, id=idx, host='CONTROLLER1',
name='SERVICE_{0}'.format(idx))
service_list.append(service.id)
for idx in range(1, 4):
service = obj_utils.create_test_service(
self.context, id=3+idx, host='CONTROLLER2',
name='SERVICE_{0}'.format(idx)) name='SERVICE_{0}'.format(idx))
service_list.append(service.id) service_list.append(service.id)
response = self.get_json('/services') response = self.get_json('/services')
self.assertEqual(5, len(response['services'])) self.assertEqual(6, len(response['services']))
for service in response['services']: for service in response['services']:
self.assertTrue( self.assertTrue(
all(val is not None for key, val in service.items() all(val is not None for key, val in service.items()