Re: [PATCH master 11/11] hv_xen: Test various forms of getting instance/node info

[Helga Velroyen]

LGTM, thanks


On Thu, Jan 24, 2013 at 5:25 PM, Michael Hanselmann <han...@google.com>wrote:

> Test functions for retrieving instance and node information.
> ---
>  test/py/ganeti.hypervisor.hv_xen_unittest.py | 62
> ++++++++++++++++++++++++++++
>  1 file changed, 62 insertions(+)
>
> diff --git a/test/py/ganeti.hypervisor.hv_xen_unittest.py b/test/py/
> ganeti.hypervisor.hv_xen_unittest.py
> index f5cd3fb..cc45a94 100755
> --- a/test/py/ganeti.hypervisor.hv_xen_unittest.py
> +++ b/test/py/ganeti.hypervisor.hv_xen_unittest.py
> @@ -393,6 +393,68 @@ class _TestXenHypervisor(object):
>      self.assertFalse(os.path.exists(autocfgfile))
>      self.assertEqual(utils.ReadFile(cfgfile), "content")
>
> +  def _XenList(self, cmd):
> +    self.assertEqual(cmd, [self.CMD, "list"])
> +
> +    # TODO: Use actual data from "xl" command
> +    output =
> testutils.ReadTestData("xen-xm-list-4.0.1-four-instances.txt")
> +
> +    return self._SuccessCommand(output, cmd)
> +
> +  def testGetInstanceInfo(self):
> +    hv = self._GetHv(run_cmd=self._XenList)
> +
> +    (name, instid, memory, vcpus, state, runtime) = \
> +      hv.GetInstanceInfo("server01.example.com")
> +
> +    self.assertEqual(name, "server01.example.com")
> +    self.assertEqual(instid, 1)
> +    self.assertEqual(memory, 1024)
> +    self.assertEqual(vcpus, 1)
> +    self.assertEqual(state, "-b----")
> +    self.assertAlmostEqual(runtime, 167643.2)
> +
> +  def testGetInstanceInfoDom0(self):
> +    hv = self._GetHv(run_cmd=self._XenList)
> +
> +    # TODO: Not sure if this is actually used anywhere (can't find it),
> but the
> +    # code supports querying for Dom0
> +    (name, instid, memory, vcpus, state, runtime) = \
> +      hv.GetInstanceInfo(hv_xen._DOM0_NAME)
> +
> +    self.assertEqual(name, "Domain-0")
> +    self.assertEqual(instid, 0)
> +    self.assertEqual(memory, 1023)
> +    self.assertEqual(vcpus, 1)
> +    self.assertEqual(state, "r-----")
> +    self.assertAlmostEqual(runtime, 154706.1)
> +
> +  def testGetInstanceInfoUnknown(self):
> +    hv = self._GetHv(run_cmd=self._XenList)
> +
> +    result = hv.GetInstanceInfo("unknown.example.com")
> +    self.assertTrue(result is None)
> +
> +  def testGetAllInstancesInfo(self):
> +    hv = self._GetHv(run_cmd=self._XenList)
> +
> +    result = hv.GetAllInstancesInfo()
> +
> +    self.assertEqual(map(compat.fst, result), [
> +      "server01.example.com",
> +      "web3106215069.example.com",
> +      "testinstance.example.com",
> +      ])
> +
> +  def testListInstances(self):
> +    hv = self._GetHv(run_cmd=self._XenList)
> +
> +    self.assertEqual(hv.ListInstances(), [
> +      "server01.example.com",
> +      "web3106215069.example.com",
> +      "testinstance.example.com",
> +      ])
> +
>    def testVerify(self):
>      output = testutils.ReadTestData("xen-xm-info-4.0.1.txt")
>      hv = self._GetHv(run_cmd=compat.partial(self._SuccessCommand,
> --
> 1.8.1
>
>

--