Revision eaa4c57c lib/constants.py

b/lib/constants.py
302 302
HTYPE_NODE = "NODE"
303 303
HTYPE_GROUP = "GROUP"
304 304
HTYPE_INSTANCE = "INSTANCE"
305
HTYPE_NETWORK = "NETWORK"
305 306

  
306 307
HKR_SKIP = 0
307 308
HKR_FAIL = 1
......
1065 1066

  
1066 1067
NIC_MODE_BRIDGED = "bridged"
1067 1068
NIC_MODE_ROUTED = "routed"
1069
NIC_IP_POOL = "pool"
1068 1070

  
1069 1071
NIC_VALID_MODES = frozenset([NIC_MODE_BRIDGED, NIC_MODE_ROUTED])
1070 1072

  
1073
# An extra description of the network.
1074
# Can be used by hooks/kvm-vif-bridge to apply different rules
1075
NETWORK_TYPE_PRIVATE = "private"
1076
NETWORK_TYPE_PUBLIC = "public"
1077

  
1078
NETWORK_VALID_TYPES = frozenset([NETWORK_TYPE_PRIVATE, NETWORK_TYPE_PUBLIC])
1079

  
1071 1080
NICS_PARAMETER_TYPES = {
1072 1081
  NIC_MODE: VTYPE_STRING,
1073 1082
  NIC_LINK: VTYPE_STRING,
......
1095 1104
INIC_IP = "ip"
1096 1105
INIC_MODE = "mode"
1097 1106
INIC_LINK = "link"
1107
INIC_NETWORK = "network"
1098 1108
INIC_PARAMS_TYPES = {
1099 1109
  INIC_IP: VTYPE_MAYBE_STRING,
1100 1110
  INIC_LINK: VTYPE_STRING,
1101 1111
  INIC_MAC: VTYPE_STRING,
1102 1112
  INIC_MODE: VTYPE_STRING,
1113
  INIC_NETWORK: VTYPE_MAYBE_STRING,
1103 1114
  }
1104 1115
INIC_PARAMS = frozenset(INIC_PARAMS_TYPES.keys())
1105 1116

  
......
1603 1614
QR_OS = "os"
1604 1615
QR_JOB = "job"
1605 1616
QR_EXPORT = "export"
1617
QR_NETWORK = "network"
1606 1618

  
1607 1619
#: List of resources which can be queried using L{opcodes.OpQuery}
1608 1620
QR_VIA_OP = frozenset([
......
1612 1624
  QR_GROUP,
1613 1625
  QR_OS,
1614 1626
  QR_EXPORT,
1627
  QR_NETWORK,
1615 1628
  ])
1616 1629

  
1617 1630
#: List of resources which can be queried using Local UniX Interface
......
1703 1716
SS_MAINTAIN_NODE_HEALTH = "maintain_node_health"
1704 1717
SS_UID_POOL = "uid_pool"
1705 1718
SS_NODEGROUPS = "nodegroups"
1719
SS_NETWORKS = "networks"
1706 1720

  
1707 1721
SS_FILE_PERMS = 0444
1708 1722

  

Also available in: Unified diff