Revision 9a3cc7ae
b/lib/client/gnt_instance.py | ||
---|---|---|
1280 | 1280 |
" specifying a secondary node") |
1281 | 1281 |
return 1 |
1282 | 1282 |
|
1283 |
op = opcodes.OpSetInstanceParams(instance_name=args[0],
|
|
1283 |
op = opcodes.OpInstanceSetParams(instance_name=args[0],
|
|
1284 | 1284 |
nics=opts.nics, |
1285 | 1285 |
disks=opts.disks, |
1286 | 1286 |
disk_template=opts.disk_template, |
b/lib/cmdlib.py | ||
---|---|---|
6608 | 6608 |
" node %s" % (file_storage_dir, pnode)) |
6609 | 6609 |
|
6610 | 6610 |
# Note: this needs to be kept in sync with adding of disks in |
6611 |
# LUSetInstanceParams
|
|
6611 |
# LUInstanceSetParams
|
|
6612 | 6612 |
for idx, device in enumerate(instance.disks): |
6613 | 6613 |
if to_skip and idx in to_skip: |
6614 | 6614 |
continue |
... | ... | |
8839 | 8839 |
return result |
8840 | 8840 |
|
8841 | 8841 |
|
8842 |
class LUSetInstanceParams(LogicalUnit):
|
|
8842 |
class LUInstanceSetParams(LogicalUnit):
|
|
8843 | 8843 |
"""Modifies an instances's parameters. |
8844 | 8844 |
|
8845 | 8845 |
""" |
b/lib/opcodes.py | ||
---|---|---|
982 | 982 |
] |
983 | 983 |
|
984 | 984 |
|
985 |
class OpSetInstanceParams(OpCode):
|
|
985 |
class OpInstanceSetParams(OpCode):
|
|
986 | 986 |
"""Change the parameters of an instance.""" |
987 | 987 |
OP_ID = "OP_INSTANCE_SET_PARAMS" |
988 | 988 |
OP_DSC_FIELD = "instance_name" |
b/lib/rapi/rlib2.py | ||
---|---|---|
1271 | 1271 |
def _ParseModifyInstanceRequest(name, data): |
1272 | 1272 |
"""Parses a request for modifying an instance. |
1273 | 1273 |
|
1274 |
@rtype: L{opcodes.OpSetInstanceParams}
|
|
1274 |
@rtype: L{opcodes.OpInstanceSetParams}
|
|
1275 | 1275 |
@return: Instance modify opcode |
1276 | 1276 |
|
1277 | 1277 |
""" |
... | ... | |
1293 | 1293 |
utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES, |
1294 | 1294 |
allowed_values=[constants.VALUE_DEFAULT]) |
1295 | 1295 |
|
1296 |
return opcodes.OpSetInstanceParams(instance_name=name, hvparams=hvparams,
|
|
1296 |
return opcodes.OpInstanceSetParams(instance_name=name, hvparams=hvparams,
|
|
1297 | 1297 |
beparams=beparams, osparams=osparams, |
1298 | 1298 |
force=force, nics=nics, disks=disks, |
1299 | 1299 |
disk_template=disk_template, |
b/test/ganeti.rapi.rlib2_unittest.py | ||
---|---|---|
327 | 327 |
} |
328 | 328 |
|
329 | 329 |
op = self.Parse(name, data) |
330 |
self.assert_(isinstance(op, opcodes.OpSetInstanceParams))
|
|
330 |
self.assert_(isinstance(op, opcodes.OpInstanceSetParams))
|
|
331 | 331 |
self.assertEqual(op.instance_name, name) |
332 | 332 |
self.assertEqual(op.hvparams, hvparams) |
333 | 333 |
self.assertEqual(op.beparams, beparams) |
... | ... | |
344 | 344 |
name = "instir8aish31" |
345 | 345 |
|
346 | 346 |
op = self.Parse(name, {}) |
347 |
self.assert_(isinstance(op, opcodes.OpSetInstanceParams))
|
|
347 |
self.assert_(isinstance(op, opcodes.OpInstanceSetParams))
|
|
348 | 348 |
self.assertEqual(op.instance_name, name) |
349 | 349 |
self.assertEqual(op.hvparams, {}) |
350 | 350 |
self.assertEqual(op.beparams, {}) |
b/tools/burnin | ||
---|---|---|
863 | 863 |
Log("Adding and removing disks") |
864 | 864 |
for instance in self.instances: |
865 | 865 |
Log("instance %s", instance, indent=1) |
866 |
op_add = opcodes.OpSetInstanceParams(\
|
|
866 |
op_add = opcodes.OpInstanceSetParams(\
|
|
867 | 867 |
instance_name=instance, |
868 | 868 |
disks=[(constants.DDM_ADD, {"size": self.disk_size[0]})]) |
869 |
op_rem = opcodes.OpSetInstanceParams(\
|
|
869 |
op_rem = opcodes.OpInstanceSetParams(\
|
|
870 | 870 |
instance_name=instance, disks=[(constants.DDM_REMOVE, {})]) |
871 | 871 |
op_stop = self.StopInstanceOp(instance) |
872 | 872 |
op_start = self.StartInstanceOp(instance) |
... | ... | |
880 | 880 |
Log("Adding and removing NICs") |
881 | 881 |
for instance in self.instances: |
882 | 882 |
Log("instance %s", instance, indent=1) |
883 |
op_add = opcodes.OpSetInstanceParams(\
|
|
883 |
op_add = opcodes.OpInstanceSetParams(\
|
|
884 | 884 |
instance_name=instance, nics=[(constants.DDM_ADD, {})]) |
885 |
op_rem = opcodes.OpSetInstanceParams(\
|
|
885 |
op_rem = opcodes.OpInstanceSetParams(\
|
|
886 | 886 |
instance_name=instance, nics=[(constants.DDM_REMOVE, {})]) |
887 | 887 |
Log("adding a NIC", indent=2) |
888 | 888 |
Log("removing last NIC", indent=2) |
Also available in: Unified diff