Merge branch 'develop'

Author: miott

src/cisco_gnmi/xe.py

@@ -111,84 +111,6 @@ def delete_xpaths(self, xpaths, prefix=None):
             paths.append(self.parse_xpath_to_gnmi_path(xpath))
         return self.set(deletes=paths)
 
-    def check_configs(self, configs):
-        if isinstance(configs, string_types):
-            logger.debug("Handling as JSON string.")
-            try:
-                configs = json.loads(configs)
-            except:
-                raise Exception("{0}\n is invalid JSON!".format(configs))
-            configs = [configs]
-        elif isinstance(configs, dict):
-            logger.debug("Handling already serialized JSON object.")
-            configs = [configs]
-        elif not isinstance(configs, (list, set)):
-            raise Exception(
-                "{0} must be an iterable of configs!".format(str(configs))
-            )
-        return configs
-
-    def create_updates(self, configs, origin, json_ietf=True):
-        """Check configs, and construct "Update" messages.
-
-        Parameters
-        ----------
-        configs: dict of <xpath>: <dict val for JSON>
-        origin: None or 'openconfig'
-        json_ietf: bool encoding type for Update val (default True)
-
-        Returns
-        -------
-        List of Update messages with val populated.
-
-        If a set of configs contain a common Xpath, the Update must contain
-        a consolidation of xpath/values for 2 reasons:
-
-        1. Devices may have a restriction on how many Update messages it will
-           accept at once.
-        2. Some xpath/values are required to be set in same Update because of
-           dependencies like leafrefs, mandatory settings, and if/when/musts.
-        """
-        if not configs:
-            return None
-        configs = self.check_configs(configs)
-
-        xpaths = []
-        updates = []
-        for config in configs:
-            xpath = next(iter(config.keys()))
-            xpaths.append(xpath)
-        common_xpath = os.path.commonprefix(xpaths)
-
-        if common_xpath:
-            update_configs = self.get_payload(configs)
-            for update_cfg in update_configs:
-                xpath, payload = update_cfg
-                update = proto.gnmi_pb2.Update()
-                update.path.CopyFrom(
-                    self.parse_xpath_to_gnmi_path(
-                        xpath, origin=origin
-                    )
-                )
-                if json_ietf:
-                    update.val.json_ietf_val = payload
-                else:
-                    update.val.json_val = payload
-                updates.append(update)
-            return updates
-        else:
-            for config in configs:
-                top_element = next(iter(config.keys()))
-                update = proto.gnmi_pb2.Update()
-                update.path.CopyFrom(self.parse_xpath_to_gnmi_path(top_element))
-                config = config.pop(top_element)
-                if json_ietf:
-                    update.val.json_ietf_val = json.dumps(config).encode("utf-8")
-                else:
-                    update.val.json_val = json.dumps(config).encode("utf-8")
-                updates.append(update)
-            return updates
-
     def set_json(self, update_json_configs=None, replace_json_configs=None,
                  origin='device', json_ietf=True):
         """A convenience wrapper for set() which assumes JSON payloads and constructs desired messages.