Update non-namespace paths to start with /services/

Shakeel Mohamed · Shakeel Mohamed · commit 3315a3ed0052 · 2015-07-15T11:12:09.000-07:00
diff --git a/examples/binding1.py b/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)
diff --git a/splunklib/binding.py b/splunklib/binding.py
@@ -910,7 +910,7 @@ def _abspath(self, path_segment,
         # endpoint. Otherwise, use /servicesNS with the specified
         # namespace. If only one of app and owner is specified, use
         # '-' for the other.
-        if ns.app is None and ns.owner is None or path_segment.startswith("server"):
+        if ns.app is None and ns.owner is None:
             return UrlEncoded("/services/%s" % path_segment, skip_encode=skip_encode)
 
         oname = "nobody" if ns.owner is None else ns.owner
diff --git a/splunklib/client.py b/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/"
@@ -434,7 +434,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
@@ -529,7 +529,7 @@ 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")
+        result = self.post("/services/server/control/restart")
         if timeout is None: 
             return result
         start = datetime.now()
@@ -3256,7 +3256,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):
@@ -3269,7 +3269,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
 
 
