projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon.GenericMain: Don't use list of multithreaded daemons
[ganeti-local]
/
qa
/
ganeti-qa.py
diff --git
a/qa/ganeti-qa.py
b/qa/ganeti-qa.py
index
599eabb
..
5c399e7
100755
(executable)
--- a/
qa/ganeti-qa.py
+++ b/
qa/ganeti-qa.py
@@
-21,10
+21,6
@@
"""Script for doing QA on Ganeti.
"""Script for doing QA on Ganeti.
-You can create the required known_hosts file using ssh-keyscan. It's mandatory
-to use the full name of a node (FQDN). For security reasons, verify the keys
-before using them.
-Example: ssh-keyscan -t rsa node{1,2,3,4}.example.com > known_hosts
"""
import sys
"""
import sys
@@
-38,7
+34,7
@@
import qa_env
import qa_instance
import qa_node
import qa_os
import qa_instance
import qa_node
import qa_os
-import qa_other
+import qa_rapi
import qa_tags
import qa_utils
import qa_tags
import qa_utils
@@
-78,8
+74,12
@@
def SetupCluster():
"""Initializes the cluster.
"""
"""Initializes the cluster.
"""
- RunTest(qa_cluster.TestClusterInit)
- RunTest(qa_node.TestNodeAddAll)
+ if qa_config.TestEnabled('create-cluster'):
+ RunTest(qa_cluster.TestClusterInit)
+ RunTest(qa_node.TestNodeAddAll)
+ else:
+ # consider the nodes are already there
+ qa_node.MarkNodeAddedAll()
if qa_config.TestEnabled('node-info'):
RunTest(qa_node.TestNodeInfo)
if qa_config.TestEnabled('node-info'):
RunTest(qa_node.TestNodeInfo)
@@
-111,6
+111,9
@@
def RunClusterTests():
if qa_config.TestEnabled('cluster-master-failover'):
RunTest(qa_cluster.TestClusterMasterFailover)
if qa_config.TestEnabled('cluster-master-failover'):
RunTest(qa_cluster.TestClusterMasterFailover)
+ if qa_rapi.Enabled():
+ RunTest(qa_rapi.TestVersion)
+ RunTest(qa_rapi.TestEmptyCluster)
def RunOsTests():
"""Runs all tests related to gnt-os.
def RunOsTests():
"""Runs all tests related to gnt-os.
@@
-160,6
+163,11
@@
def RunCommonInstanceTests(instance):
if qa_config.TestEnabled('node-volumes'):
RunTest(qa_node.TestNodeVolumes)
if qa_config.TestEnabled('node-volumes'):
RunTest(qa_node.TestNodeVolumes)
+ if qa_config.TestEnabled("node-storage"):
+ RunTest(qa_node.TestNodeStorage)
+
+ if qa_rapi.Enabled():
+ RunTest(qa_rapi.TestInstance, instance)
def RunExportImportTests(instance, pnode):
"""Tries to export and import the instance.
def RunExportImportTests(instance, pnode):
"""Tries to export and import the instance.
@@
-235,20
+243,16
@@
def main():
"""Main program.
"""
"""Main program.
"""
- parser = optparse.OptionParser(usage="%prog [options] <config-file>"
- " <known-hosts-file>")
- parser.add_option('--dry-run', dest='dry_run',
- action="store_true",
- help="Show what would be done")
+ parser = optparse.OptionParser(usage="%prog [options] <config-file>")
parser.add_option('--yes-do-it', dest='yes_do_it',
action="store_true",
help="Really execute the tests")
(qa_config.options, args) = parser.parse_args()
parser.add_option('--yes-do-it', dest='yes_do_it',
action="store_true",
help="Really execute the tests")
(qa_config.options, args) = parser.parse_args()
- if len(args) == 2:
- (config_file, known_hosts_file) = args
+ if len(args) == 1:
+ (config_file, ) = args
else:
else:
- parser.error("Not enough arguments.")
+ parser.error("Wrong number of arguments.")
if not qa_config.options.yes_do_it:
print ("Executing this script irreversibly destroys any Ganeti\n"
if not qa_config.options.yes_do_it:
print ("Executing this script irreversibly destroys any Ganeti\n"
@@
-257,9
+261,6
@@
def main():
sys.exit(1)
qa_config.Load(config_file)
sys.exit(1)
qa_config.Load(config_file)
- qa_utils.LoadHooks()
-
- RunTest(qa_other.UploadKnownHostsFile, known_hosts_file)
RunEnvTests()
SetupCluster()
RunEnvTests()
SetupCluster()
@@
-282,6
+283,9
@@
def main():
if qa_config.TestEnabled('tags'):
RunTest(qa_tags.TestNodeTags, pnode)
if qa_config.TestEnabled('tags'):
RunTest(qa_tags.TestNodeTags, pnode)
+ if qa_rapi.Enabled():
+ RunTest(qa_rapi.TestNode, pnode)
+
if qa_config.TestEnabled('instance-add-plain-disk'):
instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode)
RunCommonInstanceTests(instance)
if qa_config.TestEnabled('instance-add-plain-disk'):
instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode)
RunCommonInstanceTests(instance)
@@
-311,7
+315,8
@@
def main():
finally:
qa_config.ReleaseNode(pnode)
finally:
qa_config.ReleaseNode(pnode)
- RunTest(qa_node.TestNodeRemoveAll)
+ if qa_config.TestEnabled('create-cluster'):
+ RunTest(qa_node.TestNodeRemoveAll)
if qa_config.TestEnabled('cluster-destroy'):
RunTest(qa_cluster.TestClusterDestroy)
if qa_config.TestEnabled('cluster-destroy'):
RunTest(qa_cluster.TestClusterDestroy)