Revision 6afb9fb4
| b/lib/cmdlib/node.py | ||
|---|---|---|
| 1290 | 1290 |
return self.nq.OldStyleQuery(self) |
| 1291 | 1291 |
|
| 1292 | 1292 |
|
| 1293 |
def _CheckOutputFields(static, dynamic, selected):
|
|
| 1294 |
"""Checks whether all selected fields are valid. |
|
| 1293 |
def _CheckOutputFields(fields, selected):
|
|
| 1294 |
"""Checks whether all selected fields are valid according to fields.
|
|
| 1295 | 1295 |
|
| 1296 |
@type static: L{utils.FieldSet}
|
|
| 1297 |
@param static: static fields set
|
|
| 1298 |
@type dynamic: L{utils.FieldSet}
|
|
| 1299 |
@param dynamic: dynamic fields set
|
|
| 1296 |
@type fields: L{utils.FieldSet}
|
|
| 1297 |
@param fields: fields set
|
|
| 1298 |
@type selected: L{utils.FieldSet}
|
|
| 1299 |
@param selected: fields set
|
|
| 1300 | 1300 |
|
| 1301 | 1301 |
""" |
| 1302 |
f = utils.FieldSet() |
|
| 1303 |
f.Extend(static) |
|
| 1304 |
f.Extend(dynamic) |
|
| 1305 |
|
|
| 1306 |
delta = f.NonMatching(selected) |
|
| 1302 |
delta = fields.NonMatching(selected) |
|
| 1307 | 1303 |
if delta: |
| 1308 | 1304 |
raise errors.OpPrereqError("Unknown output fields selected: %s"
|
| 1309 | 1305 |
% ",".join(delta), errors.ECODE_INVAL) |
| ... | ... | |
| 1314 | 1310 |
|
| 1315 | 1311 |
""" |
| 1316 | 1312 |
REQ_BGL = False |
| 1317 |
_FIELDS_DYNAMIC = utils.FieldSet("phys", "vg", "name", "size", "instance")
|
|
| 1318 |
_FIELDS_STATIC = utils.FieldSet("node")
|
|
| 1319 | 1313 |
|
| 1320 | 1314 |
def CheckArguments(self): |
| 1321 |
_CheckOutputFields(static=self._FIELDS_STATIC,
|
|
| 1322 |
dynamic=self._FIELDS_DYNAMIC,
|
|
| 1323 |
selected=self.op.output_fields)
|
|
| 1315 |
_CheckOutputFields(utils.FieldSet("node", "phys", "vg", "name", "size",
|
|
| 1316 |
"instance"),
|
|
| 1317 |
self.op.output_fields) |
|
| 1324 | 1318 |
|
| 1325 | 1319 |
def ExpandNames(self): |
| 1326 | 1320 |
self.share_locks = ShareAll() |
| ... | ... | |
| 1395 | 1389 |
REQ_BGL = False |
| 1396 | 1390 |
|
| 1397 | 1391 |
def CheckArguments(self): |
| 1398 |
_CheckOutputFields(static=utils.FieldSet(), |
|
| 1399 |
dynamic=utils.FieldSet(*constants.VALID_STORAGE_FIELDS), |
|
| 1400 |
selected=self.op.output_fields) |
|
| 1392 |
_CheckOutputFields(utils.FieldSet(*constants.VALID_STORAGE_FIELDS), |
|
| 1393 |
self.op.output_fields) |
|
| 1401 | 1394 |
|
| 1402 | 1395 |
def ExpandNames(self): |
| 1403 | 1396 |
self.share_locks = ShareAll() |
Also available in: Unified diff