Amend doc/formatting

Author: remingtonc

src/cisco_gnmi/xr.py

@@ -215,6 +215,31 @@ def get_xpaths(self, xpaths, data_type="ALL", encoding="JSON_IETF"):
             )
         return self.get(gnmi_path, data_type=data_type, encoding=encoding)
 
+    def get_cli(self, commands):
+        """A convenience wrapper for get() which forms proto.gnmi_pb2.Path from supplied CLI commands.
+        IOS XR appears to be the only OS with this functionality.
+
+        Parameters
+        ----------
+        commands : iterable of str or str
+            An iterable of CLI commands as strings to request data of
+            If simply a str, wraps as a list for convenience
+
+        Returns
+        -------
+        get()
+        """
+        gnmi_path = None
+        if isinstance(commands, (list, set)):
+            gnmi_path = list(map(self.parse_cli_to_gnmi_path, commands))
+        elif isinstance(commands, string_types):
+            gnmi_path = [self.parse_cli_to_gnmi_path(commands)]
+        else:
+            raise Exception(
+                "commands must be a single CLI command string or iterable of CLI commands as strings!"
+            )
+        return self.get(gnmi_path, encoding="ASCII")
+
     def subscribe_xpaths(
         self,
         xpath_subscriptions,
@@ -343,43 +368,16 @@ def parse_xpath_to_gnmi_path(self, xpath, origin=None):
                 origin, xpath = xpath.split(":", 1)
         return super(XRClient, self).parse_xpath_to_gnmi_path(xpath, origin)
 
-    def get_cli_commands(self, cli_commands):
-        """A convenience wrapper for get() which forms proto.gnmi_pb2.Path from supplied CLI commands.
-
-        Parameters
-        ----------
-        cli_commands : iterable of str or str
-            An iterable of CLI commands as strings to request data of
-            If simply a str, wraps as a list for convenience
-
-        Returns
-        -------
-        get()
-        """
-        gnmi_path = None
-        if isinstance(cli_commands, (list, set)):
-            gnmi_path = map(self.parse_cli_command_to_gnmi_path, set(cli_commands))
-        elif isinstance(cli_commands, string_types):
-            gnmi_path = [self.parse_cli_command_to_gnmi_path(cli_commands)]
-        else:
-            raise Exception(
-                "cli_commands must be a single CLI command string or iterable of CLI commands as strings!"
-            )
-        return self.get(gnmi_path, encoding='ASCII')
-
-    def parse_cli_command_to_gnmi_path(self, cli_command):
+    def parse_cli_to_gnmi_path(self, command):
         """Parses a CLI command to proto.gnmi_pb2.Path.
-        This function should be overridden by any child classes for origin logic.
+        IOS XR appears to be the only OS with this functionality.
 
         The CLI command becomes a path element.
         """
-        if not isinstance(cli_command, string_types):
-            raise Exception("cli_command must be a string!")
-
+        if not isinstance(command, string_types):
+            raise Exception("command must be a string!")
         path = proto.gnmi_pb2.Path()
         curr_elem = proto.gnmi_pb2.PathElem()
-        curr_elem.name = cli_command
+        curr_elem.name = command
         path.elem.extend([curr_elem])
-
         return path
-