You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/06/10 19:27:42 UTC
[48/50] [abbrv] CLOUDSTACK-1301: VM Disk I/O Throttling on Bps/IOps
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/869a6b0c/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 33ecdb5..6a9765e 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -109,15 +109,29 @@
number: true
}
},
- diskBytesRate: {
- label: 'label.disk.bytes.rate',
+ diskBytesReadRate: {
+ label: 'label.disk.bytes.read.rate',
validation: {
required: false, //optional
number: true
}
},
- diskIORate: {
- label: 'label.disk.iops.rate',
+ diskBytesWriteRate: {
+ label: 'label.disk.bytes.write.rate',
+ validation: {
+ required: false, //optional
+ number: true
+ }
+ },
+ diskIopsReadRate: {
+ label: 'label.disk.iops.read.rate',
+ validation: {
+ required: false, //optional
+ number: true
+ }
+ },
+ diskIopsWriteRate: {
+ label: 'label.disk.iops.write.rate',
validation: {
required: false, //optional
number: true
@@ -241,17 +255,26 @@
networkrate: args.data.networkRate
});
}
- if(args.data.diskBytesRate != null && args.data.diskBytesRate.length > 0) {
+ if(args.data.diskBytesReadRate != null && args.data.diskBytesReadRate.length > 0) {
$.extend(data, {
- bytesRate: args.data.diskBytesRate
+ bytesreadrate: args.data.diskBytesReadRate
});
}
- if(args.data.diskIORate != null && args.data.diskIORate.length > 0) {
+ if(args.data.diskBytesWriteRate != null && args.data.diskBytesWriteRate.length > 0) {
$.extend(data, {
- iopsRate: args.data.diskIORate
+ byteswriterate: args.data.diskBytesWriteRate
+ });
+ }
+ if(args.data.diskIopsReadRate != null && args.data.diskIopsReadRate.length > 0) {
+ $.extend(data, {
+ iopsreadrate: args.data.diskIopsReadRate
+ });
+ }
+ if(args.data.diskIopsWriteRate != null && args.data.diskIopsWriteRate.length > 0) {
+ $.extend(data, {
+ iopswriterate: args.data.diskIopsWriteRate
});
}
-
$.extend(data, {
offerha: (args.data.offerHA == "on")
});
@@ -420,8 +443,10 @@
}
},
networkrate: { label: 'label.network.rate' },
- diskBytesRate: { label: 'label.disk.bytes.rate' },
- diskIORate: { label: 'label.disk.iops.rate' },
+ diskBytesReadRate: { label: 'label.disk.bytes.read.rate' },
+ diskBytesWriteRate: { label: 'label.disk.bytes.write.rate' },
+ diskIopsReadRate: { label: 'label.disk.iops.read.rate' },
+ diskIopsWriteRate: { label: 'label.disk.iops.write.rate' },
offerha: {
label: 'label.offer.ha',
converter: cloudStack.converters.toBooleanText
@@ -560,15 +585,29 @@
number: true
}
},
- diskBytesRate: {
- label: 'label.disk.bytes.rate',
+ diskBytesReadRate: {
+ label: 'label.disk.bytes.read.rate',
validation: {
required: false, //optional
number: true
}
},
- diskIORate: {
- label: 'label.disk.iops.rate',
+ diskBytesWriteRate: {
+ label: 'label.disk.bytes.write.rate',
+ validation: {
+ required: false, //optional
+ number: true
+ }
+ },
+ diskIopsReadRate: {
+ label: 'label.disk.iops.read.rate',
+ validation: {
+ required: false, //optional
+ number: true
+ }
+ },
+ diskIopsWriteRate: {
+ label: 'label.disk.iops.write.rate',
validation: {
required: false, //optional
number: true
@@ -642,14 +681,24 @@
networkrate: args.data.networkRate
});
}
- if(args.data.diskBytesRate != null && args.data.diskBytesRate.length > 0) {
+ if(args.data.diskBytesReadRate != null && args.data.diskBytesReadRate.length > 0) {
+ $.extend(data, {
+ bytesreadrate: args.data.diskBytesReadRate
+ });
+ }
+ if(args.data.diskBytesWriteRate != null && args.data.diskBytesWriteRate.length > 0) {
+ $.extend(data, {
+ byteswriterate: args.data.diskBytesWriteRate
+ });
+ }
+ if(args.data.diskIopsReadRate != null && args.data.diskIopsReadRate.length > 0) {
$.extend(data, {
- bytesRate: args.data.diskBytesRate
+ iopsreadrate: args.data.diskIopsReadRate
});
}
- if(args.data.diskIORate != null && args.data.diskIORate.length > 0) {
+ if(args.data.diskIopsWriteRate != null && args.data.diskIopsWriteRate.length > 0) {
$.extend(data, {
- iopsRate: args.data.diskIORate
+ iopswriterate: args.data.diskIopsWriteRate
});
}
@@ -831,8 +880,10 @@
}
},
networkrate: { label: 'label.network.rate' },
- diskBytesRate: { label: 'label.disk.bytes.rate' },
- diskIORate: { label: 'label.disk.iops.rate' },
+ diskBytesReadRate: { label: 'label.disk.bytes.write.rate' },
+ diskBytesWriteRate: { label: 'label.disk.bytes.write.rate' },
+ diskIopsReadRate: { label: 'label.disk.iops.write.rate' },
+ diskIopsWriteRate: { label: 'label.disk.iops.write.rate' },
offerha: {
label: 'label.offer.ha',
converter: cloudStack.converters.toBooleanText
@@ -893,15 +944,29 @@
return "N/A";
}
},
- diskBytesRate: {
- label: 'label.disk.bytes.rate',
+ diskBytesReadRate: {
+ label: 'label.disk.bytes.read.rate',
validation: {
required: false, //optional
number: true
}
},
- diskIORate: {
- label: 'label.disk.iops.rate',
+ diskBytesWriteRate: {
+ label: 'label.disk.bytes.write.rate',
+ validation: {
+ required: false, //optional
+ number: true
+ }
+ },
+ diskIopsReadRate: {
+ label: 'label.disk.iops.read.rate',
+ validation: {
+ required: false, //optional
+ number: true
+ }
+ },
+ diskIopsWriteRate: {
+ label: 'label.disk.iops.write.rate',
validation: {
required: false, //optional
number: true
@@ -977,15 +1042,29 @@
dependsOn: 'isCustomized',
validation: { required: true, number: true }
},
- diskBytesRate: {
- label: 'label.disk.bytes.rate',
+ diskBytesReadRate: {
+ label: 'label.disk.bytes.read.rate',
+ validation: {
+ required: false, //optional
+ number: true
+ }
+ },
+ diskBytesWriteRate: {
+ label: 'label.disk.bytes.write.rate',
+ validation: {
+ required: false, //optional
+ number: true
+ }
+ },
+ diskIopsReadRate: {
+ label: 'label.disk.iops.read.rate',
validation: {
required: false, //optional
number: true
}
},
- diskIORate: {
- label: 'label.disk.iops.rate',
+ diskIopsWriteRate: {
+ label: 'label.disk.iops.write.rate',
validation: {
required: false, //optional
number: true
@@ -1052,6 +1131,26 @@
domainid: args.data.domainId
});
}
+ if(args.data.diskBytesReadRate != null && args.data.diskBytesReadRate.length > 0) {
+ $.extend(data, {
+ bytesreadrate: args.data.diskBytesReadRate
+ });
+ }
+ if(args.data.diskBytesWriteRate != null && args.data.diskBytesWriteRate.length > 0) {
+ $.extend(data, {
+ byteswriterate: args.data.diskBytesWriteRate
+ });
+ }
+ if(args.data.diskIopsReadRate != null && args.data.diskIopsReadRate.length > 0) {
+ $.extend(data, {
+ iopsreadrate: args.data.diskIopsReadRate
+ });
+ }
+ if(args.data.diskIopsWriteRate != null && args.data.diskIopsWriteRate.length > 0) {
+ $.extend(data, {
+ iopswriterate: args.data.diskIopsWriteRate
+ });
+ }
$.ajax({
url: createURL('createDiskOffering'),
@@ -1164,8 +1263,10 @@
return "N/A";
}
},
- diskBytesRate: { label: 'label.disk.bytes.rate' },
- diskIORate: { label: 'label.disk.iops.rate' },
+ diskBytesReadRate: { label: 'label.disk.bytes.write.rate' },
+ diskBytesWriteRate: { label: 'label.disk.bytes.write.rate' },
+ diskIopsReadRate: { label: 'label.disk.iops.write.rate' },
+ diskIopsWriteRate: { label: 'label.disk.iops.write.rate' },
tags: { label: 'label.storage.tags' },
domain: { label: 'label.domain' },
storagetype: { label: 'label.storage.type' }