Revision dd47a0f0
b/lib/client/gnt_debug.py | ||
---|---|---|
164 | 164 |
name=args[0], |
165 | 165 |
evac_nodes=args, |
166 | 166 |
instances=args, |
167 |
mem_size=opts.mem,
|
|
167 |
memory=opts.memory,
|
|
168 | 168 |
disks=disks, |
169 | 169 |
disk_template=opts.disk_template, |
170 | 170 |
nics=nic_dict, |
... | ... | |
568 | 568 |
choices=list(constants.VALID_IALLOCATOR_MODES), |
569 | 569 |
help=("Request mode (one of %s)" % |
570 | 570 |
utils.CommaJoin(constants.VALID_IALLOCATOR_MODES))), |
571 |
cli_option("--mem", default=128, type="unit", |
|
571 |
cli_option("--memory", default=128, type="unit",
|
|
572 | 572 |
help="Memory size for the instance (MiB)"), |
573 | 573 |
cli_option("--disks", default="4096,4096", |
574 | 574 |
help="Comma separated list of disk sizes (MiB)"), |
b/lib/cmdlib.py | ||
---|---|---|
8003 | 8003 |
tags=[], |
8004 | 8004 |
os=self.op.os_type, |
8005 | 8005 |
vcpus=self.be_full[constants.BE_VCPUS], |
8006 |
mem_size=self.be_full[constants.BE_MEMORY],
|
|
8006 |
memory=self.be_full[constants.BE_MEMORY],
|
|
8007 | 8007 |
disks=self.disks, |
8008 | 8008 |
nics=nics, |
8009 | 8009 |
hypervisor=self.op.hypervisor, |
... | ... | |
12005 | 12005 |
self.in_text = self.out_text = self.in_data = self.out_data = None |
12006 | 12006 |
# init all input fields so that pylint is happy |
12007 | 12007 |
self.mode = mode |
12008 |
self.mem_size = self.disks = self.disk_template = None
|
|
12008 |
self.memory = self.disks = self.disk_template = None
|
|
12009 | 12009 |
self.os = self.tags = self.nics = self.vcpus = None |
12010 | 12010 |
self.hypervisor = None |
12011 | 12011 |
self.relocate_from = None |
... | ... | |
12245 | 12245 |
"tags": self.tags, |
12246 | 12246 |
"os": self.os, |
12247 | 12247 |
"vcpus": self.vcpus, |
12248 |
"memory": self.mem_size,
|
|
12248 |
"memory": self.memory,
|
|
12249 | 12249 |
"disks": self.disks, |
12250 | 12250 |
"disk_space_total": disk_space, |
12251 | 12251 |
"nics": self.nics, |
... | ... | |
12325 | 12325 |
_MODE_DATA = { |
12326 | 12326 |
constants.IALLOCATOR_MODE_ALLOC: |
12327 | 12327 |
(_AddNewInstance, |
12328 |
["name", "mem_size", "disks", "disk_template", "os", "tags", "nics",
|
|
12328 |
["name", "memory", "disks", "disk_template", "os", "tags", "nics",
|
|
12329 | 12329 |
"vcpus", "hypervisor"], ht.TList), |
12330 | 12330 |
constants.IALLOCATOR_MODE_RELOC: |
12331 | 12331 |
(_AddRelocateInstance, ["name", "relocate_from"], ht.TList), |
... | ... | |
12473 | 12473 |
|
12474 | 12474 |
""" |
12475 | 12475 |
if self.op.mode == constants.IALLOCATOR_MODE_ALLOC: |
12476 |
for attr in ["mem_size", "disks", "disk_template",
|
|
12476 |
for attr in ["memory", "disks", "disk_template",
|
|
12477 | 12477 |
"os", "tags", "nics", "vcpus"]: |
12478 | 12478 |
if not hasattr(self.op, attr): |
12479 | 12479 |
raise errors.OpPrereqError("Missing attribute '%s' on opcode input" % |
... | ... | |
12532 | 12532 |
ial = IAllocator(self.cfg, self.rpc, |
12533 | 12533 |
mode=self.op.mode, |
12534 | 12534 |
name=self.op.name, |
12535 |
mem_size=self.op.mem_size,
|
|
12535 |
memory=self.op.memory,
|
|
12536 | 12536 |
disks=self.op.disks, |
12537 | 12537 |
disk_template=self.op.disk_template, |
12538 | 12538 |
os=self.op.os, |
b/lib/opcodes.py | ||
---|---|---|
1447 | 1447 |
("hypervisor", None, ht.TMaybeString, None), |
1448 | 1448 |
("allocator", None, ht.TMaybeString, None), |
1449 | 1449 |
("tags", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), None), |
1450 |
("mem_size", None, ht.TOr(ht.TNone, ht.TPositiveInt), None),
|
|
1450 |
("memory", None, ht.TOr(ht.TNone, ht.TPositiveInt), None),
|
|
1451 | 1451 |
("vcpus", None, ht.TOr(ht.TNone, ht.TPositiveInt), None), |
1452 | 1452 |
("os", None, ht.TMaybeString, None), |
1453 | 1453 |
("disk_template", None, ht.TMaybeString, None), |
Also available in: Unified diff