Merge branch 'stable-2.5' into devel-2.5

[ganeti-local] / test / ganeti.rapi.client_unittest.py

diff --git a/test/ganeti.rapi.client_unittest.py b/test/ganeti.rapi.client_unittest.py
index dc972d2..1067656 100755 (executable)
--- a/test/ganeti.rapi.client_unittest.py
+++ b/test/ganeti.rapi.client_unittest.py
@@ -165,6 +165,11 @@ class TestConstants(unittest.TestCase):
     self.assertEqual(client.JOB_STATUS_FINALIZED, constants.JOBS_FINALIZED)
     self.assertEqual(client.JOB_STATUS_ALL, constants.JOB_STATUS_ALL)
 
+    # Node evacuation
+    self.assertEqual(client.NODE_EVAC_PRI, constants.IALLOCATOR_NEVAC_PRI)
+    self.assertEqual(client.NODE_EVAC_SEC, constants.IALLOCATOR_NEVAC_SEC)
+    self.assertEqual(client.NODE_EVAC_ALL, constants.IALLOCATOR_NEVAC_ALL)
+
     # Legacy name
     self.assertEqual(client.JOB_STATUS_WAITLOCK, constants.JOB_STATUS_WAITING)
 
@@ -669,24 +674,21 @@ class GanetiRapiClientTests(testutils.GanetiTestCase):
   def testReplaceInstanceDisks(self):
     self.rapi.AddResponse("999")
     job_id = self.client.ReplaceInstanceDisks("instance-name",
-        disks=[0, 1], dry_run=True, iallocator="hail")
+        disks=[0, 1], iallocator="hail")
     self.assertEqual(999, job_id)
     self.assertHandler(rlib2.R_2_instances_name_replace_disks)
     self.assertItems(["instance-name"])
     self.assertQuery("disks", ["0,1"])
     self.assertQuery("mode", ["replace_auto"])
     self.assertQuery("iallocator", ["hail"])
-    self.assertDryRun()
 
     self.rapi.AddResponse("1000")
     job_id = self.client.ReplaceInstanceDisks("instance-bar",
-        disks=[1], mode="replace_on_secondary", remote_node="foo-node",
-        dry_run=True)
+        disks=[1], mode="replace_on_secondary", remote_node="foo-node")
     self.assertEqual(1000, job_id)
     self.assertItems(["instance-bar"])
     self.assertQuery("disks", ["1"])
     self.assertQuery("remote_node", ["foo-node"])
-    self.assertDryRun()
 
     self.rapi.AddResponse("5175")
     self.assertEqual(5175, self.client.ReplaceInstanceDisks("instance-moo"))
@@ -863,11 +865,16 @@ class GanetiRapiClientTests(testutils.GanetiTestCase):
 
     self.rapi.AddResponse(serializer.DumpJson([rlib2._NODE_EVAC_RES1]))
     self.rapi.AddResponse("8888")
-    job_id = self.client.EvacuateNode("node-3", iallocator="hail", dry_run=True)
+    job_id = self.client.EvacuateNode("node-3", iallocator="hail", dry_run=True,
+                                      mode=constants.IALLOCATOR_NEVAC_ALL,
+                                      early_release=True)
     self.assertEqual(8888, job_id)
     self.assertItems(["node-3"])
-    self.assertEqual(serializer.LoadJson(self.rapi.GetLastRequestData()),
-                     { "iallocator": "hail", })
+    self.assertEqual(serializer.LoadJson(self.rapi.GetLastRequestData()), {
+      "iallocator": "hail",
+      "mode": "all",
+      "early_release": True,
+      })
     self.assertDryRun()
 
     self.assertRaises(client.GanetiApiError,
@@ -881,34 +888,26 @@ class GanetiRapiClientTests(testutils.GanetiTestCase):
                       "node-4", accept_old=False)
     self.assertEqual(self.rapi.CountPending(), 0)
 
-    self.rapi.AddResponse(serializer.DumpJson([]))
-    self.assertRaises(client.GanetiApiError, self.client.EvacuateNode,
-                      "node-4", accept_old=True)
-    self.assertEqual(self.rapi.CountPending(), 0)
-
-    self.rapi.AddResponse(serializer.DumpJson([]))
-    self.assertRaises(client.GanetiApiError, self.client.EvacuateNode,
-                      "node-4", accept_old=True, primary=True)
-    self.assertEqual(self.rapi.CountPending(), 0)
+    for mode in [client.NODE_EVAC_PRI, client.NODE_EVAC_ALL]:
+      self.rapi.AddResponse(serializer.DumpJson([]))
+      self.assertRaises(client.GanetiApiError, self.client.EvacuateNode,
+                        "node-4", accept_old=True, mode=mode)
+      self.assertEqual(self.rapi.CountPending(), 0)
 
     self.rapi.AddResponse(serializer.DumpJson([]))
-    self.assertRaises(client.GanetiApiError, self.client.EvacuateNode,
-                      "node-4", accept_old=True, secondary=False)
+    self.rapi.AddResponse(serializer.DumpJson("21533"))
+    result = self.client.EvacuateNode("node-3", iallocator="hail",
+                                      dry_run=True, accept_old=True,
+                                      mode=client.NODE_EVAC_SEC,
+                                      early_release=True)
+    self.assertEqual(result, "21533")
+    self.assertItems(["node-3"])
+    self.assertQuery("iallocator", ["hail"])
+    self.assertQuery("early_release", ["1"])
+    self.assertFalse(self.rapi.GetLastRequestData())
+    self.assertDryRun()
     self.assertEqual(self.rapi.CountPending(), 0)
 
-    for sec in [True, None]:
-      self.rapi.AddResponse(serializer.DumpJson([]))
-      self.rapi.AddResponse(serializer.DumpJson([["res", "foo"]]))
-      result = self.client.EvacuateNode("node-3", iallocator="hail",
-                                        dry_run=True, accept_old=True,
-                                        primary=False, secondary=sec)
-      self.assertEqual(result, [["res", "foo"]])
-      self.assertItems(["node-3"])
-      self.assertQuery("iallocator", ["hail"])
-      self.assertFalse(self.rapi.GetLastRequestData())
-      self.assertDryRun()
-      self.assertEqual(self.rapi.CountPending(), 0)
-
   def testMigrateNode(self):
     self.rapi.AddResponse(serializer.DumpJson([]))
     self.rapi.AddResponse("1111")