From 58aa30d793a2e1cd275a803e261407c8ff2960a1 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 5 Aug 2011 14:39:24 +0200
Subject: [PATCH] confd.querylib: Remove long-deprecated query mode
This was never used by a stable version.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/confd/querylib.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/lib/confd/querylib.py b/lib/confd/querylib.py
index e1e323fd9..81ea2b29c 100644
--- a/lib/confd/querylib.py
+++ b/lib/confd/querylib.py
@@ -194,11 +194,6 @@ class InstanceIpToNodePrimaryIpQuery(ConfdQuery):
network_link = query[constants.CONFD_REQQ_LINK]
else:
network_link = None # default will be used
- elif isinstance(query, basestring):
- # 2.1 beta1 and beta2 mode, to be deprecated for 2.2
- instances_list = [query]
- network_link = None
- mode = constants.CONFD_REQQ_IP
else:
logging.debug("Invalid query argument type for: %s", query)
return QUERY_ARGUMENT_ERROR
--
GitLab