Revision f4f36cf3 lib/constants.py

b/lib/constants.py
369 369
HTYPE_NODE = "NODE"
370 370
HTYPE_GROUP = "GROUP"
371 371
HTYPE_INSTANCE = "INSTANCE"
372
HTYPE_NETWORK = "NETWORK"
372 373

  
373 374
HKR_SKIP = 0
374 375
HKR_FAIL = 1
......
1089 1090

  
1090 1091
NIC_MODE_BRIDGED = "bridged"
1091 1092
NIC_MODE_ROUTED = "routed"
1093
NIC_IP_POOL = "pool"
1092 1094

  
1093 1095
NIC_VALID_MODES = frozenset([NIC_MODE_BRIDGED, NIC_MODE_ROUTED])
1094 1096

  
1097
# An extra description of the network.
1098
# Can be used by hooks/kvm-vif-bridge to apply different rules
1099
NETWORK_TYPE_PRIVATE = "private"
1100
NETWORK_TYPE_PUBLIC = "public"
1101

  
1102
NETWORK_VALID_TYPES = frozenset([NETWORK_TYPE_PRIVATE, NETWORK_TYPE_PUBLIC])
1103

  
1095 1104
NICS_PARAMETER_TYPES = {
1096 1105
  NIC_MODE: VTYPE_STRING,
1097 1106
  NIC_LINK: VTYPE_STRING,
......
1119 1128
INIC_IP = "ip"
1120 1129
INIC_MODE = "mode"
1121 1130
INIC_LINK = "link"
1131
INIC_NETWORK = "network"
1122 1132
INIC_PARAMS_TYPES = {
1123 1133
  INIC_IP: VTYPE_MAYBE_STRING,
1124 1134
  INIC_LINK: VTYPE_STRING,
1125 1135
  INIC_MAC: VTYPE_STRING,
1126 1136
  INIC_MODE: VTYPE_STRING,
1137
  INIC_NETWORK: VTYPE_MAYBE_STRING,
1127 1138
  }
1128 1139
INIC_PARAMS = frozenset(INIC_PARAMS_TYPES.keys())
1129 1140

  
......
1624 1635
QR_OS = "os"
1625 1636
QR_JOB = "job"
1626 1637
QR_EXPORT = "export"
1638
QR_NETWORK = "network"
1627 1639

  
1628 1640
#: List of resources which can be queried using L{opcodes.OpQuery}
1629 1641
QR_VIA_OP = frozenset([
......
1633 1645
  QR_GROUP,
1634 1646
  QR_OS,
1635 1647
  QR_EXPORT,
1648
  QR_NETWORK,
1636 1649
  ])
1637 1650

  
1638 1651
#: List of resources which can be queried using Local UniX Interface
......
1724 1737
SS_MAINTAIN_NODE_HEALTH = "maintain_node_health"
1725 1738
SS_UID_POOL = "uid_pool"
1726 1739
SS_NODEGROUPS = "nodegroups"
1740
SS_NETWORKS = "networks"
1727 1741

  
1728 1742
SS_FILE_PERMS = 0444
1729 1743

  

Also available in: Unified diff