Skip to content

Commit f16fab7

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Support multiple volume qos delete"
2 parents 566987e + abfb011 commit f16fab7

5 files changed

Lines changed: 103 additions & 105 deletions

File tree

‎doc/source/command-objects/volume_qos.rst‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Associate a QoS specification to a volume type
1313
.. code:: bash
1414
1515
os volume qos associate
16-
<qos-specs>
16+
<qos-spec>
1717
<volume-type>
1818
19-
.. describe:: <qos-specs>
19+
.. describe:: <qos-spec>
2020

2121
QoS specification to modify (name or ID)
2222

@@ -58,11 +58,11 @@ Delete QoS specification
5858
.. code:: bash
5959
6060
os volume qos delete
61-
<qos-specs>
61+
<qos-spec> [<qos-spec> ...]
6262
63-
.. describe:: <qos-specs>
63+
.. describe:: <qos-spec>
6464

65-
QoS specification to delete (name or ID)
65+
QoS specification(s) to delete (name or ID)
6666

6767
volume qos disassociate
6868
-----------------------
@@ -74,7 +74,7 @@ Disassociate a QoS specification from a volume type
7474
7575
os volume qos disassociate
7676
--volume-type <volume-type> | --all
77-
<qos-specs>
77+
<qos-spec>
7878
7979
.. option:: --volume-type <volume-type>
8080

@@ -84,7 +84,7 @@ Disassociate a QoS specification from a volume type
8484

8585
Disassociate the QoS from every volume type
8686

87-
.. describe:: <qos-specs>
87+
.. describe:: <qos-spec>
8888

8989
QoS specification to modify (name or ID)
9090

@@ -108,13 +108,13 @@ Set QoS specification properties
108108
109109
os volume qos set
110110
[--property <key=value> [...] ]
111-
<qos-specs>
111+
<qos-spec>
112112
113113
.. option:: --property <key=value>
114114

115115
Property to add or modify for this QoS specification (repeat option to set multiple properties)
116116

117-
.. describe:: <qos-specs>
117+
.. describe:: <qos-spec>
118118

119119
QoS specification to modify (name or ID)
120120

@@ -127,9 +127,9 @@ Display QoS specification details
127127
.. code:: bash
128128
129129
os volume qos show
130-
<qos-specs>
130+
<qos-spec>
131131
132-
.. describe:: <qos-specs>
132+
.. describe:: <qos-spec>
133133

134134
QoS specification to display (name or ID)
135135

@@ -143,12 +143,12 @@ Unset QoS specification properties
143143
144144
os volume qos unset
145145
[--property <key>]
146-
<qos-specs>
146+
<qos-spec>
147147
148148
.. option:: --property <key>
149149

150150
Property to remove from QoS specification (repeat option to remove multiple properties)
151151

152-
.. describe:: <qos-specs>
152+
.. describe:: <qos-spec>
153153

154154
QoS specification to modify (name or ID)

‎openstackclient/tests/volume/v1/test_qos_specs.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def test_qos_associate(self):
5656
volume_fakes.type_id
5757
]
5858
verifylist = [
59-
('qos_specs', volume_fakes.qos_id),
59+
('qos_spec', volume_fakes.qos_id),
6060
('volume_type', volume_fakes.type_id)
6161
]
6262
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -210,7 +210,7 @@ def test_qos_delete_with_id(self):
210210
volume_fakes.qos_id
211211
]
212212
verifylist = [
213-
('qos_specs', volume_fakes.qos_id)
213+
('qos_specs', [volume_fakes.qos_id])
214214
]
215215

216216
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -223,7 +223,7 @@ def test_qos_delete_with_name(self):
223223
volume_fakes.qos_name
224224
]
225225
verifylist = [
226-
('qos_specs', volume_fakes.qos_name)
226+
('qos_specs', [volume_fakes.qos_name])
227227
]
228228

229229
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -255,7 +255,7 @@ def test_qos_disassociate_with_volume_type(self):
255255
'--volume-type', volume_fakes.type_id
256256
]
257257
verifylist = [
258-
('qos_specs', volume_fakes.qos_id),
258+
('qos_spec', volume_fakes.qos_id),
259259
('volume_type', volume_fakes.type_id)
260260
]
261261
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -278,7 +278,7 @@ def test_qos_disassociate_with_all_volume_types(self):
278278
'--all'
279279
]
280280
verifylist = [
281-
('qos_specs', volume_fakes.qos_id)
281+
('qos_spec', volume_fakes.qos_id)
282282
]
283283
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
284284

@@ -351,7 +351,7 @@ def test_qos_set_with_properties_with_id(self):
351351
'--property', 'iops=9001'
352352
]
353353
verifylist = [
354-
('qos_specs', volume_fakes.qos_id),
354+
('qos_spec', volume_fakes.qos_id),
355355
('property', volume_fakes.qos_specs)
356356
]
357357
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -386,7 +386,7 @@ def test_qos_show(self):
386386
volume_fakes.qos_id
387387
]
388388
verifylist = [
389-
('qos_specs', volume_fakes.qos_id)
389+
('qos_spec', volume_fakes.qos_id)
390390
]
391391

392392
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -434,7 +434,7 @@ def test_qos_unset_with_properties(self):
434434
]
435435

436436
verifylist = [
437-
('qos_specs', volume_fakes.qos_id),
437+
('qos_spec', volume_fakes.qos_id),
438438
('property', ['iops', 'foo'])
439439
]
440440
parsed_args = self.check_parser(self.cmd, arglist, verifylist)

‎openstackclient/tests/volume/v2/test_qos_specs.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def test_qos_associate(self):
5656
volume_fakes.type_id
5757
]
5858
verifylist = [
59-
('qos_specs', volume_fakes.qos_id),
59+
('qos_spec', volume_fakes.qos_id),
6060
('volume_type', volume_fakes.type_id)
6161
]
6262
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -210,7 +210,7 @@ def test_qos_delete_with_id(self):
210210
volume_fakes.qos_id
211211
]
212212
verifylist = [
213-
('qos_specs', volume_fakes.qos_id)
213+
('qos_specs', [volume_fakes.qos_id])
214214
]
215215

216216
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -223,7 +223,7 @@ def test_qos_delete_with_name(self):
223223
volume_fakes.qos_name
224224
]
225225
verifylist = [
226-
('qos_specs', volume_fakes.qos_name)
226+
('qos_specs', [volume_fakes.qos_name])
227227
]
228228

229229
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -255,7 +255,7 @@ def test_qos_disassociate_with_volume_type(self):
255255
'--volume-type', volume_fakes.type_id
256256
]
257257
verifylist = [
258-
('qos_specs', volume_fakes.qos_id),
258+
('qos_spec', volume_fakes.qos_id),
259259
('volume_type', volume_fakes.type_id)
260260
]
261261
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -278,7 +278,7 @@ def test_qos_disassociate_with_all_volume_types(self):
278278
'--all'
279279
]
280280
verifylist = [
281-
('qos_specs', volume_fakes.qos_id)
281+
('qos_spec', volume_fakes.qos_id)
282282
]
283283
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
284284

@@ -351,7 +351,7 @@ def test_qos_set_with_properties_with_id(self):
351351
'--property', 'iops=9001'
352352
]
353353
verifylist = [
354-
('qos_specs', volume_fakes.qos_id),
354+
('qos_spec', volume_fakes.qos_id),
355355
('property', volume_fakes.qos_specs)
356356
]
357357
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -386,7 +386,7 @@ def test_qos_show(self):
386386
volume_fakes.qos_id
387387
]
388388
verifylist = [
389-
('qos_specs', volume_fakes.qos_id)
389+
('qos_spec', volume_fakes.qos_id)
390390
]
391391

392392
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -434,7 +434,7 @@ def test_qos_unset_with_properties(self):
434434
]
435435

436436
verifylist = [
437-
('qos_specs', volume_fakes.qos_id),
437+
('qos_spec', volume_fakes.qos_id),
438438
('property', ['iops', 'foo'])
439439
]
440440
parsed_args = self.check_parser(self.cmd, arglist, verifylist)

0 commit comments

Comments
 (0)