Revision 0048236f lib/opcodes.py

b/lib/opcodes.py
351 351
  """Ensure a given cidr notation type is valid.
352 352

  
353 353
  """
354
  try:
355
    ipaddr.IPv4Network(value)
356
  except ipaddr.AddressValueError:
357
    return False
354
  if value != 'none':
355
    try:
356
      ipaddr.IPv4Network(value)
357
    except ipaddr.AddressValueError:
358
      return False
358 359
  return True
359 360

  
360 361
def _CheckCIDRAddrNotation(value):
361 362
  """Ensure a given cidr notation type is valid.
362 363

  
363 364
  """
364
  try:
365
    ipaddr.IPv4Address(value)
366
  except ipaddr.AddressValueError:
367
    return False
365
  if value != 'none':
366
    try:
367
      ipaddr.IPv4Address(value)
368
    except ipaddr.AddressValueError:
369
      return False
368 370
  return True
369 371

  
370 372
def _CheckCIDR6AddrNotation(value):
371 373
  """Ensure a given cidr notation type is valid.
372 374

  
373 375
  """
374
  try:
375
    ipaddr.IPv6Address(value)
376
  except ipaddr.AddressValueError:
377
    return False
376
  if value != 'none':
377
    try:
378
      ipaddr.IPv6Address(value)
379
    except ipaddr.AddressValueError:
380
      return False
378 381
  return True
379 382

  
380 383
def _CheckCIDR6NetNotation(value):
381 384
  """Ensure a given cidr notation type is valid.
382 385

  
383 386
  """
384
  try:
385
    ipaddr.IPv6Network(value)
386
  except ipaddr.AddressValueError:
387
    return False
387
  if value != 'none':
388
    try:
389
      ipaddr.IPv6Network(value)
390
    except ipaddr.AddressValueError:
391
      return False
388 392
  return True
389 393

  
390 394
class _AutoOpParamSlots(type):

Also available in: Unified diff