From 713a79e71439733cc5414fde3b430ee7418b5c96 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 31 Mar 2011 14:31:06 +0200
Subject: [PATCH] Fix QA breakage caused by 3fd7f6524
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
qa/qa_rapi.py | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/qa/qa_rapi.py b/qa/qa_rapi.py
index fbcf98057..8232b9352 100644
--- a/qa/qa_rapi.py
+++ b/qa/qa_rapi.py
@@ -526,15 +526,14 @@ def TestRapiInstanceAdd(node, use_client):
try:
memory = utils.ParseUnit(qa_config.get("mem"))
disk_sizes = [utils.ParseUnit(size) for size in qa_config.get("disk")]
+ disks = [{"size": size} for size in disk_sizes]
+ nics = [{}]
- if use_client:
- disks = [{"size": size} for size in disk_sizes]
- nics = [{}]
-
- beparams = {
- constants.BE_MEMORY: memory,
- }
+ beparams = {
+ constants.BE_MEMORY: memory,
+ }
+ if use_client:
job_id = _rapi_client.CreateInstance(constants.INSTANCE_CREATE,
instance["name"],
constants.DT_PLAIN,
@@ -544,12 +543,15 @@ def TestRapiInstanceAdd(node, use_client):
beparams=beparams)
else:
body = {
+ "__version__": 1,
+ "mode": constants.INSTANCE_CREATE,
"name": instance["name"],
- "os": qa_config.get("os"),
+ "os_type": qa_config.get("os"),
"disk_template": constants.DT_PLAIN,
"pnode": node["primary"],
- "memory": memory,
- "disks": disk_sizes,
+ "beparams": beparams,
+ "disks": disks,
+ "nics": nics,
}
(job_id, ) = _DoTests([
--
GitLab