Simplify QA commands
[ganeti-local] / qa / qa_cluster.py
index 384ca0e..596c573 100644 (file)
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2007 Google Inc.
+# Copyright (C) 2007, 2010 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,17 +32,15 @@ import qa_config
 import qa_utils
 import qa_error
 
-from qa_utils import AssertEqual, AssertNotEqual, StartSSH
+from qa_utils import AssertEqual, AssertCommand
 
 
 def _RemoveFileFromAllNodes(filename):
   """Removes a file from all nodes.
 
   """
-  for node in qa_config.get('nodes'):
-    cmd = ['rm', '-f', filename]
-    AssertEqual(StartSSH(node['primary'],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
+  for node in qa_config.get("nodes"):
+    AssertCommand(["rm", "-f", filename], node=node)
 
 
 def _CheckFileOnAllNodes(filename, content):
@@ -50,17 +48,34 @@ def _CheckFileOnAllNodes(filename, content):
 
   """
   cmd = utils.ShellQuoteArgs(["cat", filename])
-  for node in qa_config.get('nodes'):
-    AssertEqual(qa_utils.GetCommandOutput(node['primary'], cmd),
-                content)
+  for node in qa_config.get("nodes"):
+    AssertEqual(qa_utils.GetCommandOutput(node["primary"], cmd), content)
 
 
-def TestClusterInit():
+def TestClusterInit(rapi_user, rapi_secret):
   """gnt-cluster init"""
   master = qa_config.GetMasterNode()
 
+  # First create the RAPI credentials
+  fh = tempfile.NamedTemporaryFile()
+  try:
+    fh.write("%s %s write\n" % (rapi_user, rapi_secret))
+    fh.flush()
+
+    tmpru = qa_utils.UploadFile(master["primary"], fh.name)
+    try:
+      AssertCommand(["mv", tmpru, constants.RAPI_USERS_FILE])
+    finally:
+      AssertCommand(["rm", "-f", tmpru])
+  finally:
+    fh.close()
+
+  # Initialize cluster
   cmd = ['gnt-cluster', 'init']
 
+  cmd.append("--primary-ip-version=%d" %
+             qa_config.get("primary_ip_version", 4))
+
   if master.get('secondary', None):
     cmd.append('--secondary-ip=%s' % master['secondary'])
 
@@ -75,29 +90,11 @@ def TestClusterInit():
 
   cmd.append(qa_config.get('name'))
 
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd)).wait(), 0)
-
-  # Create RAPI credentials
-  rapi_user = qa_config.get("rapi-user", default=None)
-  rapi_pass = qa_config.get("rapi-pass", default=None)
-
-  if rapi_user and rapi_pass:
-    cmds = []
-
-    cred_string = "%s %s write" % (rapi_user, rapi_pass)
-    cmds.append(("echo %s >> %s" %
-                 (utils.ShellQuote(cred_string),
-                  utils.ShellQuote(constants.RAPI_USERS_FILE))))
-    cmds.append("%s stop-master" % constants.DAEMON_UTIL)
-    cmds.append("%s start-master" % constants.DAEMON_UTIL)
-    AssertEqual(StartSSH(master['primary'], ' && '.join(cmds)).wait(), 0)
+  AssertCommand(cmd)
 
 
 def TestClusterRename():
   """gnt-cluster rename"""
-  master = qa_config.GetMasterNode()
-
   cmd = ['gnt-cluster', 'rename', '-f']
 
   original_name = qa_config.get('name')
@@ -106,58 +103,85 @@ def TestClusterRename():
     print qa_utils.FormatError('"rename" entry is missing')
     return
 
-  cmd_1 = cmd + [rename_target]
-  cmd_2 = cmd + [original_name]
-
   cmd_verify = ['gnt-cluster', 'verify']
 
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd_1)).wait(), 0)
-
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd_verify)).wait(), 0)
-
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd_2)).wait(), 0)
-
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd_verify)).wait(), 0)
+  for data in [
+    cmd + [rename_target],
+    cmd_verify,
+    cmd + [original_name],
+    cmd_verify,
+    ]:
+    AssertCommand(data)
 
 
 def TestClusterVerify():
   """gnt-cluster verify"""
-  master = qa_config.GetMasterNode()
-
-  cmd = ['gnt-cluster', 'verify']
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd)).wait(), 0)
+  AssertCommand(["gnt-cluster", "verify"])
+
+
+def TestJobqueue():
+  """gnt-debug test-jobqueue"""
+  AssertCommand(["gnt-debug", "test-jobqueue"])
+
+
+def TestClusterReservedLvs():
+  """gnt-cluster reserved lvs"""
+  CVERIFY = ["gnt-cluster", "verify"]
+  for fail, cmd in [
+    (False, CVERIFY),
+    (False, ["gnt-cluster", "modify", "--reserved-lvs", ""]),
+    (False, ["lvcreate", "-L1G", "-nqa-test", "xenvg"]),
+    (True,  CVERIFY),
+    (False, ["gnt-cluster", "modify", "--reserved-lvs", "qa-test,other-test"]),
+    (False, CVERIFY),
+    (False, ["gnt-cluster", "modify", "--reserved-lvs", "qa-.*"]),
+    (False, CVERIFY),
+    (False, ["gnt-cluster", "modify", "--reserved-lvs", ""]),
+    (True,  CVERIFY),
+    (False, ["lvremove", "-f", "xenvg/qa-test"]),
+    (False, CVERIFY),
+    ]:
+    AssertCommand(cmd, fail=fail)
+
+
+def TestClusterModifyBe():
+  """gnt-cluster modify -B"""
+  for fail, cmd in [
+    # mem
+    (False, ["gnt-cluster", "modify", "-B", "memory=256"]),
+    (False, ["sh", "-c", "gnt-cluster info|grep '^ *memory: 256$'"]),
+    (True,  ["gnt-cluster", "modify", "-B", "memory=a"]),
+    (False, ["gnt-cluster", "modify", "-B", "memory=128"]),
+    (False, ["sh", "-c", "gnt-cluster info|grep '^ *memory: 128$'"]),
+    # vcpus
+    (False, ["gnt-cluster", "modify", "-B", "vcpus=4"]),
+    (False, ["sh", "-c", "gnt-cluster info|grep '^ *vcpus: 4$'"]),
+    (True,  ["gnt-cluster", "modify", "-B", "vcpus=a"]),
+    (False, ["gnt-cluster", "modify", "-B", "vcpus=1"]),
+    (False, ["sh", "-c", "gnt-cluster info|grep '^ *vcpus: 1$'"]),
+    # auto_balance
+    (False, ["gnt-cluster", "modify", "-B", "auto_balance=False"]),
+    (False, ["sh", "-c", "gnt-cluster info|grep '^ *auto_balance: False$'"]),
+    (True,  ["gnt-cluster", "modify", "-B", "auto_balance=1"]),
+    (False, ["gnt-cluster", "modify", "-B", "auto_balance=True"]),
+    (False, ["sh", "-c", "gnt-cluster info|grep '^ *auto_balance: True$'"]),
+    ]:
+    AssertCommand(cmd, fail=fail)
 
 
 def TestClusterInfo():
   """gnt-cluster info"""
-  master = qa_config.GetMasterNode()
-
-  cmd = ['gnt-cluster', 'info']
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd)).wait(), 0)
+  AssertCommand(["gnt-cluster", "info"])
 
 
 def TestClusterGetmaster():
   """gnt-cluster getmaster"""
-  master = qa_config.GetMasterNode()
-
-  cmd = ['gnt-cluster', 'getmaster']
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd)).wait(), 0)
+  AssertCommand(["gnt-cluster", "getmaster"])
 
 
 def TestClusterVersion():
   """gnt-cluster version"""
-  master = qa_config.GetMasterNode()
-
-  cmd = ['gnt-cluster', 'version']
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd)).wait(), 0)
+  AssertCommand(["gnt-cluster", "version"])
 
 
 def TestClusterRenewCrypto():
@@ -172,57 +196,54 @@ def TestClusterRenewCrypto():
     ["--new-cluster-domain-secret", "--cluster-domain-secret=/dev/null"],
     ]
   for i in conflicting:
-    AssertNotEqual(StartSSH(master["primary"],
-                            utils.ShellQuoteArgs(cmd + i)).wait(), 0)
+    AssertCommand(cmd+i, fail=True)
 
   # Invalid RAPI certificate
   cmd = ["gnt-cluster", "renew-crypto", "--force",
          "--rapi-certificate=/dev/null"]
-  AssertNotEqual(StartSSH(master["primary"],
-                          utils.ShellQuoteArgs(cmd)).wait(), 0)
+  AssertCommand(cmd, fail=True)
 
-  # Custom RAPI certificate
-  fh = tempfile.NamedTemporaryFile()
+  rapi_cert_backup = qa_utils.BackupFile(master["primary"],
+                                         constants.RAPI_CERT_FILE)
+  try:
+    # Custom RAPI certificate
+    fh = tempfile.NamedTemporaryFile()
 
-  # Ensure certificate doesn't cause "gnt-cluster verify" to complain
-  validity = constants.SSL_CERT_EXPIRATION_WARN * 3
+    # Ensure certificate doesn't cause "gnt-cluster verify" to complain
+    validity = constants.SSL_CERT_EXPIRATION_WARN * 3
 
-  utils.GenerateSelfSignedSslCert(fh.name, validity=validity)
+    utils.GenerateSelfSignedSslCert(fh.name, validity=validity)
 
-  tmpcert = qa_utils.UploadFile(master["primary"], fh.name)
-  try:
-    cmd = ["gnt-cluster", "renew-crypto", "--force",
-           "--rapi-certificate=%s" % tmpcert]
-    AssertEqual(StartSSH(master["primary"],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
-  finally:
-    cmd = ["rm", "-f", tmpcert]
-    AssertEqual(StartSSH(master["primary"],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
+    tmpcert = qa_utils.UploadFile(master["primary"], fh.name)
+    try:
+      AssertCommand(["gnt-cluster", "renew-crypto", "--force",
+                     "--rapi-certificate=%s" % tmpcert])
+    finally:
+      AssertCommand(["rm", "-f", tmpcert])
 
-  # Custom cluster domain secret
-  cds_fh = tempfile.NamedTemporaryFile()
-  cds_fh.write(utils.GenerateSecret())
-  cds_fh.write("\n")
-  cds_fh.flush()
+    # Custom cluster domain secret
+    cds_fh = tempfile.NamedTemporaryFile()
+    cds_fh.write(utils.GenerateSecret())
+    cds_fh.write("\n")
+    cds_fh.flush()
 
-  tmpcds = qa_utils.UploadFile(master["primary"], cds_fh.name)
-  try:
-    cmd = ["gnt-cluster", "renew-crypto", "--force",
-           "--cluster-domain-secret=%s" % tmpcds]
-    AssertEqual(StartSSH(master["primary"],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
-  finally:
-    cmd = ["rm", "-f", tmpcds]
-    AssertEqual(StartSSH(master["primary"],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
+    tmpcds = qa_utils.UploadFile(master["primary"], cds_fh.name)
+    try:
+      AssertCommand(["gnt-cluster", "renew-crypto", "--force",
+                     "--cluster-domain-secret=%s" % tmpcds])
+    finally:
+      AssertCommand(["rm", "-f", tmpcds])
 
-  # Normal case
-  cmd = ["gnt-cluster", "renew-crypto", "--force",
-         "--new-cluster-certificate", "--new-confd-hmac-key",
-         "--new-rapi-certificate", "--new-cluster-domain-secret"]
-  AssertEqual(StartSSH(master["primary"],
-                       utils.ShellQuoteArgs(cmd)).wait(), 0)
+    # Normal case
+    AssertCommand(["gnt-cluster", "renew-crypto", "--force",
+                   "--new-cluster-certificate", "--new-confd-hmac-key",
+                   "--new-rapi-certificate", "--new-cluster-domain-secret"])
+
+    # Restore RAPI certificate
+    AssertCommand(["gnt-cluster", "renew-crypto", "--force",
+                   "--rapi-certificate=%s" % rapi_cert_backup])
+  finally:
+    AssertCommand(["rm", "-f", rapi_cert_backup])
 
 
 def TestClusterBurnin():
@@ -234,6 +255,8 @@ def TestClusterBurnin():
   parallel = options.get('burnin-in-parallel', False)
   check_inst = options.get('burnin-check-instances', False)
   do_rename = options.get('burnin-rename', '')
+  do_reboot = options.get('burnin-reboot', True)
+  reboot_types = options.get("reboot-types", constants.REBOOT_TYPES)
 
   # Get as many instances as we need
   instances = []
@@ -252,42 +275,40 @@ def TestClusterBurnin():
     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]
       if parallel:
         cmd.append('--parallel')
+        cmd.append('--early-release')
       if check_inst:
         cmd.append('--http-check')
       if do_rename:
         cmd.append('--rename=%s' % do_rename)
+      if not do_reboot:
+        cmd.append('--no-reboot')
+      else:
+        cmd.append('--reboot-types=%s' % ",".join(reboot_types))
       cmd += [inst['name'] for inst in instances]
-      AssertEqual(StartSSH(master['primary'],
-                           utils.ShellQuoteArgs(cmd)).wait(), 0)
+      AssertCommand(cmd)
     finally:
-      cmd = ['rm', '-f', script]
-      AssertEqual(StartSSH(master['primary'],
-                           utils.ShellQuoteArgs(cmd)).wait(), 0)
+      AssertCommand(["rm", "-f", script])
+
   finally:
     for inst in instances:
       qa_config.ReleaseInstance(inst)
 
 
 def TestClusterMasterFailover():
-  """gnt-cluster masterfailover"""
+  """gnt-cluster master-failover"""
   master = qa_config.GetMasterNode()
-
   failovermaster = qa_config.AcquireNode(exclude=master)
-  try:
-    cmd = ['gnt-cluster', 'masterfailover']
-    AssertEqual(StartSSH(failovermaster['primary'],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
 
-    cmd = ['gnt-cluster', 'masterfailover']
-    AssertEqual(StartSSH(master['primary'],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
+  cmd = ["gnt-cluster", "master-failover"]
+  try:
+    AssertCommand(cmd, node=failovermaster)
+    AssertCommand(cmd, node=master)
   finally:
     qa_config.ReleaseNode(failovermaster)
 
@@ -308,9 +329,7 @@ def TestClusterCopyfile():
   testname = qa_utils.UploadFile(master['primary'], f.name)
   try:
     # Copy file to all nodes
-    cmd = ['gnt-cluster', 'copyfile', testname]
-    AssertEqual(StartSSH(master['primary'],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
+    AssertCommand(["gnt-cluster", "copyfile", testname])
     _CheckFileOnAllNodes(testname, uniqueid)
   finally:
     _RemoveFileFromAllNodes(testname)
@@ -318,8 +337,6 @@ def TestClusterCopyfile():
 
 def TestClusterCommand():
   """gnt-cluster command"""
-  master = qa_config.GetMasterNode()
-
   uniqueid = utils.NewUUID()
   rfile = "/tmp/gnt%s" % utils.NewUUID()
   rcmd = utils.ShellQuoteArgs(['echo', '-n', uniqueid])
@@ -327,7 +344,7 @@ def TestClusterCommand():
                               "%s >%s" % (rcmd, rfile)])
 
   try:
-    AssertEqual(StartSSH(master['primary'], cmd).wait(), 0)
+    AssertCommand(cmd)
     _CheckFileOnAllNodes(rfile, uniqueid)
   finally:
     _RemoveFileFromAllNodes(rfile)
@@ -335,8 +352,4 @@ def TestClusterCommand():
 
 def TestClusterDestroy():
   """gnt-cluster destroy"""
-  master = qa_config.GetMasterNode()
-
-  cmd = ['gnt-cluster', 'destroy', '--yes-do-it']
-  AssertEqual(StartSSH(master['primary'],
-                       utils.ShellQuoteArgs(cmd)).wait(), 0)
+  AssertCommand(["gnt-cluster", "destroy", "--yes-do-it"])