Revision b518a14a

b/tools/burnin
151 151
    parser.add_option("--no-startstop", dest="do_startstop",
152 152
                      help="Skip instance stop/start", action="store_false",
153 153
                      default=True)
154
    parser.add_option("--no-nics", dest="nics",
155
                      help="No network interfaces", action="store_const",
156
                      const=[], default=[{}])
154 157
    parser.add_option("--rename", dest="rename", default=None,
155 158
                      help="Give one unused instance name which is taken"
156 159
                           " to start the renaming sequence",
......
185 188
      Log("Unknown disk template '%s'" % options.disk_template)
186 189
      sys.exit(1)
187 190

  
188
    disk_size = [utils.ParseUnit(v) for v in options.disk_size.split(",")]
189
    disk_growth = [utils.ParseUnit(v) for v in options.disk_growth.split(",")]
190
    if len(disk_growth) != len(disk_size):
191
      Log("Wrong disk sizes/growth combination")
192
      sys.exit(1)
191
    if options.disk_template == constants.DT_DISKLESS:
192
      disk_size = disk_growth = []
193
    else:
194
      disk_size = [utils.ParseUnit(v) for v in options.disk_size.split(",")]
195
      disk_growth = [utils.ParseUnit(v)
196
                     for v in options.disk_growth.split(",")]
197
      if len(disk_growth) != len(disk_size):
198
        Log("Wrong disk sizes/growth combination")
199
        sys.exit(1)
193 200
    if ((disk_size and options.disk_template == constants.DT_DISKLESS) or
194 201
        (not disk_size and options.disk_template != constants.DT_DISKLESS)):
195 202
      Log("Wrong disk count/disk template combination")
......
265 272
                                    disks = [ {"size": size}
266 273
                                              for size in self.disk_size],
267 274
                                    disk_template=self.opts.disk_template,
268
                                    nics=[{}],
275
                                    nics=self.opts.nics,
269 276
                                    mode=constants.INSTANCE_CREATE,
270 277
                                    os_type=self.opts.os,
271 278
                                    pnode=pnode,
......
375 382
                                        disks = [ {"size": size}
376 383
                                                  for size in self.disk_size],
377 384
                                        disk_template=self.opts.disk_template,
378
                                        nics=[{}],
385
                                        nics=self.opts.nics,
379 386
                                        mode=constants.INSTANCE_IMPORT,
380 387
                                        src_node=enode,
381 388
                                        src_path=imp_dir,

Also available in: Unified diff