Differential D678

Make memory configurable
ClosedPublic
Actions

Authored by mkrizek on Dec 4 2015, 6:00 PM.

Details

Reviewers
tflink
Maniphest Tasks
T659: replace testcloud's hard-coded value for memory with something more configurable
Test Plan

Tested locally, works for me.

Diff Detail

Repository
rTCLOUD testcloud
Branch
feature/config-ram
Lint
Lint OK
Unit
Unit Tests OK
Build Status
Buildable 348
Build 348: arc lint + arc unit
mkrizek retitled this revision from to Make memory configurable.Dec 4 2015, 6:00 PM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a reviewer: tflink.
tflink accepted this revision.Dec 7 2015, 1:48 PM

One minor nit but otherwise looks good

testcloud/cli.py
241

can you add something about "in MiB" here to make sure it's clear?

This revision is now accepted and ready to land.Dec 7 2015, 1:48 PM
mkrizek closed this revision.Dec 7 2015, 9:09 PM

Revision Contents

PathCoverage (All)Coverage (Touched)Packages
Mconf/settings-example.py (3 lines)--
Mtestcloud/cli.py (5 lines)0%0%
Mtestcloud/config.py (3 lines)94%100%
Mtestcloud/instance.py (6 lines)39%100%

Diff 1747

View Options

conf/settings-example.py

Show All 37 Lines
38 38​
39#CMD_LINE_ARGS = [] 39​#CMD_LINE_ARGS = []
40 40​
41# The timeout, in seconds, to wait for an instance to boot before 41​# The timeout, in seconds, to wait for an instance to boot before
42# failing the boot process. Setting this to 0 disables waiting and 42​# failing the boot process. Setting this to 0 disables waiting and
43# returns immediately after starting the boot process. 43​# returns immediately after starting the boot process.
44#BOOT_TIMEOUT = 30 44​#BOOT_TIMEOUT = 30
45 45​
46​# ram size, in MiB
47​#RAM = 512
48​
46# Desired size, in GiB of instance disks. 0 leaves disk capacity 49​# Desired size, in GiB of instance disks. 0 leaves disk capacity
47# identical to source image 50​# identical to source image
48#DISK_SIZE = 0 51​#DISK_SIZE = 0
View Options

testcloud/cli.py

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Line(s)73 raise TestcloudCliError("A testcloud instance named {} already "
75 "{}' to start the instance or remove it before" 75​ "{}' to start the instance or remove it before"
76 " re-creating ".format(args.name, 76​ " re-creating ".format(args.name,
77 existing_instance.path, 77​ existing_instance.path,
78 args.name)) 78​ args.name))
79 79​
80 else: 80​ else:
81 tc_instance = instance.Instance(args.name, tc_image) 81​ tc_instance = instance.Instance(args.name, tc_image)
82 82​
83​ # set ram size
84​ tc_instance.ram = args.ram
85​
83 # set disk size 86​ # set disk size
84 tc_instance.disk_size = args.disksize 87​ tc_instance.disk_size = args.disksize
85 88​
86 # prepare instance 89​ # prepare instance
87 tc_instance.prepare() 90​ tc_instance.prepare()
88 91​
89 # create instance domain 92​ # create instance domain
90 tc_instance.spawn_vm() 93​ tc_instance.spawn_vm()
▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Line(s)189def get_argparser():
230 instarg_destroy.set_defaults(func=_destroy_instance) 233​ instarg_destroy.set_defaults(func=_destroy_instance)
231 234​
232 # instance create 235​ # instance create
233 instarg_create = instarg_subp.add_parser("create", help="create instance") 236​ instarg_create = instarg_subp.add_parser("create", help="create instance")
234 instarg_create.set_defaults(func=_create_instance) 237​ instarg_create.set_defaults(func=_create_instance)
235 instarg_create.add_argument("name", 238​ instarg_create.add_argument("name",
236 help="name of instance to create") 239​ help="name of instance to create")
237 instarg_create.add_argument("--ram", 240​ instarg_create.add_argument("--ram",
238 help="Specify the amount of ram for the VM.", 241​ help="Specify the amount of ram for the VM.",
tflinkUnsubmitted
Not Done

can you add something about "in MiB" here to make sure it's clear?

239 type=int, 242​ type=int,
240 default=512) 243​ default=config_data.RAM)
241 instarg_create.add_argument("--no-graphic", 244​ instarg_create.add_argument("--no-graphic",
242 help="Turn off graphical display.", 245​ help="Turn off graphical display.",
243 action="store_true") 246​ action="store_true")
244 instarg_create.add_argument("--vnc", 247​ instarg_create.add_argument("--vnc",
245 help="Turns on vnc at :1 to the instance.", 248​ help="Turns on vnc at :1 to the instance.",
246 action="store_true") 249​ action="store_true")
247 instarg_create.add_argument("--atomic", 250​ instarg_create.add_argument("--atomic",
248 help="Use this flag if you're booting an Atomic Host.", 251​ help="Use this flag if you're booting an Atomic Host.",
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines
View Options

testcloud/config.py

Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Line(s)115 - [ sh, -c, 'echo -e "ROOT_SIZE=4G\nDATA_SIZE=10G" > /etc/sysconfig/docker-storage-setup']
118 # Extra cmdline args for the qemu invocation. 118​ # Extra cmdline args for the qemu invocation.
119 # Customize as needed :) 119​ # Customize as needed :)
120 120​
121 CMD_LINE_ARGS = [] 121​ CMD_LINE_ARGS = []
122 122​
123 # timeout, in seconds for instance boot process 123​ # timeout, in seconds for instance boot process
124 BOOT_TIMEOUT = 30 124​ BOOT_TIMEOUT = 30
125 125​
126​ # ram size, in MiB
127​ RAM = 512
128​
126 # Desired size, in GiB of instance disks. 0 leaves disk capacity 129​ # Desired size, in GiB of instance disks. 0 leaves disk capacity
127 # identical to source image 130​ # identical to source image
128 DISK_SIZE = 0 131​ DISK_SIZE = 0
129 132​
130 def merge_object(self, obj): 133​ def merge_object(self, obj):
131 '''Overwrites default values with values from a python object which have 134​ '''Overwrites default values with values from a python object which have
132 names containing all upper case letters. 135​ names containing all upper case letters.
133 136​
134 :param obj: python object containing configuration values 137​ :param obj: python object containing configuration values
135 :type obj: python object 138​ :type obj: python object
136 ''' 139​ '''
137 140​
138 for key in dir(obj): 141​ for key in dir(obj):
139 if key.isupper(): 142​ if key.isupper():
140 setattr(self, key, getattr(obj, key)) 143​ setattr(self, key, getattr(obj, key))
View Options

testcloud/instance.py

Show First 20 Lines • Show All 135 Lines • ▼ Show 20 Line(s)135 def __init__(self, name, image=None, hostname=None):
136 self.name = name 136​ self.name = name
137 self.image = image 137​ self.image = image
138 self.path = "{}/instances/{}".format(config_data.DATA_DIR, self.name) 138​ self.path = "{}/instances/{}".format(config_data.DATA_DIR, self.name)
139 self.seed_path = "{}/{}-seed.img".format(self.path, self.name) 139​ self.seed_path = "{}/{}-seed.img".format(self.path, self.name)
140 self.meta_path = "{}/meta".format(self.path) 140​ self.meta_path = "{}/meta".format(self.path)
141 self.local_disk = "{}/{}-local.qcow2".format(self.path, self.name) 141​ self.local_disk = "{}/{}-local.qcow2".format(self.path, self.name)
142 self.xml_path = "{}/{}-domain.xml".format(self.path, self.name) 142​ self.xml_path = "{}/{}-domain.xml".format(self.path, self.name)
143 143​
144 self.ram = 512 144​ self.ram = config_data.RAM
145 # desired size of disk, in GiB 145​ # desired size of disk, in GiB
146 self.disk_size = 0 146​ self.disk_size = config_data.DISK_SIZE
147 self.vnc = False 147​ self.vnc = False
148 self.graphics = False 148​ self.graphics = False
149 self.atomic = False 149​ self.atomic = False
150 self.seed = None 150​ self.seed = None
151 self.kernel = None 151​ self.kernel = None
152 self.initrd = None 152​ self.initrd = None
153 self.hostname = hostname if hostname else config_data.HOSTNAME 153​ self.hostname = hostname if hostname else config_data.HOSTNAME
154 154​
▲ Show 20 Lines • Show All 158 Lines • ▼ Show 20 Line(s)305 def write_domain_xml(self):
313 # Set up the jinja environment 313​ # Set up the jinja environment
314 jinjaLoader = jinja2.FileSystemLoader(searchpath=config_data.DATA_DIR) 314​ jinjaLoader = jinja2.FileSystemLoader(searchpath=config_data.DATA_DIR)
315 jinjaEnv = jinja2.Environment(loader=jinjaLoader) 315​ jinjaEnv = jinja2.Environment(loader=jinjaLoader)
316 xml_template = jinjaEnv.get_template(config_data.XML_TEMPLATE) 316​ xml_template = jinjaEnv.get_template(config_data.XML_TEMPLATE)
317 317​
318 # Stuff our values in a dict 318​ # Stuff our values in a dict
319 instance_values = {'domain_name': self.name, 319​ instance_values = {'domain_name': self.name,
320 'uuid': uuid.uuid4(), 320​ 'uuid': uuid.uuid4(),
321 'memory': 524288, # 512 MiB 321​ 'memory': self.ram * 1024, # MiB to KiB
322 'disk': self.local_disk, 322​ 'disk': self.local_disk,
323 'seed': self.seed_path, 323​ 'seed': self.seed_path,
324 'mac_address': util.generate_mac_address()} 324​ 'mac_address': util.generate_mac_address()}
325 325​
326 # Write out the final xml file for the domain 326​ # Write out the final xml file for the domain
327 with open(self.xml_path, 'w') as dom_template: 327​ with open(self.xml_path, 'w') as dom_template:
328 dom_template.write(xml_template.render(instance_values)) 328​ dom_template.write(xml_template.render(instance_values))
329 329​
▲ Show 20 Lines • Show All 122 Lines • Show Last 20 Lines