From a197225848fb94d6ee7b8de14f870df176d8f2ae Mon Sep 17 00:00:00 2001 From: Hiroyuki Eguchi Date: Fri, 3 Feb 2017 12:51:41 +0900 Subject: [PATCH] Add items into list which meteos-api returns Change-Id: I2d7c37b0b4c208e4a9c5dcc8158d1536da75d7a2 --- meteos/api/views/experiments.py | 2 ++ meteos/api/views/models.py | 1 + meteos/api/views/templates.py | 2 ++ 3 files changed, 5 insertions(+) diff --git a/meteos/api/views/experiments.py b/meteos/api/views/experiments.py index cf18720..89d54b5 100644 --- a/meteos/api/views/experiments.py +++ b/meteos/api/views/experiments.py @@ -39,6 +39,8 @@ class ViewBuilder(common.ViewBuilder): 'name': experiment.get('display_name'), 'description': experiment.get('display_description'), 'status': experiment.get('status'), + 'key_name': experiment.get('key_name'), + 'management_network': experiment.get('neutron_management_network'), 'created_at': experiment.get('created_at'), 'links': self._get_links(request, experiment['id']) } diff --git a/meteos/api/views/models.py b/meteos/api/views/models.py index d6ac134..85e36d3 100644 --- a/meteos/api/views/models.py +++ b/meteos/api/views/models.py @@ -40,6 +40,7 @@ class ViewBuilder(common.ViewBuilder): 'name': model.get('display_name'), 'description': model.get('display_description'), 'type': model.get('model_type'), + 'params': model.get('model_params'), 'status': model.get('status'), 'stdout': model.get('stdout'), 'created_at': model.get('created_at'), diff --git a/meteos/api/views/templates.py b/meteos/api/views/templates.py index 6831945..cf21759 100644 --- a/meteos/api/views/templates.py +++ b/meteos/api/views/templates.py @@ -39,7 +39,9 @@ class ViewBuilder(common.ViewBuilder): 'name': template.get('display_name'), 'description': template.get('display_description'), 'master_nodes': template.get('master_nodes_num'), + 'master_flavor': template.get('master_flavor_id'), 'worker_nodes': template.get('worker_nodes_num'), + 'worker_flavor': template.get('worker_flavor_id'), 'spark_version': template.get('spark_version'), 'status': template.get('status'), 'links': self._get_links(request, template['id'])