Path handling fixes for NX/XR

Author: remingtonc

src/cisco_gnmi/nx.py

@@ -157,7 +157,9 @@ def parse_xpath_to_gnmi_path(self, xpath, origin=None):
                 "OpenConfig data models not yet supported on NX-OS!"
             )
         if origin is None:
-            if any(map(xpath.startswith, ["Cisco-NX-OS-device", "ietf-interfaces"])):
+            if any(
+                map(xpath.startswith, ["Cisco-NX-OS-device", "/Cisco-NX-OS-device"])
+            ):
                 origin = "device"
                 # Remove the module
                 xpath = xpath.split(":", 1)[1]

src/cisco_gnmi/xr.py

@@ -346,6 +346,7 @@ def parse_xpath_to_gnmi_path(self, xpath, origin=None):
             else:
                 # module name
                 origin, xpath = xpath.split(":", 1)
+                origin = origin.strip("/")
         return super(XRClient, self).parse_xpath_to_gnmi_path(xpath, origin)
 
     def parse_cli_to_gnmi_path(self, command):