Revision 7ad422ec

b/lib/constants.py
1314 1314
# NIC_* constants are used inside the ganeti config
1315 1315
NIC_MODE = "mode"
1316 1316
NIC_LINK = "link"
1317
NIC_VLAN = "vlan"
1317 1318

  
1318 1319
NIC_MODE_BRIDGED = "bridged"
1319 1320
NIC_MODE_ROUTED = "routed"
......
1332 1333
NICS_PARAMETER_TYPES = {
1333 1334
  NIC_MODE: VTYPE_STRING,
1334 1335
  NIC_LINK: VTYPE_STRING,
1336
  NIC_VLAN: VTYPE_MAYBE_STRING,
1335 1337
  }
1336 1338

  
1337 1339
NICS_PARAMETERS = frozenset(NICS_PARAMETER_TYPES.keys())
......
1364 1366
INIC_LINK = "link"
1365 1367
INIC_NETWORK = "network"
1366 1368
INIC_NAME = "name"
1369
INIC_VLAN = "vlan"
1367 1370
INIC_PARAMS_TYPES = {
1368 1371
  INIC_IP: VTYPE_MAYBE_STRING,
1369 1372
  INIC_LINK: VTYPE_STRING,
......
1371 1374
  INIC_MODE: VTYPE_STRING,
1372 1375
  INIC_NETWORK: VTYPE_MAYBE_STRING,
1373 1376
  INIC_NAME: VTYPE_MAYBE_STRING,
1377
  INIC_VLAN: VTYPE_MAYBE_STRING,
1374 1378
  }
1375 1379
INIC_PARAMS = frozenset(INIC_PARAMS_TYPES.keys())
1376 1380

  
......
2259 2263
NICC_DEFAULTS = {
2260 2264
  NIC_MODE: NIC_MODE_BRIDGED,
2261 2265
  NIC_LINK: DEFAULT_BRIDGE,
2266
  NIC_VLAN: None,
2262 2267
  }
2263 2268

  
2264 2269
# All of the following values are quite arbitrarily - there are no
b/src/Ganeti/Objects.hs
282 282
$(buildParam "Nic" "nicp"
283 283
  [ simpleField "mode" [t| NICMode |]
284 284
  , simpleField "link" [t| String  |]
285
  , simpleField "vlan" [t| Maybe String  |]
285 286
  ])
286 287

  
287 288
$(buildObject "PartialNic" "nic" $

Also available in: Unified diff