From 12e0ee0dd9c5a81a7ff53f8e4e2a8040988fcf89 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 28 Mar 2012 14:30:37 +0200
Subject: [PATCH] NEWS: Deprecate LUXI calls replaced with query2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding the β€œluxi” namespace is necessary in β€œsphinx_ext”.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
 NEWS                    | 4 ++++
 lib/build/sphinx_ext.py | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 10980fc22..458d9e84a 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ Version 2.6.0 beta1
   upon recreation.
 - Removed deprecated ``QueryLocks`` LUXI request. Use
   ``Query(what=QR_LOCK, ...)`` instead.
+- The LUXI requests :pyeval:`luxi.REQ_QUERY_JOBS`,
+  :pyeval:`luxi.REQ_QUERY_INSTANCES`, :pyeval:`luxi.REQ_QUERY_NODES` and
+  :pyeval:`luxi.REQ_QUERY_GROUPS` are deprecated and will be removed in
+  a future version. :pyeval:`luxi.REQ_QUERY` should be used instead.
 
 
 Version 2.5.0 rc5
diff --git a/lib/build/sphinx_ext.py b/lib/build/sphinx_ext.py
index 6967a84c6..bd579ef67 100644
--- a/lib/build/sphinx_ext.py
+++ b/lib/build/sphinx_ext.py
@@ -41,6 +41,7 @@ from ganeti import utils
 from ganeti import opcodes
 from ganeti import ht
 from ganeti import rapi
+from ganeti import luxi
 
 import ganeti.rapi.rlib2 # pylint: disable=W0611
 
@@ -61,7 +62,7 @@ COMMON_PARAM_NAMES = _GetCommonParamNames()
 
 #: Namespace for evaluating expressions
 EVAL_NS = dict(compat=compat, constants=constants, utils=utils, errors=errors,
-               rlib2=rapi.rlib2)
+               rlib2=rapi.rlib2, luxi=luxi)
 
 # Constants documentation for man pages
 CV_ECODES_DOC = "ecodes"
-- 
GitLab