From 113b8d8960509f6a8d0257aa35548e44bb2cd88d Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 6 Nov 2007 17:04:58 +0000
Subject: [PATCH] Adapt QA tests for removed --secondary-node option.
---
qa/qa_instance.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 5d2601739..e86cc811f 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -43,17 +43,16 @@ def _GetGenericAddParameters():
'--memory=%s' % qa_config.get('mem')]
-def _DiskTest(node, args):
+def _DiskTest(node, disk_template):
master = qa_config.GetMasterNode()
instance = qa_config.AcquireInstance()
try:
cmd = (['gnt-instance', 'add',
'--os-type=%s' % qa_config.get('os'),
- '--node=%s' % node['primary']] +
+ '--disk-template=%s' % disk_template,
+ '--node=%s' % node] +
_GetGenericAddParameters())
- if args:
- cmd += args
cmd.append(instance['name'])
AssertEqual(StartSSH(master['primary'],
@@ -66,19 +65,18 @@ def _DiskTest(node, args):
def TestInstanceAddWithPlainDisk(node):
"""gnt-instance add -t plain"""
- return _DiskTest(node, ['--disk-template=plain'])
+ return _DiskTest(node['primary'], 'plain')
def TestInstanceAddWithLocalMirrorDisk(node):
"""gnt-instance add -t local_raid1"""
- return _DiskTest(node, ['--disk-template=local_raid1'])
+ return _DiskTest(node['primary'], 'local_raid1')
def TestInstanceAddWithRemoteRaidDisk(node, node2):
"""gnt-instance add -t remote_raid1"""
- return _DiskTest(node,
- ['--disk-template=remote_raid1',
- '--secondary-node=%s' % node2['primary']])
+ return _DiskTest("%s:%s" % (node['primary'], node2['primary']),
+ 'remote_raid1')
def TestInstanceRemove(instance):
--
GitLab