asd

napalm-automation · Apr 28, 2017 · e130018 · e130018
1 parent eab0b34
commit e130018
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/napalm_yang/parser.py b/napalm_yang/parser.py
@@ -15,11 +15,11 @@ def __init__(self, model, device=None, profile=None, is_config=None,
         self.device = device
         self.profile = profile or device.profile
         self.is_config = is_config
-        self._original_module = model._original_module
+        self._defining_module = model._defining_module
         self._yang_name = model._yang_name
 
         parser_path = os.path.join("parsers", "config" if is_config else "state")
-        self.mapping = helpers.read_yang_map(model._original_module, model._yang_name,
+        self.mapping = helpers.read_yang_map(model._defining_module, model._yang_name,
                                              self.profile, parser_path)
 
         self.keys = keys or {"parent_key": None}
@@ -93,8 +93,8 @@ def _parse_container(self, attribute, model, mapping):
                     and v._yang_type not in ("container", "list"):
                 continue
 
-            if v._original_module != self._original_module and v._original_module is not None:
-                logger.debug("Skipping attribute: {}:{}".format(v._original_module, attribute))
+            if v._defining_module != self._defining_module and v._defining_module is not None:
+                logger.debug("Skipping attribute: {}:{}".format(v._defining_module, attribute))
                 parser = Parser(v, self.device, self.profile, self.is_config, self.native,
                                 self.keys, self.bookmarks, self.extra_vars)
                 parser.parse()

diff --git a/napalm_yang/translator.py b/napalm_yang/translator.py
@@ -24,7 +24,7 @@ def __init__(self, model, profile,
                  merge=None, replace=None, other=None):
         self.model = model
         self.profile = profile
-        self._original_module = model._original_module
+        self._defining_module = model._defining_module
         self._yang_name = model._yang_name
 
         self.translation = translation
@@ -35,7 +35,7 @@ def __init__(self, model, profile,
         self.replace = replace
         self.other = other or merge or replace
 
-        self.mapping = helpers.read_yang_map(model._original_module, model._yang_name,
+        self.mapping = helpers.read_yang_map(model._defining_module, model._yang_name,
                                              self.profile, "translators")
 
         if self.mapping:
@@ -82,11 +82,11 @@ def _translate_container(self, attribute, model, mapping, translation, other):
             logger.debug("Parsing attribute: {}".format(v._yang_path()))
             other_attr = getattr(other, k, None)
             if not v._is_config or k == "state":
-                logger.debug("Skipping attribute: {}:{}".format(v._original_module, attribute))
+                logger.debug("Skipping attribute: {}:{}".format(v._defining_module, attribute))
                 continue
 
-            if v._original_module != self._original_module and v._original_module is not None:
-                logger.debug("Skipping attribute: {}:{}".format(v._original_module, attribute))
+            if v._defining_module != self._defining_module and v._defining_module is not None:
+                logger.debug("Skipping attribute: {}:{}".format(v._defining_module, attribute))
                 translator = Translator(v, self.profile, translation_point, self.keys,
                                         self.bookmarks, self.merge, self.replace, other_attr)
                 translator.translate()