Fix for check_config and prefix.

Author: miott

src/cisco_gnmi/client.py

@@ -31,6 +31,9 @@
 from . import util
 
 
+logger = logging.getLogger(__name__)
+
+
 class Client(object):
     """gNMI gRPC wrapper client to ease usage of gNMI.
 
@@ -163,6 +166,9 @@ def get(
             request.use_models = use_models
         if extension:
             request.extension = extension
+
+        logger.debug(str(request))
+
         get_response = self.service.Get(request)
         return get_response
 
@@ -190,7 +196,7 @@ def set(
         """
         request = proto.gnmi_pb2.SetRequest()
         if prefix:
-            request.prefix = prefix
+            request.prefix.CopyFrom(prefix)
         test_list = [updates, replaces, deletes]
         if not any(test_list):
             raise Exception("At least update, replace, or delete must be specified!")
@@ -207,6 +213,9 @@ def set(
             request.delete.extend(deletes)
         if extensions:
             request.extension.extend(extensions)
+
+        logger.debug(str(request))
+
         response = self.service.Set(request)
         return response
 
@@ -244,6 +253,9 @@ def validate_request(request):
                 )
             if extensions:
                 subscribe_request.extensions.extend(extensions)
+
+            logger.debug(str(subscribe_request))
+
             return subscribe_request
 
         response_stream = self.service.Subscribe(

src/cisco_gnmi/xe.py

@@ -30,6 +30,9 @@
 from .client import Client, proto, util
 
 
+logger = logging.getLogger(__name__)
+
+
 class XEClient(Client):
     """IOS XE-specific wrapper for gNMI functionality.
     Assumes IOS XE 16.12+
@@ -108,7 +111,7 @@ def delete_xpaths(self, xpaths, prefix=None):
             paths.append(self.parse_xpath_to_gnmi_path(xpath))
         return self.set(deletes=paths)
 
-    def set_json(self, update_json_configs=None, replace_json_configs=None, ietf=True):
+    def set_json(self, update_json_configs=None, replace_json_configs=None, ietf=True, prefix=None):
         """A convenience wrapper for set() which assumes JSON payloads and constructs desired messages.
         All parameters are optional, but at least one must be present.
 
@@ -132,15 +135,15 @@ def set_json(self, update_json_configs=None, replace_json_configs=None, ietf=Tru
             raise Exception("Must supply at least one set of configurations to method!")
 
         def check_configs(name, configs):
-            if isinstance(name, string_types):
-                logging.debug("Handling %s as JSON string.", name)
+            if isinstance(configs, string_types):
+                logger.debug("Handling %s as JSON string.", name)
                 try:
                     configs = json.loads(configs)
                 except:
                     raise Exception("{name} is invalid JSON!".format(name=name))
                 configs = [configs]
-            elif isinstance(name, dict):
-                logging.debug("Handling %s as already serialized JSON object.", name)
+            elif isinstance(configs, dict):
+                logger.debug("Handling %s as already serialized JSON object.", name)
                 configs = [configs]
             elif not isinstance(configs, (list, set)):
                 raise Exception(
@@ -171,7 +174,7 @@ def create_updates(name, configs):
 
         updates = create_updates("update_json_configs", update_json_configs)
         replaces = create_updates("replace_json_configs", replace_json_configs)
-        return self.set(updates=updates, replaces=replaces)
+        return self.set(prefix=prefix, updates=updates, replaces=replaces)
 
     def get_xpaths(self, xpaths, data_type="ALL", encoding="JSON_IETF"):
         """A convenience wrapper for get() which forms proto.gnmi_pb2.Path from supplied xpaths.