Revision a9e1819b test/py/ganeti.rapi.rlib2_unittest.py

b/test/py/ganeti.rapi.rlib2_unittest.py
468 468
    self.assertTrue(isinstance(op, opcodes.OpInstanceActivateDisks))
469 469
    self.assertEqual(op.instance_name, "xyz")
470 470
    self.assertTrue(op.ignore_size)
471
    self.assertFalse(hasattr(op, "dry_run"))
471
    self.assertFalse(op.dry_run)
472 472

  
473 473
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
474 474

  
......
487 487
    self.assertEqual(job_id, exp_job_id)
488 488
    self.assertTrue(isinstance(op, opcodes.OpInstanceDeactivateDisks))
489 489
    self.assertEqual(op.instance_name, "inst22357")
490
    self.assertFalse(hasattr(op, "dry_run"))
491
    self.assertFalse(hasattr(op, "force"))
490
    self.assertFalse(op.dry_run)
491
    self.assertFalse(op.force)
492 492

  
493 493
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
494 494

  
......
507 507
    self.assertEqual(job_id, exp_job_id)
508 508
    self.assertTrue(isinstance(op, opcodes.OpInstanceRecreateDisks))
509 509
    self.assertEqual(op.instance_name, "inst22357")
510
    self.assertFalse(hasattr(op, "dry_run"))
510
    self.assertFalse(op.dry_run)
511 511
    self.assertFalse(hasattr(op, "force"))
512 512

  
513 513
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
527 527
    self.assertEqual(job_id, exp_job_id)
528 528
    self.assertTrue(isinstance(op, opcodes.OpInstanceFailover))
529 529
    self.assertEqual(op.instance_name, "inst12794")
530
    self.assertFalse(hasattr(op, "dry_run"))
530
    self.assertFalse(op.dry_run)
531 531
    self.assertFalse(hasattr(op, "force"))
532 532

  
533 533
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
552 552
    self.assertEqual(op.instance_name, "inst10742")
553 553
    self.assertEqual(op.disk, 3)
554 554
    self.assertEqual(op.amount, 1024)
555
    self.assertFalse(hasattr(op, "dry_run"))
555
    self.assertFalse(op.dry_run)
556 556
    self.assertFalse(hasattr(op, "force"))
557 557

  
558 558
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
576 576
    self.assertTrue(isinstance(op, opcodes.OpBackupPrepare))
577 577
    self.assertEqual(op.instance_name, "inst17925")
578 578
    self.assertEqual(op.mode, constants.EXPORT_MODE_REMOTE)
579
    self.assertFalse(hasattr(op, "dry_run"))
579
    self.assertFalse(op.dry_run)
580 580
    self.assertFalse(hasattr(op, "force"))
581 581

  
582 582
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
622 622
    self.assertEqual(op.nodes, ["node21075"])
623 623
    self.assertEqual(op.storage_type, constants.ST_LVM_PV)
624 624
    self.assertEqual(op.output_fields, ["name", "other"])
625
    self.assertFalse(hasattr(op, "dry_run"))
625
    self.assertFalse(op.dry_run)
626 626
    self.assertFalse(hasattr(op, "force"))
627 627

  
628 628
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
687 687
        self.assertEqual(op.changes, {
688 688
          constants.SF_ALLOCATABLE: (allocatable == "1"),
689 689
          })
690
      self.assertFalse(hasattr(op, "dry_run"))
690
      self.assertFalse(op.dry_run)
691 691
      self.assertFalse(hasattr(op, "force"))
692 692

  
693 693
      self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
742 742
    self.assertEqual(op.node_name, "node19265")
743 743
    self.assertEqual(op.storage_type, constants.ST_LVM_PV)
744 744
    self.assertEqual(op.name, "pv16611")
745
    self.assertFalse(hasattr(op, "dry_run"))
745
    self.assertFalse(op.dry_run)
746 746
    self.assertFalse(hasattr(op, "force"))
747 747

  
748 748
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
921 921
                    self.assertFalse("foobar" in opnic)
922 922

  
923 923
                  if beparams is None:
924
                    self.assertFalse(hasattr(op, "beparams"))
924
                    self.assertTrue(op.beparams in [None, {}])
925 925
                  else:
926 926
                    self.assertEqualValues(op.beparams, beparams)
927 927

  
928 928
                  if hvparams is None:
929
                    self.assertFalse(hasattr(op, "hvparams"))
929
                    self.assertTrue(op.hvparams in [None, {}])
930 930
                  else:
931 931
                    self.assertEqualValues(op.hvparams, hvparams)
932 932

  
......
1102 1102
    self.assertEqual(op.remove_instance, True)
1103 1103
    self.assertEqual(op.x509_key_name, ["name", "hash"])
1104 1104
    self.assertEqual(op.destination_x509_ca, "---cert---")
1105
    self.assertFalse(hasattr(op, "dry_run"))
1105
    self.assertFalse(op.dry_run)
1106 1106
    self.assertFalse(hasattr(op, "force"))
1107 1107

  
1108 1108
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
1128 1128
    self.assertTrue(isinstance(op, opcodes.OpBackupExport))
1129 1129
    self.assertEqual(op.instance_name, name)
1130 1130
    self.assertEqual(op.target_node, "node2")
1131
    self.assertFalse(hasattr(op, "mode"))
1132
    self.assertFalse(hasattr(op, "remove_instance"))
1131
    self.assertEqual(op.mode, "local")
1132
    self.assertFalse(op.remove_instance)
1133 1133
    self.assertFalse(hasattr(op, "destination"))
1134
    self.assertFalse(hasattr(op, "dry_run"))
1134
    self.assertFalse(op.dry_run)
1135 1135
    self.assertFalse(hasattr(op, "force"))
1136 1136

  
1137 1137
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
1172 1172
        self.assertEqual(op.instance_name, name)
1173 1173
        self.assertEqual(op.mode, mode)
1174 1174
        self.assertEqual(op.cleanup, cleanup)
1175
        self.assertFalse(hasattr(op, "dry_run"))
1175
        self.assertFalse(op.dry_run)
1176 1176
        self.assertFalse(hasattr(op, "force"))
1177 1177

  
1178 1178
        self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
1193 1193
    self.assertEqual(job_id, exp_job_id)
1194 1194
    self.assertTrue(isinstance(op, opcodes.OpInstanceMigrate))
1195 1195
    self.assertEqual(op.instance_name, name)
1196
    self.assertFalse(hasattr(op, "mode"))
1197
    self.assertFalse(hasattr(op, "cleanup"))
1198
    self.assertFalse(hasattr(op, "dry_run"))
1196
    self.assertTrue(op.mode is None)
1197
    self.assertFalse(op.cleanup)
1198
    self.assertFalse(op.dry_run)
1199 1199
    self.assertFalse(hasattr(op, "force"))
1200 1200

  
1201 1201
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
1230 1230
          self.assertEqual(op.new_name, new_name)
1231 1231
          self.assertEqual(op.ip_check, ip_check)
1232 1232
          self.assertEqual(op.name_check, name_check)
1233
          self.assertFalse(hasattr(op, "dry_run"))
1233
          self.assertFalse(op.dry_run)
1234 1234
          self.assertFalse(hasattr(op, "force"))
1235 1235

  
1236 1236
          self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
1257 1257
      self.assertTrue(isinstance(op, opcodes.OpInstanceRename))
1258 1258
      self.assertEqual(op.instance_name, name)
1259 1259
      self.assertEqual(op.new_name, new_name)
1260
      self.assertFalse(hasattr(op, "ip_check"))
1261
      self.assertFalse(hasattr(op, "name_check"))
1262
      self.assertFalse(hasattr(op, "dry_run"))
1260
      self.assertTrue(op.ip_check)
1261
      self.assertTrue(op.name_check)
1262
      self.assertFalse(op.dry_run)
1263 1263
      self.assertFalse(hasattr(op, "force"))
1264 1264

  
1265 1265
      self.assertRaises(IndexError, cl.GetNextSubmittedJob)
......
1311 1311
                  self.assertEqual(op.nics, nics)
1312 1312
                  self.assertEqual(op.disks, disks)
1313 1313
                  self.assertEqual(op.disk_template, disk_template)
1314
                  self.assertFalse(hasattr(op, "remote_node"))
1315
                  self.assertFalse(hasattr(op, "os_name"))
1316
                  self.assertFalse(hasattr(op, "force_variant"))
1317
                  self.assertFalse(hasattr(op, "dry_run"))
1314
                  self.assertTrue(op.remote_node is None)
1315
                  self.assertTrue(op.os_name is None)
1316
                  self.assertFalse(op.force_variant)
1317
                  self.assertFalse(op.dry_run)
1318 1318

  
1319 1319
                  self.assertRaises(IndexError, cl.GetNextSubmittedJob)
1320 1320

  
......
1337 1337

  
1338 1338
    for i in ["hvparams", "beparams", "osparams", "force", "nics", "disks",
1339 1339
              "disk_template", "remote_node", "os_name", "force_variant"]:
1340
      self.assertFalse(hasattr(op, i))
1340
      self.assertTrue(hasattr(op, i))
1341 1341

  
1342 1342

  
1343 1343
class TestParseInstanceReinstallRequest(testutils.GanetiTestCase):
......
1497 1497
    self.assertTrue(isinstance(op, opcodes.OpInstanceReplaceDisks))
1498 1498
    self.assertEqual(op.instance_name, name)
1499 1499
    self.assertEqual(op.mode, constants.REPLACE_DISK_AUTO)
1500
    self.assertFalse(hasattr(op, "iallocator"))
1501
    self.assertFalse(hasattr(op, "disks"))
1500
    self.assertTrue(op.iallocator is None)
1501
    self.assertEqual(op.disks, [])
1502 1502
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
1503 1503

  
1504 1504
  def testNoDisks(self):
......
1552 1552
      self.assertTrue(isinstance(op, opcodes.OpGroupSetParams))
1553 1553
      self.assertEqual(op.group_name, name)
1554 1554
      self.assertEqual(op.alloc_policy, policy)
1555
      self.assertFalse(hasattr(op, "dry_run"))
1555
      self.assertFalse(op.dry_run)
1556 1556
      self.assertRaises(IndexError, cl.GetNextSubmittedJob)
1557 1557

  
1558 1558
  def testUnknownPolicy(self):
......
1584 1584

  
1585 1585
    self.assertTrue(isinstance(op, opcodes.OpGroupSetParams))
1586 1586
    self.assertEqual(op.group_name, name)
1587
    self.assertFalse(hasattr(op, "alloc_policy"))
1588
    self.assertFalse(hasattr(op, "dry_run"))
1587
    self.assertTrue(op.alloc_policy is None)
1588
    self.assertFalse(op.dry_run)
1589 1589
    self.assertRaises(IndexError, cl.GetNextSubmittedJob)
1590 1590

  
1591 1591

  
......
1646 1646

  
1647 1647
    self.assertTrue(isinstance(op, opcodes.OpGroupAdd))
1648 1648
    self.assertEqual(op.group_name, name)
1649
    self.assertFalse(hasattr(op, "alloc_policy"))
1649
    self.assertTrue(op.alloc_policy is None)
1650 1650
    self.assertFalse(op.dry_run)
1651 1651

  
1652 1652
  def testLegacyName(self):
......
1670 1670

  
1671 1671
    self.assertTrue(isinstance(op, opcodes.OpGroupAdd))
1672 1672
    self.assertEqual(op.group_name, name)
1673
    self.assertFalse(hasattr(op, "alloc_policy"))
1673
    self.assertTrue(op.alloc_policy is None)
1674 1674
    self.assertTrue(op.dry_run)
1675 1675

  
1676 1676

  
......
1694 1694
        self.assertTrue(isinstance(op, opcodes.OpNodeSetParams))
1695 1695
        self.assertEqual(op.node_name, "node-z")
1696 1696
        self.assertFalse(op.force)
1697
        self.assertFalse(hasattr(op, "dry_run"))
1697
        self.assertFalse(op.dry_run)
1698 1698

  
1699 1699
        if role == rlib2._NR_REGULAR:
1700 1700
          self.assertFalse(op.drained)

Also available in: Unified diff