Revision 37b918c2

b/lib/cmdlib.py
9349 9349
                     os=self.op.os_type,
9350 9350
                     vcpus=self.be_full[constants.BE_VCPUS],
9351 9351
                     memory=self.be_full[constants.BE_MAXMEM],
9352
                     spindle_usage=self.be_full[constants.BE_SPINDLE_USAGE],
9352 9353
                     disks=self.disks,
9353 9354
                     nics=nics,
9354 9355
                     hypervisor=self.op.hypervisor,
......
14510 14511
    self.in_text = self.out_text = self.in_data = self.out_data = None
14511 14512
    # init all input fields so that pylint is happy
14512 14513
    self.mode = mode
14513
    self.memory = self.disks = self.disk_template = None
14514
    self.memory = self.disks = self.disk_template = self.spindle_usage = None
14514 14515
    self.os = self.tags = self.nics = self.vcpus = None
14515 14516
    self.hypervisor = None
14516 14517
    self.relocate_from = None
......
14716 14717
        "admin_state": iinfo.admin_state,
14717 14718
        "vcpus": beinfo[constants.BE_VCPUS],
14718 14719
        "memory": beinfo[constants.BE_MAXMEM],
14720
        "spindle_usage": beinfo[constants.BE_SPINDLE_USAGE],
14719 14721
        "os": iinfo.os,
14720 14722
        "nodes": [iinfo.primary_node] + list(iinfo.secondary_nodes),
14721 14723
        "nics": nic_data,
......
14755 14757
      "os": self.os,
14756 14758
      "vcpus": self.vcpus,
14757 14759
      "memory": self.memory,
14760
      "spindle_usage": self.spindle_usage,
14758 14761
      "disks": self.disks,
14759 14762
      "disk_space_total": disk_space,
14760 14763
      "nics": self.nics,
......
14868 14871
       [
14869 14872
        ("name", ht.TString),
14870 14873
        ("memory", ht.TInt),
14874
        ("spindle_usage", ht.TInt),
14871 14875
        ("disks", ht.TListOf(ht.TDict)),
14872 14876
        ("disk_template", ht.TString),
14873 14877
        ("os", ht.TString),

Also available in: Unified diff