Revision 8351df2f test/py/ganeti.hypervisor.hv_xen_unittest.py
b/test/py/ganeti.hypervisor.hv_xen_unittest.py | ||
---|---|---|
524 | 524 |
TARGET = NotImplemented |
525 | 525 |
CMD = NotImplemented |
526 | 526 |
HVNAME = NotImplemented |
527 |
VALID_HVPARAMS = {constants.HV_XEN_CMD: constants.XEN_CMD_XL} |
|
527 | 528 |
|
528 | 529 |
def setUp(self): |
529 | 530 |
super(_TestXenHypervisor, self).setUp() |
... | ... | |
791 | 792 |
for live in [False, True]: |
792 | 793 |
try: |
793 | 794 |
hv._MigrateInstance(NotImplemented, name, target, port, live, |
794 |
_ping_fn=NotImplemented) |
|
795 |
self.VALID_HVPARAMS, _ping_fn=NotImplemented)
|
|
795 | 796 |
except errors.HypervisorError, err: |
796 | 797 |
self.assertEqual(str(err), "Instance not running, cannot migrate") |
797 | 798 |
else: |
... | ... | |
811 | 812 |
port = 28349 |
812 | 813 |
|
813 | 814 |
hv = self._GetHv(run_cmd=self._MigrateInstTargetUnreachCmd) |
815 |
hvparams = {constants.HV_XEN_CMD: self.CMD} |
|
814 | 816 |
|
815 | 817 |
for live in [False, True]: |
816 | 818 |
if self.CMD == constants.XEN_CMD_XL: |
... | ... | |
819 | 821 |
else: |
820 | 822 |
try: |
821 | 823 |
hv._MigrateInstance(NotImplemented, name, target, port, live, |
824 |
hvparams, |
|
822 | 825 |
_ping_fn=compat.partial(self._FakeTcpPing, |
823 | 826 |
(target, port), False)) |
824 | 827 |
except errors.HypervisorError, err: |
... | ... | |
865 | 868 |
target = constants.IP4_ADDRESS_LOCALHOST |
866 | 869 |
port = 22364 |
867 | 870 |
|
871 |
hvparams = {constants.HV_XEN_CMD: self.CMD} |
|
872 |
|
|
868 | 873 |
for live in [False, True]: |
869 | 874 |
for fail in [False, True]: |
870 | 875 |
ping_fn = \ |
... | ... | |
881 | 886 |
if fail: |
882 | 887 |
try: |
883 | 888 |
hv._MigrateInstance(clustername, instname, target, port, live, |
884 |
_ping_fn=ping_fn) |
|
889 |
hvparams, _ping_fn=ping_fn)
|
|
885 | 890 |
except errors.HypervisorError, err: |
886 | 891 |
self.assertTrue(str(err).startswith("Failed to migrate instance")) |
887 | 892 |
else: |
888 | 893 |
self.fail("Exception was not raised") |
889 | 894 |
else: |
890 | 895 |
hv._MigrateInstance(clustername, instname, target, port, live, |
891 |
_ping_fn=ping_fn) |
|
896 |
hvparams, _ping_fn=ping_fn)
|
|
892 | 897 |
|
893 | 898 |
if self.CMD == constants.XEN_CMD_XM: |
894 | 899 |
expected_pings = 1 |
Also available in: Unified diff