Revision 5a7fab74

b/lib/constants.py
669 669
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
670 670

  
671 671
HVS_PARAMETER_TITLES = _constants.HVS_PARAMETER_TITLES
672
# Migration statuses
673
HV_MIGRATION_COMPLETED = "completed"
674
HV_MIGRATION_ACTIVE = "active"
675
HV_MIGRATION_FAILED = "failed"
676
HV_MIGRATION_CANCELLED = "cancelled"
677

  
678
HV_MIGRATION_VALID_STATUSES = compat.UniqueFrozenset([
679
  HV_MIGRATION_COMPLETED,
680
  HV_MIGRATION_ACTIVE,
681
  HV_MIGRATION_FAILED,
682
  HV_MIGRATION_CANCELLED,
683
  ])
684

  
685
HV_MIGRATION_FAILED_STATUSES = compat.UniqueFrozenset([
686
  HV_MIGRATION_FAILED,
687
  HV_MIGRATION_CANCELLED,
688
  ])
689 672

  
690
# KVM-specific statuses
691
HV_KVM_MIGRATION_VALID_STATUSES = HV_MIGRATION_VALID_STATUSES
692

  
693
# Node info keys
694
HV_NODEINFO_KEY_VERSION = "hv_version"
695

  
696
# Hypervisor state
697
HVST_MEMORY_TOTAL = "mem_total"
698
HVST_MEMORY_NODE = "mem_node"
699
HVST_MEMORY_HV = "mem_hv"
700
HVST_CPU_TOTAL = "cpu_total"
701
HVST_CPU_NODE = "cpu_node"
702

  
703
HVST_DEFAULTS = {
704
  HVST_MEMORY_TOTAL: 0,
705
  HVST_MEMORY_NODE: 0,
706
  HVST_MEMORY_HV: 0,
707
  HVST_CPU_TOTAL: 1,
708
  HVST_CPU_NODE: 1,
709
  }
710

  
711
HVSTS_PARAMETER_TYPES = {
712
  HVST_MEMORY_TOTAL: VTYPE_INT,
713
  HVST_MEMORY_NODE: VTYPE_INT,
714
  HVST_MEMORY_HV: VTYPE_INT,
715
  HVST_CPU_TOTAL: VTYPE_INT,
716
  HVST_CPU_NODE: VTYPE_INT,
717
  }
718

  
719
HVSTS_PARAMETERS = frozenset(HVSTS_PARAMETER_TYPES.keys())
720

  
721
# Disk state
722
DS_DISK_TOTAL = "disk_total"
723
DS_DISK_RESERVED = "disk_reserved"
724
DS_DISK_OVERHEAD = "disk_overhead"
725

  
726
DS_DEFAULTS = {
727
  DS_DISK_TOTAL: 0,
728
  DS_DISK_RESERVED: 0,
729
  DS_DISK_OVERHEAD: 0,
730
  }
673
HV_MIGRATION_COMPLETED = _constants.HV_MIGRATION_COMPLETED
674
HV_MIGRATION_ACTIVE = _constants.HV_MIGRATION_ACTIVE
675
HV_MIGRATION_FAILED = _constants.HV_MIGRATION_FAILED
676
HV_MIGRATION_CANCELLED = _constants.HV_MIGRATION_CANCELLED
677
HV_MIGRATION_VALID_STATUSES = _constants.HV_MIGRATION_VALID_STATUSES
678
HV_MIGRATION_FAILED_STATUSES = _constants.HV_MIGRATION_FAILED_STATUSES
679
HV_KVM_MIGRATION_VALID_STATUSES = _constants.HV_KVM_MIGRATION_VALID_STATUSES
680

  
681
HV_NODEINFO_KEY_VERSION = _constants.HV_NODEINFO_KEY_VERSION
682

  
683
HVST_MEMORY_TOTAL = _constants.HVST_MEMORY_TOTAL
684
HVST_MEMORY_NODE = _constants.HVST_MEMORY_NODE
685
HVST_MEMORY_HV = _constants.HVST_MEMORY_HV
686
HVST_CPU_TOTAL = _constants.HVST_CPU_TOTAL
687
HVST_CPU_NODE = _constants.HVST_CPU_NODE
688
HVSTS_PARAMETERS = _constants.HVSTS_PARAMETERS
689
HVST_DEFAULTS = _constants.HVST_DEFAULTS
690
HVSTS_PARAMETER_TYPES = _constants.HVSTS_PARAMETER_TYPES
691

  
692
DS_DISK_TOTAL = _constants.DS_DISK_TOTAL
693
DS_DISK_RESERVED = _constants.DS_DISK_RESERVED
694
DS_DISK_OVERHEAD = _constants.DS_DISK_OVERHEAD
695
DS_DEFAULTS = _constants.DS_DEFAULTS
696
DSS_PARAMETER_TYPES = _constants.DSS_PARAMETER_TYPES
697
DSS_PARAMETERS = _constants.DSS_PARAMETERS
698
DS_VALID_TYPES = _constants.DS_VALID_TYPES
731 699

  
732 700
ISPEC_MEM_SIZE = _constants.ISPEC_MEM_SIZE
733 701
ISPEC_CPU_COUNT = _constants.ISPEC_CPU_COUNT
......
759 727
NDS_PARAMETER_TYPES = _constants.NDS_PARAMETER_TYPES
760 728
NDS_PARAMETERS = _constants.NDS_PARAMETERS
761 729
NDS_PARAMETER_TITLES = _constants.NDS_PARAMETER_TITLES
762
DSS_PARAMETER_TYPES = {
763
  DS_DISK_TOTAL: VTYPE_INT,
764
  DS_DISK_RESERVED: VTYPE_INT,
765
  DS_DISK_OVERHEAD: VTYPE_INT,
766
  }
767 730

  
768
DSS_PARAMETERS = frozenset(DSS_PARAMETER_TYPES.keys())
769
DS_VALID_TYPES = compat.UniqueFrozenset([DT_PLAIN])
770 731

  
771 732
# Backend parameter names
772 733
BE_MEMORY = "memory" # deprecated and replaced by max and min mem
b/src/Ganeti/HsConstants.hs
1597 1597
   (hvPassthrough, "pci_pass"),
1598 1598
   (hvVncBindAddress, "VNC_bind_address")]
1599 1599

  
1600
-- * Migration statuses
1601

  
1602
hvMigrationActive :: String
1603
hvMigrationActive = "active"
1604

  
1605
hvMigrationCancelled :: String
1606
hvMigrationCancelled = "cancelled"
1607

  
1608
hvMigrationCompleted :: String
1609
hvMigrationCompleted = "completed"
1610

  
1611
hvMigrationFailed :: String
1612
hvMigrationFailed = "failed"
1613

  
1614
hvMigrationValidStatuses :: FrozenSet String
1615
hvMigrationValidStatuses =
1616
  ConstantUtils.mkSet [hvMigrationActive,
1617
                       hvMigrationCancelled,
1618
                       hvMigrationCompleted,
1619
                       hvMigrationFailed]
1620

  
1621
hvMigrationFailedStatuses :: FrozenSet String
1622
hvMigrationFailedStatuses =
1623
  ConstantUtils.mkSet [hvMigrationFailed, hvMigrationCancelled]
1624

  
1625
-- | KVM-specific statuses
1626
--
1627
-- FIXME: this constant seems unnecessary
1628
hvKvmMigrationValidStatuses :: FrozenSet String
1629
hvKvmMigrationValidStatuses = hvMigrationValidStatuses
1630

  
1631
-- | Node info keys
1632
hvNodeinfoKeyVersion :: String
1633
hvNodeinfoKeyVersion = "hv_version"
1634

  
1635
-- * Hypervisor state
1636

  
1637
hvstCpuNode :: String
1638
hvstCpuNode = "cpu_node"
1639

  
1640
hvstCpuTotal :: String
1641
hvstCpuTotal = "cpu_total"
1642

  
1643
hvstMemoryHv :: String
1644
hvstMemoryHv = "mem_hv"
1645

  
1646
hvstMemoryNode :: String
1647
hvstMemoryNode = "mem_node"
1648

  
1649
hvstMemoryTotal :: String
1650
hvstMemoryTotal = "mem_total"
1651

  
1652
hvstsParameters :: FrozenSet String
1653
hvstsParameters =
1654
  ConstantUtils.mkSet [hvstCpuNode,
1655
                       hvstCpuTotal,
1656
                       hvstMemoryHv,
1657
                       hvstMemoryNode,
1658
                       hvstMemoryTotal]
1659

  
1660
hvstDefaults :: Map String Int
1661
hvstDefaults =
1662
  Map.fromList
1663
  [(hvstCpuNode, 1),
1664
   (hvstCpuTotal, 1),
1665
   (hvstMemoryHv, 0),
1666
   (hvstMemoryTotal, 0),
1667
   (hvstMemoryNode, 0)]
1668

  
1669
hvstsParameterTypes :: Map String VType
1670
hvstsParameterTypes =
1671
  Map.fromList [(hvstMemoryTotal, VTypeInt),
1672
                (hvstMemoryNode, VTypeInt),
1673
                (hvstMemoryHv, VTypeInt),
1674
                (hvstCpuTotal, VTypeInt),
1675
                (hvstCpuNode, VTypeInt)]
1676

  
1677
-- * Disk state
1678

  
1679
dsDiskOverhead :: String
1680
dsDiskOverhead = "disk_overhead"
1681

  
1682
dsDiskReserved :: String
1683
dsDiskReserved = "disk_reserved"
1684

  
1685
dsDiskTotal :: String
1686
dsDiskTotal = "disk_total"
1687

  
1688
dsDefaults :: Map String Int
1689
dsDefaults =
1690
  Map.fromList
1691
  [(dsDiskTotal, 0),
1692
   (dsDiskReserved, 0),
1693
   (dsDiskOverhead, 0)]
1694

  
1695
dssParameterTypes :: Map String VType
1696
dssParameterTypes =
1697
  Map.fromList [(dsDiskTotal, VTypeInt),
1698
                (dsDiskReserved, VTypeInt),
1699
                (dsDiskOverhead, VTypeInt)]
1700

  
1701
dssParameters :: FrozenSet String
1702
dssParameters =
1703
  ConstantUtils.mkSet [dsDiskTotal, dsDiskReserved, dsDiskOverhead]
1704

  
1705
dsValidTypes :: FrozenSet String
1706
dsValidTypes = ConstantUtils.mkSet [Types.diskTemplateToRaw DTPlain]
1707

  
1600 1708
-- | Instance specs
1601 1709
--
1602 1710
-- FIXME: these should be associated with 'Ganeti.HTools.Types.ISpec'

Also available in: Unified diff