Merge branch 'bug/namespace-for-server-endpoints' into develop

Author: Shakeel Mohamed

examples/binding1.py

@@ -42,10 +42,10 @@ def indexes(self):
         return self.context.get("data/indexes")
 
     def info(self):
-        return self.context.get("server/info")
+        return self.context.get("/services/server/info")
 
     def settings(self):
-        return self.context.get("server/settings")
+        return self.context.get("/services/server/settings")
 
     def search(self, query, **kwargs):
         return self.context.post("search/jobs/export", search=query, **kwargs)

splunklib/client.py

@@ -93,7 +93,7 @@
 PATH_INDEXES = "data/indexes/"
 PATH_INPUTS = "data/inputs/"
 PATH_JOBS = "search/jobs/"
-PATH_LOGGER = "server/logger/"
+PATH_LOGGER = "/services/server/logger/"
 PATH_MESSAGES = "messages/"
 PATH_MODULAR_INPUTS = "data/modular-inputs"
 PATH_ROLES = "authorization/roles/"
@@ -445,7 +445,7 @@ def info(self):
         :return: The system information, as key-value pairs.
         :rtype: ``dict``
         """
-        response = self.get("server/info")
+        response = self.get("/services/server/info")
         return _filter_content(_load_atom(response, MATCH_ENTRY_CONTENT))
 
     @property
@@ -540,8 +540,8 @@ def restart(self, timeout=None):
         msg = { "value": "Restart requested by " + self.username + "via the Splunk SDK for Python"}
         # This message will be deleted once the server actually restarts.
         self.messages.create(name="restart_required", **msg)
-        result = self.post("server/control/restart")
-        if timeout is None:
+        result = self.post("/services/server/control/restart")
+        if timeout is None: 
             return result
         start = datetime.now()
         diff = timedelta(seconds=timeout)
@@ -3268,7 +3268,7 @@ class Settings(Entity):
     """This class represents configuration settings for a Splunk service.
     Retrieve this collection using :meth:`Service.settings`."""
     def __init__(self, service, **kwargs):
-        Entity.__init__(self, service, "server/settings", **kwargs)
+        Entity.__init__(self, service, "/services/server/settings", **kwargs)
 
     # Updates on the settings endpoint are POSTed to server/settings/settings.
     def update(self, **kwargs):
@@ -3281,7 +3281,7 @@ def update(self, **kwargs):
         :type kwargs: ``dict``
         :return: The :class:`Settings` collection.
         """
-        self.service.post("server/settings/settings", **kwargs)
+        self.service.post("/services/server/settings/settings", **kwargs)
         return self
 
 

tests/test_service.py

@@ -45,6 +45,22 @@ def test_info(self):
         for key in keys: 
             self.assertTrue(key in info.keys())
 
+    def test_info_with_namespace(self):
+        # Make sure we're not accessing /servicesNS/admin/search/server/info
+        # instead of /services/server/info
+        # Backup the values, which are probably set to None
+        owner, app = self.service.namespace["owner"], self.service.namespace["app"]
+
+        self.service.namespace["owner"] = self.service.username
+        self.service.namespace["app"] = "search"
+        try:
+            self.assertEqual(self.service.info.licenseState, 'OK')
+        except HTTPError as he:
+            self.fail("Couldn't get the server info, probably got a 403! %s" % he.message)
+
+        self.service.namespace["owner"] = owner
+        self.service.namespace["app"] = app
+
     def test_without_namespace(self):
         service = client.connect(**self.opts.kwargs)
         service.apps.list()