cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to bfe76b4
Date Wed, 17 Jul 2013 14:35:58 GMT
Updated Branches:
  refs/heads/master 22cb5be8b -> bfe76b44d


CLOUDSTACK-1301: fixed issues and add fields descriptions for disk I/O throttling


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bfe76b44
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bfe76b44
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bfe76b44

Branch: refs/heads/master
Commit: bfe76b44daafe7f7844531ef53ee264c2e71c2ea
Parents: 22cb5be
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Wed Jul 17 16:35:51 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Wed Jul 17 16:35:51 2013 +0200

----------------------------------------------------------------------
 .../classes/resources/messages.properties       |  4 +-
 ui/scripts/configuration.js                     | 22 +++++++--
 ui/scripts/docs.js                              | 48 ++++++++++++++++++++
 3 files changed, 67 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bfe76b44/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index fab8dbd..367459b 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -790,8 +790,8 @@ label.network.offering.display.text=Network Offering Display Text
 label.network.offering.id=Network Offering ID
 label.network.offering.name=Network Offering Name
 label.network.offering=Network Offering
-label.network.rate.megabytes=Network Rate (Mb/s)
-label.network.rate=Network Rate
+label.network.rate.megabytes=Network Rate (MB/s)
+label.network.rate=Network Rate (Mb/s)
 label.network.read=Network Read
 label.network.service.providers=Network Service Providers
 label.network.type=Network Type

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bfe76b44/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index aa8fafd..8bc40d6 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -112,6 +112,7 @@
                   },
                   diskBytesReadRate: {
                       label: 'label.disk.bytes.read.rate',
+                      docID: 'helpComputeOfferingDiskBytesReadRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -119,6 +120,7 @@
                   },
                   diskBytesWriteRate: {
                       label: 'label.disk.bytes.write.rate',
+                      docID: 'helpComputeOfferingDiskBytesWriteRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -126,6 +128,7 @@
                   },
                   diskIopsReadRate: {
                       label: 'label.disk.iops.read.rate',
+                      docID: 'helpComputeOfferingDiskIopsReadRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -133,6 +136,7 @@
                   },
                   diskIopsWriteRate: {
                       label: 'label.disk.iops.write.rate',
+                      docID: 'helpComputeOfferingDiskIopsWriteRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -588,6 +592,7 @@
                   },
                   diskBytesReadRate: {
                       label: 'label.disk.bytes.read.rate',
+                      docID: 'helpSystemOfferingDiskBytesReadRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -595,6 +600,7 @@
                   },
                   diskBytesWriteRate: {
                       label: 'label.disk.bytes.write.rate',
+                      docID: 'helpSystemOfferingDiskBytesWriteRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -602,6 +608,7 @@
                   },
                   diskIopsReadRate: {
                       label: 'label.disk.iops.read.rate',
+                      docID: 'helpSystemOfferingDiskIopsReadRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -609,6 +616,7 @@
                   },
                   diskIopsWriteRate: {
                       label: 'label.disk.iops.write.rate',
+                      docID: 'helpSystemOfferingDiskIopsWriteRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -1046,13 +1054,13 @@
                           $isCustomizedIops.css('display', 'inline-block');
 
                           if ($isCustomizedIops == true) {
-                            $minIops.css('display', 'inline-block');
-                            $maxIops.css('display', 'inline-block');
-                          }
-                          else {
                             $minIops.hide();
                             $maxIops.hide();
                           }
+                          else {
+                            $minIops.css('display', 'inline-block');
+                            $maxIops.css('display', 'inline-block');
+                          }
                         }
                         else if (qosId == 'hypervisor') { // Hypervisor Qos
                           $isCustomizedIops.hide();
@@ -1097,6 +1105,7 @@
                   },
                   diskBytesReadRate: {
                       label: 'label.disk.bytes.read.rate',
+                      docID: 'helpDiskOfferingDiskBytesReadRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -1104,6 +1113,7 @@
                   },
                   diskBytesWriteRate: {
                       label: 'label.disk.bytes.write.rate',
+                      docID: 'helpDiskOfferingDiskBytesWriteRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -1111,6 +1121,7 @@
                   },
                   diskIopsReadRate: {
                       label: 'label.disk.iops.read.rate',
+                      docID: 'helpDiskOfferingDiskIopsReadRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -1118,6 +1129,7 @@
                   },
                   diskIopsWriteRate: {
                       label: 'label.disk.iops.write.rate',
+                      docID: 'helpDiskOfferingDiskIopsWriteRate',
                       validation: {
                         required: false, //optional
                         number: true
@@ -1784,7 +1796,7 @@
 
                   displayText: { label: 'label.description', validation: { required: true
}, docID: 'helpNetworkOfferingDescription' },
 
-                  networkRate: { label: 'label.network.rate.megabytes', docID: 'helpNetworkOfferingNetworkRate'
},
+                  networkRate: { label: 'label.network.rate', docID: 'helpNetworkOfferingNetworkRate'
},
 
 									/*
                   trafficType: {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bfe76b44/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 635e619..c8ef0d9 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -234,6 +234,22 @@ cloudStack.docs = {
   desc: 'Allowed data transfer rate in megabits(Mb) per second',
   externalLink: ''
   },
+  helpComputeOfferingDiskBytesReadRate: {
+  desc: 'Allowed disk read rate in bytes per second',
+  externalLink: ''
+  },
+  helpComputeOfferingDiskBytesWriteRate: {
+  desc: 'Allowed disk write rate in bytes per second',
+  externalLink: ''
+  },
+  helpComputeOfferingDiskIopsReadRate: {
+  desc: 'Allowed disk read rate in I/O requests per second',
+  externalLink: ''
+  },
+  helpComputeOfferingDiskIopsWriteRate: {
+  desc: 'Allowed disk write rate in I/O requests per second',
+  externalLink: ''
+  },
   helpComputeOfferingHA: {
   desc: 'If yes, the administrator can choose to have the VM be monitored and as highly available
as possible',
   externalLink: ''
@@ -282,6 +298,22 @@ cloudStack.docs = {
   desc: 'Appears only if Custom Disk Size is not selected. Define the volume size in GB.',
   externalLink: ''
   },
+  helpDiskOfferingDiskBytesReadRate: {
+  desc: 'Allowed disk read rate in bytes per second',
+  externalLink: ''
+  },
+  helpDiskOfferingDiskBytesWriteRate: {
+  desc: 'Allowed disk write rate in bytes per second',
+  externalLink: ''
+  },
+  helpDiskOfferingDiskIopsReadRate: {
+  desc: 'Allowed disk read rate in I/O requests per second',
+  externalLink: ''
+  },
+  helpDiskOfferingDiskIopsWriteRate: {
+  desc: 'Allowed disk write rate in I/O requests per second',
+  externalLink: ''
+  },
   helpDiskOfferingCustomDiskIops: {
   desc: 'If checked, the user can set Min and Max IOPS. If not checked, the root administrator
can define such values.',
   externalLink: ''
@@ -718,6 +750,22 @@ cloudStack.docs = {
   desc: 'Allowed data transfer rate in megabits(Mb) per second',
   externalLink: ''
   },
+  helpSystemOfferingDiskBytesReadRate: {
+  desc: 'Allowed disk read rate in bytes per second',
+  externalLink: ''
+  },
+  helpSystemOfferingDiskBytesWriteRate: {
+  desc: 'Allowed disk write rate in bytes per second',
+  externalLink: ''
+  },
+  helpSystemOfferingDiskIopsReadRate: {
+  desc: 'Allowed disk read rate in I/O requests per second',
+  externalLink: ''
+  },
+  helpSystemOfferingDiskIopsWriteRate: {
+  desc: 'Allowed disk write rate in I/O requests per second',
+  externalLink: ''
+  },
   helpSystemOfferingHA: {
   desc: 'If yes, the administrator can choose to have the system VM be monitored and as highly
available as possible',
   externalLink: ''


Mime
View raw message