From 19fe91381b8ff9ee74114bbbab919b381c2cafd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Thu, 28 Jun 2012 10:24:06 +0200
Subject: [PATCH] Add forgotten unittest changes for instance_os_add
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The previous patch which fixed disk parameters didn't adapt the
unittests so it lead to failing QA.
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Agata Murawska <agatamurawska@google.com>
---
test/ganeti.rpc_unittest.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/test/ganeti.rpc_unittest.py b/test/ganeti.rpc_unittest.py
index 0fe47a371..16857b53b 100755
--- a/test/ganeti.rpc_unittest.py
+++ b/test/ganeti.rpc_unittest.py
@@ -713,6 +713,9 @@ class _FakeConfigForRpcRunner:
def GetClusterInfo(self):
return self._cluster
+ def GetInstanceDiskParams(self, _):
+ return constants.DISK_DT_DEFAULTS
+
class TestRpcRunner(unittest.TestCase):
def testUploadFile(self):
@@ -795,6 +798,7 @@ class TestRpcRunner(unittest.TestCase):
constants.NIC_MODE: "mymode",
}),
],
+ disk_template=constants.DT_DISKLESS,
disks=[])
inst.UpgradeConfig()
@@ -832,7 +836,7 @@ class TestRpcRunner(unittest.TestCase):
})
# Instance with OS parameters
- result = runner._encoder((rpc_defs.ED_INST_DICT_OSP, (inst, {
+ result = runner._encoder((rpc_defs.ED_INST_DICT_OSP_DP, (inst, {
"role": "webserver",
"other": "field",
})))
--
GitLab