Revision 34700f5b

b/lib/cmdlib.py
1144 1144
  """
1145 1145
  mem_size = instance.beparams.get(constants.BE_MAXMEM, None)
1146 1146
  cpu_count = instance.beparams.get(constants.BE_VCPUS, None)
1147
  spindle_use = instance.beparams.get(constants.BE_SPINDLE_USAGE, None)
1147
  spindle_use = instance.beparams.get(constants.BE_SPINDLE_USE, None)
1148 1148
  disk_count = len(instance.disks)
1149 1149
  disk_sizes = [disk.size for disk in instance.disks]
1150 1150
  nic_count = len(instance.nics)
......
9352 9352
                     os=self.op.os_type,
9353 9353
                     vcpus=self.be_full[constants.BE_VCPUS],
9354 9354
                     memory=self.be_full[constants.BE_MAXMEM],
9355
                     spindle_usage=self.be_full[constants.BE_SPINDLE_USAGE],
9355
                     spindle_use=self.be_full[constants.BE_SPINDLE_USE],
9356 9356
                     disks=self.disks,
9357 9357
                     nics=nics,
9358 9358
                     hypervisor=self.op.hypervisor,
......
9848 9848
    nodenames = [pnode.name] + self.secondaries
9849 9849

  
9850 9850
    # Verify instance specs
9851
    spindle_use = self.be_full.get(constants.BE_SPINDLE_USAGE, None)
9851
    spindle_use = self.be_full.get(constants.BE_SPINDLE_USE, None)
9852 9852
    ispec = {
9853 9853
      constants.ISPEC_MEM_SIZE: self.be_full.get(constants.BE_MAXMEM, None),
9854 9854
      constants.ISPEC_CPU_COUNT: self.be_full.get(constants.BE_VCPUS, None),
......
14516 14516
    self.in_text = self.out_text = self.in_data = self.out_data = None
14517 14517
    # init all input fields so that pylint is happy
14518 14518
    self.mode = mode
14519
    self.memory = self.disks = self.disk_template = self.spindle_usage = None
14519
    self.memory = self.disks = self.disk_template = self.spindle_use = None
14520 14520
    self.os = self.tags = self.nics = self.vcpus = None
14521 14521
    self.hypervisor = None
14522 14522
    self.relocate_from = None
......
14722 14722
        "admin_state": iinfo.admin_state,
14723 14723
        "vcpus": beinfo[constants.BE_VCPUS],
14724 14724
        "memory": beinfo[constants.BE_MAXMEM],
14725
        "spindle_usage": beinfo[constants.BE_SPINDLE_USAGE],
14725
        "spindle_use": beinfo[constants.BE_SPINDLE_USE],
14726 14726
        "os": iinfo.os,
14727 14727
        "nodes": [iinfo.primary_node] + list(iinfo.secondary_nodes),
14728 14728
        "nics": nic_data,
......
14762 14762
      "os": self.os,
14763 14763
      "vcpus": self.vcpus,
14764 14764
      "memory": self.memory,
14765
      "spindle_usage": self.spindle_usage,
14765
      "spindle_use": self.spindle_use,
14766 14766
      "disks": self.disks,
14767 14767
      "disk_space_total": disk_space,
14768 14768
      "nics": self.nics,
......
14876 14876
       [
14877 14877
        ("name", ht.TString),
14878 14878
        ("memory", ht.TInt),
14879
        ("spindle_usage", ht.TInt),
14879
        ("spindle_use", ht.TInt),
14880 14880
        ("disks", ht.TListOf(ht.TDict)),
14881 14881
        ("disk_template", ht.TString),
14882 14882
        ("os", ht.TString),
b/lib/constants.py
918 918
BE_VCPUS = "vcpus"
919 919
BE_AUTO_BALANCE = "auto_balance"
920 920
BE_ALWAYS_FAILOVER = "always_failover"
921
BE_SPINDLE_USAGE = "spindle_usage"
921
BE_SPINDLE_USE = "spindle_use"
922 922

  
923 923
BES_PARAMETER_TYPES = {
924 924
  BE_MAXMEM: VTYPE_SIZE,
......
926 926
  BE_VCPUS: VTYPE_INT,
927 927
  BE_AUTO_BALANCE: VTYPE_BOOL,
928 928
  BE_ALWAYS_FAILOVER: VTYPE_BOOL,
929
  BE_SPINDLE_USAGE: VTYPE_INT,
929
  BE_SPINDLE_USE: VTYPE_INT,
930 930
  }
931 931

  
932 932
BES_PARAMETER_COMPAT = {
......
1821 1821
  BE_VCPUS: 1,
1822 1822
  BE_AUTO_BALANCE: True,
1823 1823
  BE_ALWAYS_FAILOVER: False,
1824
  BE_SPINDLE_USAGE: 1,
1824
  BE_SPINDLE_USE: 1,
1825 1825
  }
1826 1826

  
1827 1827
NDC_DEFAULTS = {
b/test/ganeti.cmdlib_unittest.py
688 688
    beparams = {
689 689
      constants.BE_MAXMEM: 2048,
690 690
      constants.BE_VCPUS: 2,
691
      constants.BE_SPINDLE_USAGE: 4,
691
      constants.BE_SPINDLE_USE: 4,
692 692
      }
693 693
    disks = [objects.Disk(size=512)]
694 694
    instance = objects.Instance(beparams=beparams, disks=disks, nics=[])

Also available in: Unified diff