Skip to content

Commit bfe76b4

Browse files
ustcweizhouustcweizhou
committed
CLOUDSTACK-1301: fixed issues and add fields descriptions for disk I/O throttling
1 parent 22cb5be commit bfe76b4

3 files changed

Lines changed: 67 additions & 7 deletions

File tree

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,8 @@ label.network.offering.display.text=Network Offering Display Text
790790
label.network.offering.id=Network Offering ID
791791
label.network.offering.name=Network Offering Name
792792
label.network.offering=Network Offering
793-
label.network.rate.megabytes=Network Rate (Mb/s)
794-
label.network.rate=Network Rate
793+
label.network.rate.megabytes=Network Rate (MB/s)
794+
label.network.rate=Network Rate (Mb/s)
795795
label.network.read=Network Read
796796
label.network.service.providers=Network Service Providers
797797
label.network.type=Network Type

‎ui/scripts/configuration.js‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,27 +112,31 @@
112112
},
113113
diskBytesReadRate: {
114114
label: 'label.disk.bytes.read.rate',
115+
docID: 'helpComputeOfferingDiskBytesReadRate',
115116
validation: {
116117
required: false, //optional
117118
number: true
118119
}
119120
},
120121
diskBytesWriteRate: {
121122
label: 'label.disk.bytes.write.rate',
123+
docID: 'helpComputeOfferingDiskBytesWriteRate',
122124
validation: {
123125
required: false, //optional
124126
number: true
125127
}
126128
},
127129
diskIopsReadRate: {
128130
label: 'label.disk.iops.read.rate',
131+
docID: 'helpComputeOfferingDiskIopsReadRate',
129132
validation: {
130133
required: false, //optional
131134
number: true
132135
}
133136
},
134137
diskIopsWriteRate: {
135138
label: 'label.disk.iops.write.rate',
139+
docID: 'helpComputeOfferingDiskIopsWriteRate',
136140
validation: {
137141
required: false, //optional
138142
number: true
@@ -588,27 +592,31 @@
588592
},
589593
diskBytesReadRate: {
590594
label: 'label.disk.bytes.read.rate',
595+
docID: 'helpSystemOfferingDiskBytesReadRate',
591596
validation: {
592597
required: false, //optional
593598
number: true
594599
}
595600
},
596601
diskBytesWriteRate: {
597602
label: 'label.disk.bytes.write.rate',
603+
docID: 'helpSystemOfferingDiskBytesWriteRate',
598604
validation: {
599605
required: false, //optional
600606
number: true
601607
}
602608
},
603609
diskIopsReadRate: {
604610
label: 'label.disk.iops.read.rate',
611+
docID: 'helpSystemOfferingDiskIopsReadRate',
605612
validation: {
606613
required: false, //optional
607614
number: true
608615
}
609616
},
610617
diskIopsWriteRate: {
611618
label: 'label.disk.iops.write.rate',
619+
docID: 'helpSystemOfferingDiskIopsWriteRate',
612620
validation: {
613621
required: false, //optional
614622
number: true
@@ -1046,13 +1054,13 @@
10461054
$isCustomizedIops.css('display', 'inline-block');
10471055

10481056
if ($isCustomizedIops == true) {
1049-
$minIops.css('display', 'inline-block');
1050-
$maxIops.css('display', 'inline-block');
1051-
}
1052-
else {
10531057
$minIops.hide();
10541058
$maxIops.hide();
10551059
}
1060+
else {
1061+
$minIops.css('display', 'inline-block');
1062+
$maxIops.css('display', 'inline-block');
1063+
}
10561064
}
10571065
else if (qosId == 'hypervisor') { // Hypervisor Qos
10581066
$isCustomizedIops.hide();
@@ -1097,27 +1105,31 @@
10971105
},
10981106
diskBytesReadRate: {
10991107
label: 'label.disk.bytes.read.rate',
1108+
docID: 'helpDiskOfferingDiskBytesReadRate',
11001109
validation: {
11011110
required: false, //optional
11021111
number: true
11031112
}
11041113
},
11051114
diskBytesWriteRate: {
11061115
label: 'label.disk.bytes.write.rate',
1116+
docID: 'helpDiskOfferingDiskBytesWriteRate',
11071117
validation: {
11081118
required: false, //optional
11091119
number: true
11101120
}
11111121
},
11121122
diskIopsReadRate: {
11131123
label: 'label.disk.iops.read.rate',
1124+
docID: 'helpDiskOfferingDiskIopsReadRate',
11141125
validation: {
11151126
required: false, //optional
11161127
number: true
11171128
}
11181129
},
11191130
diskIopsWriteRate: {
11201131
label: 'label.disk.iops.write.rate',
1132+
docID: 'helpDiskOfferingDiskIopsWriteRate',
11211133
validation: {
11221134
required: false, //optional
11231135
number: true
@@ -1784,7 +1796,7 @@
17841796

17851797
displayText: { label: 'label.description', validation: { required: true }, docID: 'helpNetworkOfferingDescription' },
17861798

1787-
networkRate: { label: 'label.network.rate.megabytes', docID: 'helpNetworkOfferingNetworkRate' },
1799+
networkRate: { label: 'label.network.rate', docID: 'helpNetworkOfferingNetworkRate' },
17881800

17891801
/*
17901802
trafficType: {

‎ui/scripts/docs.js‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,22 @@ cloudStack.docs = {
234234
desc: 'Allowed data transfer rate in megabits(Mb) per second',
235235
externalLink: ''
236236
},
237+
helpComputeOfferingDiskBytesReadRate: {
238+
desc: 'Allowed disk read rate in bytes per second',
239+
externalLink: ''
240+
},
241+
helpComputeOfferingDiskBytesWriteRate: {
242+
desc: 'Allowed disk write rate in bytes per second',
243+
externalLink: ''
244+
},
245+
helpComputeOfferingDiskIopsReadRate: {
246+
desc: 'Allowed disk read rate in I/O requests per second',
247+
externalLink: ''
248+
},
249+
helpComputeOfferingDiskIopsWriteRate: {
250+
desc: 'Allowed disk write rate in I/O requests per second',
251+
externalLink: ''
252+
},
237253
helpComputeOfferingHA: {
238254
desc: 'If yes, the administrator can choose to have the VM be monitored and as highly available as possible',
239255
externalLink: ''
@@ -282,6 +298,22 @@ cloudStack.docs = {
282298
desc: 'Appears only if Custom Disk Size is not selected. Define the volume size in GB.',
283299
externalLink: ''
284300
},
301+
helpDiskOfferingDiskBytesReadRate: {
302+
desc: 'Allowed disk read rate in bytes per second',
303+
externalLink: ''
304+
},
305+
helpDiskOfferingDiskBytesWriteRate: {
306+
desc: 'Allowed disk write rate in bytes per second',
307+
externalLink: ''
308+
},
309+
helpDiskOfferingDiskIopsReadRate: {
310+
desc: 'Allowed disk read rate in I/O requests per second',
311+
externalLink: ''
312+
},
313+
helpDiskOfferingDiskIopsWriteRate: {
314+
desc: 'Allowed disk write rate in I/O requests per second',
315+
externalLink: ''
316+
},
285317
helpDiskOfferingCustomDiskIops: {
286318
desc: 'If checked, the user can set Min and Max IOPS. If not checked, the root administrator can define such values.',
287319
externalLink: ''
@@ -718,6 +750,22 @@ cloudStack.docs = {
718750
desc: 'Allowed data transfer rate in megabits(Mb) per second',
719751
externalLink: ''
720752
},
753+
helpSystemOfferingDiskBytesReadRate: {
754+
desc: 'Allowed disk read rate in bytes per second',
755+
externalLink: ''
756+
},
757+
helpSystemOfferingDiskBytesWriteRate: {
758+
desc: 'Allowed disk write rate in bytes per second',
759+
externalLink: ''
760+
},
761+
helpSystemOfferingDiskIopsReadRate: {
762+
desc: 'Allowed disk read rate in I/O requests per second',
763+
externalLink: ''
764+
},
765+
helpSystemOfferingDiskIopsWriteRate: {
766+
desc: 'Allowed disk write rate in I/O requests per second',
767+
externalLink: ''
768+
},
721769
helpSystemOfferingHA: {
722770
desc: 'If yes, the administrator can choose to have the system VM be monitored and as highly available as possible',
723771
externalLink: ''

0 commit comments

Comments
 (0)