Revision 7c670076 test/ganeti.query_unittest.py

b/test/ganeti.query_unittest.py
564 564
        },
565 565
      nicparams={
566 566
        constants.PP_DEFAULT: constants.NICC_DEFAULTS,
567
        })
567
        },
568
      os_hvp={},
569
      osparams={})
568 570

  
569 571
    instances = [
570
      objects.Instance(name="inst1", hvparams={}, beparams={}, nics=[]),
571
      objects.Instance(name="inst2", hvparams={}, nics=[],
572
      objects.Instance(name="inst1", hvparams={}, beparams={}, osparams={},
573
                       nics=[], os="deb1"),
574
      objects.Instance(name="inst2", hvparams={}, nics=[], osparams={},
575
        os="foomoo",
572 576
        beparams={
573 577
          constants.BE_MEMORY: 512,
574 578
        }),
575
      objects.Instance(name="inst3", hvparams={}, beparams={},
576
        nics=[objects.NIC(ip="192.0.2.99", nicparams={})]),
579
      objects.Instance(name="inst3", hvparams={}, beparams={}, osparams={},
580
        os="dos", nics=[objects.NIC(ip="192.0.2.99", nicparams={})]),
577 581
      ]
578 582

  
579 583
    iqd = query.InstanceQueryData(instances, cluster, None, [], [], {},
......
617 621
        constants.PP_DEFAULT: constants.NICC_DEFAULTS,
618 622
        },
619 623
      os_hvp={},
620
      tcpudp_port_pool=set())
624
      tcpudp_port_pool=set(),
625
      osparams={
626
        "deb99": {
627
          "clean_install": "yes",
628
          },
629
        })
621 630

  
622 631
    offline_nodes = ["nodeoff1", "nodeoff2"]
623 632
    bad_nodes = ["nodebad1", "nodebad2", "nodebad3"] + offline_nodes
......
630 639
        admin_up=True, hypervisor=constants.HT_XEN_PVM, os="linux1",
631 640
        primary_node="node1",
632 641
        disk_template=constants.DT_PLAIN,
633
        disks=[]),
642
        disks=[],
643
        osparams={}),
634 644
      objects.Instance(name="inst2", hvparams={}, nics=[],
635 645
        uuid="73a0f8a7-068c-4630-ada2-c3440015ab1a",
636 646
        ctime=1291211000, mtime=1291211077, serial_no=1,
......
640 650
        disks=[],
641 651
        beparams={
642 652
          constants.BE_MEMORY: 512,
643
        }),
653
        },
654
        osparams={}),
644 655
      objects.Instance(name="inst3", hvparams={}, beparams={},
645 656
        uuid="11ec8dff-fb61-4850-bfe0-baa1803ff280",
646 657
        ctime=1291011000, mtime=1291013000, serial_no=1923,
......
654 665
                        constants.NIC_LINK: constants.DEFAULT_BRIDGE,
655 666
                        }),
656 667
          objects.NIC(ip=None, mac=macs.pop(), nicparams={}),
657
          ]),
668
          ],
669
        osparams={}),
658 670
      objects.Instance(name="inst4", hvparams={}, beparams={},
659 671
        uuid="68dab168-3ef5-4c9d-b4d3-801e0672068c",
660 672
        ctime=1291244390, mtime=1291244395, serial_no=25,
......
677 689
                        constants.NIC_MODE: constants.NIC_MODE_BRIDGED,
678 690
                        constants.NIC_LINK: "eth123",
679 691
                        }),
680
          ]),
692
          ],
693
        osparams={}),
681 694
      objects.Instance(name="inst5", hvparams={}, nics=[],
682 695
        uuid="0e3dca12-5b42-4e24-98a2-415267545bd0",
683 696
        ctime=1231211000, mtime=1261200000, serial_no=3,
......
687 700
        disks=[],
688 701
        beparams={
689 702
          constants.BE_MEMORY: 512,
690
        }),
703
        },
704
        osparams={}),
691 705
      objects.Instance(name="inst6", hvparams={}, nics=[],
692 706
        uuid="72de6580-c8d5-4661-b902-38b5785bb8b3",
693 707
        ctime=7513, mtime=11501, serial_no=13390,
......
697 711
        disks=[],
698 712
        beparams={
699 713
          constants.BE_MEMORY: 768,
700
        }),
714
        },
715
        osparams={
716
          "clean_install": "no",
717
          }),
701 718
      objects.Instance(name="inst7", hvparams={}, nics=[],
702 719
        uuid="ceec5dc4-b729-4f42-ae28-69b3cd24920e",
703 720
        ctime=None, mtime=None, serial_no=1947,
......
705 722
        primary_node="node6",
706 723
        disk_template=constants.DT_DISKLESS,
707 724
        disks=[],
708
        beparams={}),
725
        beparams={},
726
        osparams={}),
709 727
      ]
710 728

  
711 729
    assert not utils.FindDuplicates(inst.name for inst in instances)
......
826 844
        exp = (constants.RS_NORMAL, inst.name in live_data)
827 845
      self.assertEqual(row[fieldidx["oper_state"]], exp)
828 846

  
847
      cust_exp = (constants.RS_NORMAL, {})
848
      if inst.os == "deb99":
849
        if inst.name == "inst6":
850
          exp = (constants.RS_NORMAL, {"clean_install": "no"})
851
          cust_exp = exp
852
        else:
853
          exp = (constants.RS_NORMAL, {"clean_install": "yes"})
854
      else:
855
        exp = (constants.RS_NORMAL, {})
856
      self.assertEqual(row[fieldidx["osparams"]], exp)
857
      self.assertEqual(row[fieldidx["custom_osparams"]], cust_exp)
858

  
829 859
      usage = disk_usage[inst.name]
830 860
      if usage is None:
831 861
        usage = 0

Also available in: Unified diff