From 4ae40a5b86605d4b7ae631d17fef138673180981 Mon Sep 17 00:00:00 2001 From: zhangchi Date: Sat, 29 Dec 2018 16:56:27 +0800 Subject: [PATCH] make trio2o novaapi gw get nova server info more details . 1. What is the problem? make trio2o get info more detail 2. What is the solution to the problem? perfect nova apigw get nova server info more detail Change-Id: I93a01e2e97ad8cee26aee9af2e6567143cd7244c Signed-off-by: zhangchi Co-Authored-By: tangzhuo --- trio2o/nova_apigw/controllers/server.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/trio2o/nova_apigw/controllers/server.py b/trio2o/nova_apigw/controllers/server.py index c0d6e39..c980446 100644 --- a/trio2o/nova_apigw/controllers/server.py +++ b/trio2o/nova_apigw/controllers/server.py @@ -73,6 +73,9 @@ class ServerController(rest.RestController): def _construct_brief_server_entry(server): return {'id': server['id'], 'name': server.get('name'), + 'status': server.get('status'), + 'tags': server.get('tags'), + 'metadata': server.get('metadata'), 'links': server.get('links')} @expose(generic=True, template='json') @@ -80,8 +83,6 @@ class ServerController(rest.RestController): context = t_context.extract_context_from_environ() if _id == 'detail': - # return {'servers': [self._construct_brief_server_entry( - # server) for server in self._get_all(context, kwargs)]} return {'servers': self._get_all(context, kwargs)} mappings = db_api.get_bottom_mappings_by_top_id( @@ -101,8 +102,6 @@ class ServerController(rest.RestController): @expose(generic=True, template='json') def get_all(self, **kwargs): context = t_context.extract_context_from_environ() - # return {'servers': [self._construct_brief_server_entry( - # server) for server in self._get_all(context, kwargs)]} return {'servers': self._get_all(context, kwargs)} @expose(generic=True, template='json')