Merge 73a66ee into c9cdf79

napalm_yang/parser.py

@@ -26,28 +26,28 @@ def __init__(self, model, device=None, profile=None, is_config=None,
         self.extra_vars = extra_vars or {}
 
         if self.mapping and device:
-            device_config = self._execute_methods(device,
+            device_output = self._execute_methods(device,
                                                   self.mapping["metadata"].get("execute", []))
 
         else:
-            device_config = []
+            device_output = []
 
         native = native or []
 
         self.native = []
 
-        for n in native + device_config:
+        for n in native + device_output:
             self.native.append(n.replace("\r", ""))  # Parsing will be easier
 
         if not self.native:
             raise Exception("I don't have any data to operate with")
 
-        self.bookmarks = {self._yang_name: self.native, "parent": self.native}
-        self.bookmarks = bookmarks or self.bookmarks
-
         if self.mapping:
             self.parser = helpers.get_parser(self.mapping["metadata"]["parser"])
 
+        self.bookmarks = {self._yang_name: self.native, "parent": self.native}
+        self.bookmarks = bookmarks or self.bookmarks
+
     def _execute_methods(self, device, methods):
         result = []
         for m in methods:
@@ -67,6 +67,7 @@ def _execute_methods(self, device, methods):
     def parse(self):
         if not self.mapping:
             return
+        self.native = self.parser.init_native(self.native)
         self._parse(self._yang_name, self.model, self.mapping[self._yang_name])
 
     def _parse(self, attribute, model, mapping):

napalm_yang/parsers/base.py

@@ -3,8 +3,8 @@
 class BaseParser(object):
 
     @classmethod
-    def init_config(cls, config):
-        return config
+    def init_native(cls, native):
+        return native
 
     @classmethod
     def parse_list(cls, mapping):