Re: [PATCH stable-2.6] Add forgotten unittest changes for instance_os_add

[Agata Murawska]

LGTM

On Thu, Jun 28, 2012 at 10:32 AM, René Nussbaumer <r...@google.com> wrote:
> The previous patch which fixed disk parameters didn't adapt the
> unittests so it lead to failing QA.
> ---
>  test/ganeti.rpc_unittest.py |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/test/ganeti.rpc_unittest.py b/test/ganeti.rpc_unittest.py
> index 0fe47a3..16857b5 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",
>       })))
> --
> 1.7.7.3
>