diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html index ad9162965..78449da1d 100644 --- a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html +++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html @@ -74,10 +74,6 @@ IP {{ $ctrl.volume.IP}} - - Volume - {{ $ctrl.volume.Volume}} - Drive Type {{ $ctrl.volume.DriveType}} @@ -86,10 +82,6 @@ Encryption {{ $ctrl.volume.Encryption}} - - Replication - {{ $ctrl.volume.Replication}} - Snapshot Enabled {{ $ctrl.volume.SnapshotEnabled}} diff --git a/app/extensions/storidge/filters/filters.js b/app/extensions/storidge/filters/filters.js index 22100b84d..4bfbb832d 100644 --- a/app/extensions/storidge/filters/filters.js +++ b/app/extensions/storidge/filters/filters.js @@ -1,24 +1,16 @@ import _ from 'lodash-es'; -function includeString(text, values) { - return values.some(function(val){ - return text.indexOf(val) !== -1; - }); -} - angular.module('extension.storidge') .filter('drivestatusbadge', function () { 'use strict'; return function (text) { var status = text ? _.toLower(text) : ''; - if (includeString(status, ['normal'])) { - return 'success'; - } else if (includeString(status, ['available'])) { - return 'info'; - } else if (includeString(status, ['faulty'])) { - return 'danger'; + if (status === 'available') { + return 'info'; + } else if (status === 'faulty') { + return 'danger'; } - return 'info'; + return 'success'; }; }) .filter('storidgeNodeStatusBadge', function () { @@ -27,7 +19,7 @@ angular.module('extension.storidge') var status = text ? _.toLower(text) : ''; if (status === 'cordoned') { return 'orange-icon'; - } else if (status === 'alert') { + } else if (status === 'leaving') { return 'red-icon' } return 'green-icon'; diff --git a/app/extensions/storidge/models/volume.js b/app/extensions/storidge/models/volume.js index ab8b1c14b..1c075983e 100644 --- a/app/extensions/storidge/models/volume.js +++ b/app/extensions/storidge/models/volume.js @@ -15,10 +15,8 @@ export function StoridgeVolumeModel(data) { this.Labels = data.labels; this.IP = data.ipaddr; - this.Volume = data.volume; this.DriveType = data.type; this.Encryption = data.encryption; - this.Replication = data.replication; this.SnapshotEnabled = data.snapshot; this.SnapshotInterval = data.snapinterval; this.SnapshotMax = data.snapmax; diff --git a/app/extensions/storidge/services/snapshotService.js b/app/extensions/storidge/services/snapshotService.js index 2f6cbf448..eac194073 100644 --- a/app/extensions/storidge/services/snapshotService.js +++ b/app/extensions/storidge/services/snapshotService.js @@ -51,7 +51,7 @@ angular.module('extension.storidge') function create(volumeId, description) { var deferred = $q.defer(); - Storidge.createSnapshot({id: volumeId, description: description}).$promise + Storidge.createSnapshot({id: volumeId, opts: {description: description}}).$promise .then(function success(data) { deferred.resolve(data); }) diff --git a/app/extensions/storidge/views/nodes/inspect/node.html b/app/extensions/storidge/views/nodes/inspect/node.html index 6909c3515..d47374c29 100644 --- a/app/extensions/storidge/views/nodes/inspect/node.html +++ b/app/extensions/storidge/views/nodes/inspect/node.html @@ -11,11 +11,11 @@