From be2ceea92dc63105329646e14de2a4e9b4a01e7d Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 21 Sep 2012 18:05:25 +0200 Subject: [PATCH] appflow: Add state info to roles --- .../user-plugins/apptools.appflow.services.js | 92 ++++++++++++++++--- 1 file changed, 78 insertions(+), 14 deletions(-) diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js b/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js index c3a06357b6..5d78eeb86b 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js @@ -48,13 +48,28 @@ var Service = { }, "state" : function(state_int){ var state = [ - tr("Pending"), - tr("Deploying"), - tr("Running"), - tr("Undeploying"), - tr("Failed"), - tr("Unknown"), - tr("Done") + tr("PENDING"), + tr("DEPLOYING"), + tr("RUNNING"), + tr("UNDEPLOYING"), + tr("FAILED"), + tr("UNKNOWN"), + tr("DONE") + ][state_int] + return state ? state : state_int; + } +} + +var Role = { + "state" : function(state_int){ + var state = [ + tr("PENDING"), + tr("DEPLOYING"), + tr("RUNNING"), + tr("UNDEPLOYING"), + tr("FAILED"), + tr("UNKNOWN"), + tr("DONE") ][state_int] return state ? state : state_int; } @@ -503,15 +518,42 @@ function updateServiceInfo(request,elem){ ' } - var node_tab = { - title: tr("Node"), - content: '\ - '+ - (elem_info.TEMPLATE.BODY ? prettyPrintJSON(elem_info.TEMPLATE.BODY) : "" )+ - '
'+tr("Node")+'
' + var roles_info = '\ + ' + + var roles = elem_info.TEMPLATE.BODY.roles + if (roles) + for (var i = 0; i < roles.length; i++) { + roles_info += '\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + ' + + if (roles[i].parents) + roles_info += '\ + \ + \ + ' + } + + roles_info += '
'+tr("Role")+' '+roles[i].name+'
     '+tr("State")+''+Role.state(roles[i].state)+'
     '+tr("Cardinality")+''+roles[i].cardinality+'
     '+tr("VM Template")+''+roles[i].vm_template+'
     '+tr("Parents")+''+roles[i].parents.join(', ')+'
' + + var roles_tab = { + title: tr("Roles"), + content: roles_info } + var vms_tab = { title : "Virtual Machines", content : '\ @@ -537,18 +579,40 @@ function updateServiceInfo(request,elem){ ' }; + var logs = elem_info.TEMPLATE.BODY.log + var log_info = '' + if (logs) + log_info += '\ + ' + for (var i = 0; i < logs.length; i++) { + log_info += '\ + \ + ' + } + + log_info += '
'+pretty_time(logs[i].timestamp)+' ['+logs[i].severity + '] ' + logs[i].message+ '
' + + var logs_tab = { + title: "Logs", + content: log_info + } + var roles = elem_info.TEMPLATE.BODY.roles; if (!roles) roles = []; Sunstone.updateInfoPanelTab("service_info_panel", "service_info_tab",info_tab); Sunstone.updateInfoPanelTab("service_info_panel", - "service_node_tab",node_tab); + "service_role_tab",roles_tab); if (roles.length) Sunstone.updateInfoPanelTab("service_info_panel", "service_vms_tab",vms_tab); + + Sunstone.updateInfoPanelTab("service_info_panel", + "service_log_tab",logs_tab); + // Popup panel Sunstone.popUpInfoPanel("service_info_panel");