Cluster: add nicparams, and update them on upgrade

[ganeti-local] / qa / qa_cluster.py

diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 46f07bf..4d10c8f 100644 (file)
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -148,8 +148,11 @@ def TestClusterBurnin():
   """Burnin"""
   master = qa_config.GetMasterNode()
 
   """Burnin"""
   master = qa_config.GetMasterNode()
 

-  disk_template = (qa_config.get('options', {}).
-                   get('burnin-disk-template', 'drbd'))
+  options = qa_config.get('options', {})
+  disk_template = options.get('burnin-disk-template', 'drbd')
+  parallel = options.get('burnin-in-parallel', False)
+  check_inst = options.get('burnin-check-instances', False)
+  do_rename = options.get('burnin-rename', '')

 
   # Get as many instances as we need
   instances = []
 
   # Get as many instances as we need
   instances = []

@@ -168,10 +171,17 @@ def TestClusterBurnin():
     try:
       # Run burnin
       cmd = [script,
     try:
       # Run burnin
       cmd = [script,

+             '-p',

              '--os=%s' % qa_config.get('os'),
              '--disk-size=%s' % ",".join(qa_config.get('disk')),
              '--disk-growth=%s' % ",".join(qa_config.get('disk-growth')),
              '--disk-template=%s' % disk_template]
              '--os=%s' % qa_config.get('os'),
              '--disk-size=%s' % ",".join(qa_config.get('disk')),
              '--disk-growth=%s' % ",".join(qa_config.get('disk-growth')),
              '--disk-template=%s' % disk_template]

+      if parallel:
+        cmd.append('--parallel')
+      if check_inst:
+        cmd.append('--http-check')
+      if do_rename:
+        cmd.append('--rename=%s' % do_rename)

       cmd += [inst['name'] for inst in instances]
       AssertEqual(StartSSH(master['primary'],
                            utils.ShellQuoteArgs(cmd)).wait(), 0)
       cmd += [inst['name'] for inst in instances]
       AssertEqual(StartSSH(master['primary'],
                            utils.ShellQuoteArgs(cmd)).wait(), 0)