Modify gnt-node add to call external script

[ganeti-local] / qa / qa_os.py

diff --git a/qa/qa_os.py b/qa/qa_os.py
index 5383d07..28c2c73 100644 (file)
--- a/qa/qa_os.py
+++ b/qa/qa_os.py
@@ -1,3 +1,6 @@
+#
+#
+
 # Copyright (C) 2007 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -54,6 +57,24 @@ def TestOsDiagnose():
                        utils.ShellQuoteArgs(cmd)).wait(), 0)
 
 
+def _TestOsModify(hvp_dict, expected_result=0):
+  """gnt-os modify"""
+  master = qa_config.GetMasterNode()
+
+  cmd = ['gnt-os', 'modify']
+
+  for hv_name, hv_params in hvp_dict.items():
+    cmd.append('-H')
+    options = []
+    for key, value in hv_params.items():
+      options.append("%s=%s" % (key, value))
+    cmd.append('%s:%s' % (hv_name, ','.join(options)))
+
+  cmd.append(_TEMP_OS_NAME)
+  AssertEqual(StartSSH(master['primary'],
+                       utils.ShellQuoteArgs(cmd)).wait(), expected_result)
+
+
 def _SetupTempOs(node, dir, valid):
   """Creates a temporary OS definition on the given node.
 
@@ -69,13 +90,14 @@ def _SetupTempOs(node, dir, valid):
   if valid:
     parts.append(sq(["ln", "-fs", "/bin/true", "create"]))
 
-  parts.append(sq(["echo", str(constants.OS_API_VERSION)]) +
+  parts.append(sq(["echo", str(constants.OS_API_V10)]) +
                " >ganeti_api_version")
 
   cmd = ' && '.join(parts)
 
-  qa_utils.PrintInfo("Setting up %s with %s OS definition" %
-                     (node["primary"], ["an invalid", "a valid"][int(valid)]))
+  print qa_utils.FormatInfo("Setting up %s with %s OS definition" %
+                            (node["primary"],
+                             ["an invalid", "a valid"][int(valid)]))
 
   AssertEqual(StartSSH(node['primary'], cmd).wait(), 0)
 
@@ -135,3 +157,27 @@ def TestOsInvalid():
 def TestOsPartiallyValid():
   """Testing partially valid OS definition"""
   return _TestOs(2)
+
+
+def TestOsModifyValid():
+  """Testing a valid os modify invocation"""
+  hv_dict = {
+    constants.HT_XEN_PVM: {
+      constants.HV_ROOT_PATH: "/dev/sda5",
+      },
+    constants.HT_XEN_HVM: {
+      constants.HV_ACPI: False,
+      constants.HV_PAE: True,
+      },
+    }
+
+  return _TestOsModify(hv_dict)
+
+
+def TestOsModifyInvalid():
+  """Testing an invalid os modify invocation"""
+  hv_dict = {
+    "blahblahblubb": {"bar": ""},
+    }
+
+  return _TestOsModify(hv_dict, 1)