rapi: Re-add “/2” resource

Like “/”, it'll just return a JSON null.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

diff --git a/doc/rapi.rst b/doc/rapi.rst
index a9f413c..5ea41ca 100644 (file)
--- a/doc/rapi.rst
+++ b/doc/rapi.rst
@@ -242,6 +242,11 @@ Resources
 The root resource. Has no function, but for legacy reasons the ``GET``
 method is supported.
 
+``/2``
+++++++
+
+Has no function, but for legacy reasons the ``GET`` method is supported.
+
 ``/2/info``
 +++++++++++
 

diff --git a/lib/rapi/connector.py b/lib/rapi/connector.py
index 26a71af..fad46e4 100644 (file)
--- a/lib/rapi/connector.py
+++ b/lib/rapi/connector.py
@@ -100,6 +100,7 @@ def GetHandlers(node_name_pattern, instance_name_pattern,
   # API.
   return {
     "/": rlib2.R_root,
+    "/2": rlib2.R_2,
 
     "/version": rlib2.R_version,
 

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 80c695b..550af5a 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -161,6 +161,12 @@ class R_root(baserlib.ResourceBase):
     return None
 
 
+class R_2(R_root):
+  """/2 resource.
+
+  """
+
+
 class R_version(baserlib.ResourceBase):
   """/version resource.
 

diff --git a/test/docs_unittest.py b/test/docs_unittest.py
index e75092d..82e5a9d 100755 (executable)
--- a/test/docs_unittest.py
+++ b/test/docs_unittest.py
@@ -142,7 +142,7 @@ class TestDocs(unittest.TestCase):
 
       prevline = line
 
-    prefix_exception = frozenset(["/", "/version"])
+    prefix_exception = frozenset(["/", "/version", "/2"])
 
     undocumented = []
     used_uris = []

diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index 16d4d35..58127e4 100755 (executable)
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -1645,9 +1645,10 @@ class TestSimpleResources(unittest.TestCase):
     handler = _CreateHandler(rlib2.R_2_features, [], {}, None, self.clfactory)
     self.assertEqual(set(handler.GET()), rlib2.ALL_FEATURES)
 
-  def testRoot(self):
-    handler = _CreateHandler(rlib2.R_root, [], {}, None, self.clfactory)
-    self.assertTrue(handler.GET() is None)
+  def testEmpty(self):
+    for cls in [rlib2.R_root, rlib2.R_2]:
+      handler = _CreateHandler(cls, [], {}, None, self.clfactory)
+      self.assertTrue(handler.GET() is None)
 
   def testVersion(self):
     handler = _CreateHandler(rlib2.R_version, [], {}, None, self.clfactory)