Revision e055a2ab lib/opcodes.py

b/lib/opcodes.py
348 348

  
349 349
_CheckNetworkType = ht.TElemOf(constants.NETWORK_VALID_TYPES)
350 350

  
351
#: Network type parameter
352
_PNetworkType = ("network_type", None, ht.TMaybe(_CheckNetworkType),
353
                 "Network type")
354

  
355 351

  
356 352
@ht.WithDesc("IPv4 network")
357 353
def _CheckCIDRNetNotation(value):
......
2024 2020
  OP_DSC_FIELD = "network_name"
2025 2021
  OP_PARAMS = [
2026 2022
    _PNetworkName,
2027
    _PNetworkType,
2023
    ("network_type", None, ht.TMaybe(_CheckNetworkType), "Network type"),
2028 2024
    ("network", ht.NoDefault, _TIpNetwork4, "IPv4 subnet"),
2029 2025
    ("gateway", None, ht.TMaybe(_TIpAddress4), "IPv4 gateway"),
2030 2026
    ("network6", None, ht.TMaybe(_TIpNetwork6), "IPv6 subnet"),
......
2056 2052
  OP_DSC_FIELD = "network_name"
2057 2053
  OP_PARAMS = [
2058 2054
    _PNetworkName,
2059
    _PNetworkType,
2060
    ("gateway", None, ht.TMaybe(_TIpAddress4), "IPv4 gateway"),
2061
    ("network6", None, ht.TMaybe(_TIpNetwork6), "IPv6 subnet"),
2062
    ("gateway6", None, ht.TMaybe(_TIpAddress6), "IPv6 gateway"),
2063
    ("mac_prefix", None, ht.TMaybeString,
2055
    ("network_type", None, ht.TMaybeValueNone(_CheckNetworkType),
2056
     "Network type"),
2057
    ("gateway", None, ht.TMaybeValueNone(_TIpAddress4), "IPv4 gateway"),
2058
    ("network6", None, ht.TMaybeValueNone(_TIpNetwork6), "IPv6 subnet"),
2059
    ("gateway6", None, ht.TMaybeValueNone(_TIpAddress6), "IPv6 gateway"),
2060
    ("mac_prefix", None, ht.TMaybeValueNone(ht.TString),
2064 2061
     "MAC address prefix that overrides cluster one"),
2065 2062
    ("add_reserved_ips", None, _TMaybeAddr4List,
2066 2063
     "Which external IP addresses to reserve"),

Also available in: Unified diff