From cd6587ebcdca1a7be5482e48654859f6878d57c6 Mon Sep 17 00:00:00 2001 From: baron_l Date: Mon, 18 Mar 2019 18:01:10 +0100 Subject: [PATCH] fix(storidge): update model and views for Storidge v2695 --- .../volumeStoridgeInfo.html | 4 +- app/extensions/storidge/models/node.js | 40 +++++++++---------- app/extensions/storidge/models/volume.js | 6 +-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html index cdecb1140..a115c1fe8 100644 --- a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html +++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html @@ -103,8 +103,8 @@ {{ $ctrl.volume.Replication}} - Snapshot - {{ $ctrl.volume.Snapshot}} + Snapshot Enabled + {{ $ctrl.volume.SnapshotEnabled}} Snapshot Interval diff --git a/app/extensions/storidge/models/node.js b/app/extensions/storidge/models/node.js index cd20b6f0c..01511167e 100644 --- a/app/extensions/storidge/models/node.js +++ b/app/extensions/storidge/models/node.js @@ -7,24 +7,24 @@ function StoridgeNodeModel(name, data) { function StoridgeNodeDetailedModel(name, properties) { this.Name = name; - this.Domain = properties['domain:']; - this.DomainID = properties['domainID:']; - this.FreeBandwidth = properties['freeBandwidth:']; - this.FreeCapacity = properties['freeCapacity:']; - this.FreeIOPS = properties['freeIOPS:']; - this.Hdds = properties['hdds:']; - this.MetadataVersion = properties['metadataVersion:']; - this.Nodes = properties['nodes:']; - this.ProvisionedBandwidth = properties['provisionedBandwidth:']; - this.ProvisionedCapacity = properties['provisionedCapacity:']; - this.ProvisionedIOPS = properties['provisionedIOPS:']; - this.Ssds = properties['ssds:']; - this.Status = properties['status:']; - this.TotalBandwidth = properties['totalBandwidth:']; - this.TotalCapacity = properties['totalCapacity:']; - this.TotalIOPS = properties['totalIOPS:']; - this.UsedBandwidth = properties['usedBandwidth:']; - this.UsedCapacity = properties['usedCapacity:']; - this.UsedIOPS = properties['usedIOPS:']; - this.Vdisks = properties['vdisks:']; + this.Domain = properties.domain; + this.DomainID = properties.domainID; + this.FreeBandwidth = properties.freeBandwidth; + this.FreeCapacity = properties.freeCapacity; + this.FreeIOPS = properties.freeIOPS; + this.Hdds = properties.hdds; + this.MetadataVersion = properties.metadataVersion; + this.Nodes = properties.nodes; + this.ProvisionedBandwidth = properties.provisionedBandwidth; + this.ProvisionedCapacity = properties.provisionedCapacity; + this.ProvisionedIOPS = properties.provisionedIOPS; + this.Ssds = properties.ssds; + this.Status = properties.status; + this.TotalBandwidth = properties.totalBandwidth; + this.TotalCapacity = properties.totalCapacity; + this.TotalIOPS = properties.totalIOPS; + this.UsedBandwidth = properties.usedBandwidth; + this.UsedCapacity = properties.usedCapacity; + this.UsedIOPS = properties.usedIOPS; + this.Vdisks = properties.vdisks; } \ No newline at end of file diff --git a/app/extensions/storidge/models/volume.js b/app/extensions/storidge/models/volume.js index d77f84a97..adb8ab4b2 100644 --- a/app/extensions/storidge/models/volume.js +++ b/app/extensions/storidge/models/volume.js @@ -1,5 +1,5 @@ function StoridgeVolumeModel(data) { - this.Allocated = data['allocate%']; + this.Allocated = data['alloc percent']; this.Capacity = data.capacity; this.Directory = data.directory; this.IOPSMax = data.iopsmax; @@ -23,8 +23,8 @@ function StoridgeVolumeModel(data) { this.Encryption = data.encryption; this.Replication = data.replication; this.SnapshotEnabled = data.snapshot; - this.SnapshotInterval = data.snapshotinterval; - this.SnapshotMax = data.snapshotmax; + this.SnapshotInterval = data.snapinterval; + this.SnapshotMax = data.snapmax; this.Filesystem = data.filesystem; }