From 51b13ce95f0b9f4d7d0cd2b9f880200ebdf32b37 Mon Sep 17 00:00:00 2001
From: Manuel Franceschini <livewire@google.com>
Date: Fri, 20 Aug 2010 15:02:50 +0200
Subject: [PATCH] Support IPv6 for instances
Signed-off-by: Manuel Franceschini <livewire@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 9fde736b4..a85996ee9 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -7003,9 +7003,8 @@ class LUCreateInstance(LogicalUnit):
errors.ECODE_INVAL)
nic_ip = self.hostname1.ip
else:
- if not netutils.IP4Address.IsValid(ip):
- raise errors.OpPrereqError("Given IP address '%s' doesn't look"
- " like a valid IP" % ip,
+ if not netutils.IPAddress.IsValid(ip):
+ raise errors.OpPrereqError("Invalid IP address '%s'" % ip,
errors.ECODE_INVAL)
nic_ip = ip
@@ -8678,7 +8677,7 @@ class LUSetInstanceParams(LogicalUnit):
if nic_ip.lower() == constants.VALUE_NONE:
nic_dict['ip'] = None
else:
- if not netutils.IP4Address.IsValid(nic_ip):
+ if not netutils.IPAddress.IsValid(nic_ip):
raise errors.OpPrereqError("Invalid IP address '%s'" % nic_ip,
errors.ECODE_INVAL)
--
GitLab