From 714ff97c649e03f0269037dba7b29b6c04d825cb Mon Sep 17 00:00:00 2001
From: Andrea Spadaccini <spadaccio@google.com>
Date: Mon, 24 Oct 2011 11:50:27 +0100
Subject: [PATCH] Use GetClassFromIpFamily in ActivateMasterIp
Signed-off-by: Andrea Spadaccini <spadaccio@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/backend.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index 820538108..4deaaad5d 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -265,9 +265,7 @@ def ActivateMasterIp():
err_msg = "Someone else has the master ip, not activating"
logging.error(err_msg)
else:
- ipcls = netutils.IP4Address
- if family == netutils.IP6Address.family:
- ipcls = netutils.IP6Address
+ ipcls = netutils.IPAddress.GetClassFromIpFamily(family)
result = utils.RunCmd([constants.IP_COMMAND_PATH, "address", "add",
"%s/%s" % (master_ip, master_netmask),
--
GitLab