github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(storidge): update 6

storidge-standalone
Anthony Lapenna 2019-04-18 14:16:21 +12:00
parent 8fb8aba075
commit 64fa3e78ff
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/extensions/storidge/models/profile.js
View File

@ -13,7 +13,6 @@ export function StoridgeProfileDefaultModel() {
this.SnapshotInterval = 1440; this.SnapshotInterval = 1440;
this.SnapshotMax = 1; this.SnapshotMax = 1;
this.EncryptionEnabled = false; this.EncryptionEnabled = false;
// this.InterfaceType = 'nfs';
this.InterfaceType = ''; this.InterfaceType = '';
this.InterfaceDriver = ''; this.InterfaceDriver = '';
this.InterfaceNetwork = ''; this.InterfaceNetwork = '';
@ -118,11 +117,14 @@ export function StoridgeCreateProfileRequest(model) {
this.service = service; this.service = service;
this.interface = { this.interface = {
type: model.InterfaceType,
driver: model.InterfaceDriver, driver: model.InterfaceDriver,
network: model.InterfaceNetwork, network: model.InterfaceNetwork,
conf: model.InterfaceConf conf: model.InterfaceConf
}; };
if (model.InterfaceType) {
this.interface.type = model.InterfaceType;
}
this.label = model.Labels; this.label = model.Labels;
} }

14
app/extensions/storidge/models/volume.js
View File

@ -1,10 +1,10 @@
export function StoridgeVolumeModel(data) { export function StoridgeVolumeModel(data) {
this.Allocated = data['alloc percent']; this.Allocated = data.allocated;
this.Capacity = data.capacity; this.Capacity = data.capacity;
this.Directory = data.directory; this.Directory = data.directory;
this.IOPSMax = data.iopsmax; this.IOPSMax = data.maximumIOPS;
this.IOPSMin = data.iopsmin; this.IOPSMin = data.minimumIOPS;
this.LocalDriveOnly = data.localdriveonly; this.LocalDriveOnly = data.localDriveOnly;
this.Name = data.name; this.Name = data.name;
this.Node = data.node; this.Node = data.node;
this.NodeID = data.nodeid; this.NodeID = data.nodeid;
@ -15,11 +15,11 @@ export function StoridgeVolumeModel(data) {
this.Labels = data.labels; this.Labels = data.labels;
this.IP = data.ipaddr; this.IP = data.ipaddr;
this.DriveType = data.type; this.DriveType = data.driveType;
this.Encryption = data.encryption; this.Encryption = data.encryption;
this.SnapshotEnabled = data.snapshot; this.SnapshotEnabled = data.snapshot;
this.SnapshotInterval = data.snapinterval; this.SnapshotInterval = data.snapInterval;
this.SnapshotMax = data.snapmax; this.SnapshotMax = data.maximumSnapshots;
this.Filesystem = data.filesystem; this.Filesystem = data.filesystem;
} }

6
app/extensions/storidge/views/nodes/inspect/node.html
View File

@ -11,15 +11,15 @@
<rd-widget> <rd-widget>
<rd-widget-header icon="fa-object-group" title-text="Node details"> <rd-widget-header icon="fa-object-group" title-text="Node details">
<button type="button" class="btn btn-sm btn-danger" <button type="button" class="btn btn-sm btn-danger"
ng-disabled="node.Status !== 'normal'" ng-click="removeNodeAction()"> ng-disabled="node.Status !== 'Normal'" ng-click="removeNodeAction()">
<i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove node <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove node
</button> </button>
<button type="button" class="btn btn-sm btn-primary" <button type="button" class="btn btn-sm btn-primary"
ng-disabled="node.Status !== 'normal'" ng-click="cordonNodeAction()"> ng-disabled="node.Status !== 'Normal'" ng-click="cordonNodeAction()">
<i class="fas fa-wrench space-right" aria-hidden="true"></i>Enter maintenance mode <i class="fas fa-wrench space-right" aria-hidden="true"></i>Enter maintenance mode
</button> </button>
<button type="button" class="btn btn-sm btn-primary" <button type="button" class="btn btn-sm btn-primary"
ng-disabled="node.Status !== 'cordoned'" ng-click="uncordonNodeAction()"> ng-disabled="node.Status !== 'Cordoned'" ng-click="uncordonNodeAction()">
<i class="fa fa-power-off space-right" aria-hidden="true"></i>Exit maintenance mode <i class="fa fa-power-off space-right" aria-hidden="true"></i>Exit maintenance mode
</button> </button>
</rd-widget-header> </rd-widget-header>