Revision cd577680

b/lib/rapi/client.py
490 490
    if dry_run:
491 491
      query.append(("dry-run", 1))
492 492

  
493
    self._SendRequest(HTTP_DELETE, "/2/tags", query)
493
    return self._SendRequest(HTTP_DELETE, "/2/tags", query)
494 494

  
495 495
  def GetInstances(self, bulk=False):
496 496
    """Gets information about instances on the cluster.
......
512 512
    else:
513 513
      return [i["id"] for i in instances]
514 514

  
515

  
516 515
  def GetInstanceInfo(self, instance):
517 516
    """Gets information about an instance.
518 517

  
......
605 604
    if dry_run:
606 605
      query.append(("dry-run", 1))
607 606

  
608
    self._SendRequest(HTTP_DELETE, "/2/instances/%s/tags" % instance, query)
607
    return self._SendRequest(HTTP_DELETE, "/2/instances/%s/tags" % instance,
608
                             query)
609 609

  
610 610
  def RebootInstance(self, instance, reboot_type=None, ignore_secondaries=None,
611 611
                     dry_run=False):
......
630 630
    if dry_run:
631 631
      query.append(("dry-run", 1))
632 632

  
633
    self._SendRequest(HTTP_POST, "/2/instances/%s/reboot" % instance, query)
633
    return self._SendRequest(HTTP_POST, "/2/instances/%s/reboot" % instance,
634
                             query)
634 635

  
635 636
  def ShutdownInstance(self, instance, dry_run=False):
636 637
    """Shuts down an instance.
......
645 646
    if dry_run:
646 647
      query.append(("dry-run", 1))
647 648

  
648
    self._SendRequest(HTTP_PUT, "/2/instances/%s/shutdown" % instance, query)
649
    return self._SendRequest(HTTP_PUT, "/2/instances/%s/shutdown" % instance,
650
                             query)
649 651

  
650 652
  def StartupInstance(self, instance, dry_run=False):
651 653
    """Starts up an instance.
......
660 662
    if dry_run:
661 663
      query.append(("dry-run", 1))
662 664

  
663
    self._SendRequest(HTTP_PUT, "/2/instances/%s/startup" % instance, query)
665
    return self._SendRequest(HTTP_PUT, "/2/instances/%s/startup" % instance,
666
                             query)
664 667

  
665 668
  def ReinstallInstance(self, instance, os, no_startup=False):
666 669
    """Reinstalls an instance.
......
676 679
    query = [("os", os)]
677 680
    if no_startup:
678 681
      query.append(("nostartup", 1))
679
    self._SendRequest(HTTP_POST, "/2/instances/%s/reinstall" % instance, query)
682
    return self._SendRequest(HTTP_POST, "/2/instances/%s/reinstall" % instance,
683
                             query)
680 684

  
681 685
  def ReplaceInstanceDisks(self, instance, disks, mode="replace_auto",
682 686
                           remote_node=None, iallocator="hail", dry_run=False):
......
758 762
    if dry_run:
759 763
      query.append(("dry-run", 1))
760 764

  
761
    self._SendRequest(HTTP_DELETE, "/2/jobs/%d" % job_id, query)
765
    return self._SendRequest(HTTP_DELETE, "/2/jobs/%d" % job_id, query)
762 766

  
763 767
  def GetNodes(self, bulk=False):
764 768
    """Gets all nodes in the cluster.
b/test/ganeti.rapi.client_unittest.py
186 186
    self.assertQuery("tag", ["awesome"])
187 187

  
188 188
  def testDeleteClusterTags(self):
189
    self.client.DeleteClusterTags(["awesome"], dry_run=True)
189
    self.rapi.AddResponse("5107")
190
    self.assertEqual(5107, self.client.DeleteClusterTags(["awesome"],
191
                                                         dry_run=True))
190 192
    self.assertHandler(rlib2.R_2_tags)
191 193
    self.assertDryRun()
192 194
    self.assertQuery("tag", ["awesome"])
......
237 239
    self.assertQuery("tag", ["awesome"])
238 240

  
239 241
  def testDeleteInstanceTags(self):
240
    self.client.DeleteInstanceTags("foo", ["awesome"], dry_run=True)
242
    self.rapi.AddResponse("25826")
243
    self.assertEqual(25826, self.client.DeleteInstanceTags("foo", ["awesome"],
244
                                                           dry_run=True))
241 245
    self.assertHandler(rlib2.R_2_instances_name_tags)
242 246
    self.assertItems(["foo"])
243 247
    self.assertDryRun()
244 248
    self.assertQuery("tag", ["awesome"])
245 249

  
246 250
  def testRebootInstance(self):
247
    self.client.RebootInstance("i-bar", reboot_type="hard",
248
                               ignore_secondaries=True, dry_run=True)
251
    self.rapi.AddResponse("6146")
252
    job_id = self.client.RebootInstance("i-bar", reboot_type="hard",
253
                                        ignore_secondaries=True, dry_run=True)
254
    self.assertEqual(6146, job_id)
249 255
    self.assertHandler(rlib2.R_2_instances_name_reboot)
250 256
    self.assertItems(["i-bar"])
251 257
    self.assertDryRun()
......
253 259
    self.assertQuery("ignore_secondaries", ["True"])
254 260

  
255 261
  def testShutdownInstance(self):
256
    self.client.ShutdownInstance("foo-instance", dry_run=True)
262
    self.rapi.AddResponse("1487")
263
    self.assertEqual(1487, self.client.ShutdownInstance("foo-instance",
264
                                                        dry_run=True))
257 265
    self.assertHandler(rlib2.R_2_instances_name_shutdown)
258 266
    self.assertItems(["foo-instance"])
259 267
    self.assertDryRun()
260 268

  
261 269
  def testStartupInstance(self):
262
    self.client.StartupInstance("bar-instance", dry_run=True)
270
    self.rapi.AddResponse("27149")
271
    self.assertEqual(27149, self.client.StartupInstance("bar-instance",
272
                                                        dry_run=True))
263 273
    self.assertHandler(rlib2.R_2_instances_name_startup)
264 274
    self.assertItems(["bar-instance"])
265 275
    self.assertDryRun()
266 276

  
267 277
  def testReinstallInstance(self):
268
    self.client.ReinstallInstance("baz-instance", "DOS", no_startup=True)
278
    self.rapi.AddResponse("19119")
279
    self.assertEqual(19119, self.client.ReinstallInstance("baz-instance", "DOS",
280
                                                          no_startup=True))
269 281
    self.assertHandler(rlib2.R_2_instances_name_reinstall)
270 282
    self.assertItems(["baz-instance"])
271 283
    self.assertQuery("os", ["DOS"])
......
313 325
    self.assertItems(["1234"])
314 326

  
315 327
  def testDeleteJob(self):
316
    self.client.DeleteJob(999, dry_run=True)
328
    self.rapi.AddResponse("[true, \"Job 123 will be canceled\"]")
329
    self.assertEqual([True, "Job 123 will be canceled"],
330
                     self.client.DeleteJob(999, dry_run=True))
317 331
    self.assertHandler(rlib2.R_2_jobs_id)
318 332
    self.assertItems(["999"])
319 333
    self.assertDryRun()
......
425 439
    self.assertQuery("tag", ["awesome"])
426 440

  
427 441
  def testDeleteNodeTags(self):
428
    self.client.DeleteNodeTags("node-w", ["awesome"], dry_run=True)
442
    self.rapi.AddResponse("16861")
443
    self.assertEqual(16861, self.client.DeleteNodeTags("node-w", ["awesome"],
444
                                                       dry_run=True))
429 445
    self.assertHandler(rlib2.R_2_nodes_name_tags)
430 446
    self.assertItems(["node-w"])
431 447
    self.assertDryRun()

Also available in: Unified diff