Revision e0e44476 qa/qa_cluster.py

b/qa/qa_cluster.py
499 499

  
500 500
  for fail, cmd in [
501 501
    (False, ["gnt-cluster", "modify",
502
            "--enabled-disk-templates=%s" % file_disk_template,
503
            "--ipolicy-disk-templates=%s" % file_disk_template]),
502
             "--enabled-disk-templates=%s" % file_disk_template,
503
             "--ipolicy-disk-templates=%s" % file_disk_template]),
504 504
    (False, ["gnt-cluster", "modify",
505
            "--%s=%s" % (option_name, file_storage_dir)]),
505
             "--%s=%s" % (option_name, file_storage_dir)]),
506 506
    (False, ["gnt-cluster", "modify",
507
            "--%s=%s" % (option_name, invalid_file_storage_dir)]),
507
             "--%s=%s" % (option_name, invalid_file_storage_dir)]),
508 508
    # file storage dir is set to an inacceptable path, thus verify
509 509
    # should fail
510 510
    (True, ["gnt-cluster", "verify"]),
......
513 513
    (True, ["gnt-cluster", "modify",
514 514
            "--%s=" % option_name]),
515 515
    (False, ["gnt-cluster", "modify",
516
            "--%s=%s" % (option_name, file_storage_dir)]),
516
             "--%s=%s" % (option_name, file_storage_dir)]),
517 517
    (False, ["gnt-cluster", "modify",
518
            "--enabled-disk-templates=%s" % other_disk_template,
519
            "--ipolicy-disk-templates=%s" % other_disk_template]),
518
             "--enabled-disk-templates=%s" % other_disk_template,
519
             "--ipolicy-disk-templates=%s" % other_disk_template]),
520 520
    (False, ["gnt-cluster", "modify",
521
            "--%s=%s" % (option_name, invalid_file_storage_dir)]),
521
             "--%s=%s" % (option_name, invalid_file_storage_dir)]),
522 522
    # file storage is set to an inacceptable path, but file storage
523 523
    # is disabled, thus verify should not fail
524 524
    (False, ["gnt-cluster", "verify"]),
525 525
    # unsetting the file storage dir while file storage is not enabled
526 526
    # should be fine
527 527
    (False, ["gnt-cluster", "modify",
528
            "--%s=" % option_name]),
528
             "--%s=" % option_name]),
529 529
    # resetting everything to sane values
530 530
    (False, ["gnt-cluster", "modify",
531
            "--%s=%s" % (option_name, file_storage_dir),
532
            "--enabled-disk-templates=%s" % ",".join(enabled_disk_templates),
533
            "--ipolicy-disk-templates=%s" % ",".join(enabled_disk_templates)])
531
             "--%s=%s" % (option_name, file_storage_dir),
532
             "--enabled-disk-templates=%s" % ",".join(enabled_disk_templates),
533
             "--ipolicy-disk-templates=%s" % ",".join(enabled_disk_templates)])
534 534
    ]:
535 535
    AssertCommand(cmd, fail=fail)
536 536

  

Also available in: Unified diff