diff --git a/app/extensions/storidge/filters/filters.js b/app/extensions/storidge/filters/filters.js index 4bfbb832d..112998a7a 100644 --- a/app/extensions/storidge/filters/filters.js +++ b/app/extensions/storidge/filters/filters.js @@ -25,7 +25,7 @@ angular.module('extension.storidge') return 'green-icon'; }; }) -.filter('clusterStatusBadge', function () { +.filter('storidgeClusterConditionBadge', function () { 'use strict'; return function (text) { var status = text ? _.toLower(text) : ''; diff --git a/app/extensions/storidge/models/info.js b/app/extensions/storidge/models/info.js index 7d0f2f92f..90b30608d 100644 --- a/app/extensions/storidge/models/info.js +++ b/app/extensions/storidge/models/info.js @@ -1,7 +1,7 @@ export function StoridgeInfoModel(data) { this.Domain = data.domain; this.Nodes = data.nodes; - this.Status = data.status; + this.Condition = data.condition; this.ProvisionedBandwidth = data.provisionedBandwidth; this.UsedBandwidth = data.usedBandwidth; this.FreeBandwidth = data.freeBandwidth; diff --git a/app/extensions/storidge/models/node.js b/app/extensions/storidge/models/node.js index 8af053d3b..73708603f 100644 --- a/app/extensions/storidge/models/node.js +++ b/app/extensions/storidge/models/node.js @@ -7,6 +7,7 @@ export function StoridgeNodeModel(name, data) { export function StoridgeNodeDetailedModel(name, properties) { this.Name = name; + this.Condition = properties.condition; this.Domain = properties.domain; this.DomainID = properties.domainID; this.FreeBandwidth = properties.freeBandwidth; diff --git a/app/extensions/storidge/views/cluster/cluster.html b/app/extensions/storidge/views/cluster/cluster.html index e0915564a..b722f0d94 100644 --- a/app/extensions/storidge/views/cluster/cluster.html +++ b/app/extensions/storidge/views/cluster/cluster.html @@ -21,8 +21,10 @@ {{ clusterInfo.Domain }} - Status - {{ clusterInfo.Status }} + Condition + + {{ clusterInfo.Condition }} + Version diff --git a/app/extensions/storidge/views/nodes/inspect/node.html b/app/extensions/storidge/views/nodes/inspect/node.html index 750f7270e..26c0e56ee 100644 --- a/app/extensions/storidge/views/nodes/inspect/node.html +++ b/app/extensions/storidge/views/nodes/inspect/node.html @@ -11,15 +11,15 @@ @@ -39,8 +39,18 @@ {{ node.DomainID }} - Status - {{ node.Status }} + Node status + + + {{ node.Status }} + + + + Cluster condition + + + {{ node.Condition }} + Metadata version diff --git a/app/extensions/storidge/views/nodes/inspect/nodeController.js b/app/extensions/storidge/views/nodes/inspect/nodeController.js index 47cb15acc..3d9993cc4 100644 --- a/app/extensions/storidge/views/nodes/inspect/nodeController.js +++ b/app/extensions/storidge/views/nodes/inspect/nodeController.js @@ -54,6 +54,9 @@ function ($scope, $state, $transition$, Notifications, StoridgeNodeService, Moda }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to put node in maintenance mode'); + }) + .finally(function final() { + $state.reload(); }); } @@ -81,6 +84,9 @@ function ($scope, $state, $transition$, Notifications, StoridgeNodeService, Moda }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to put node out of maintenance mode'); + }) + .finally(function final() { + $state.reload(); }); }