Take sub-statements

src/ncdiff/__init__.py

@@ -142,16 +142,12 @@ def request(self, config, format='xml', target='candidate',
     if default_operation is not None:
         # TODO: check if it is a valid default-operation
         sub_ele(node, "default-operation").text = default_operation
-# <<<<<<< HEAD
-#         node.append(validated_element(config, ("config", qualify("config"))))
-# =======
     if format == 'xml':
         # node.append(validated_element(config, ("config", qualify("config"))))
         _append(node, validated_element(config, ("config", qualify("config"))))
     if format == 'text':
         config_text = sub_ele(node, "config-text")
         sub_ele(config_text, "configuration-text").text = config
-# >>>>>>> juniper
     return self._request(node)
 
 

src/ncdiff/composer.py

@@ -108,12 +108,9 @@ def model_name(self):
             ret = re.search(Tag.BRACE[0], self.path[0])
             if ret:
                 url_to_name = {i[2]: i[0] for i in self.device.namespaces
-                               if i[1] is not None}
+                               if i[1] is not None and i[2] == ret.group(1)}
                 if ret.group(1) in url_to_name:
-                    raise ModelMissing("please load model '{}' by calling "
-                                       "method load_model() of device {}"
-                                       .format(url_to_name[ret.group(1)],
-                                               self.device))
+                    return url_to_name[ret.group(1)]
                 else:
                     raise ModelMissing("unknown model url '{}'"
                                        .format(ret.group(1)))
@@ -123,7 +120,10 @@ def model_name(self):
 
     @property
     def model_ns(self):
-        return self.device.models[self.model_name].url
+        name_to_url = {i[0]: i[2] for i in self.device.namespaces
+                       if i[1] is not None and i[0] == self.model_name}
+        return name_to_url[self.model_name] if self.model_name in name_to_url \
+            else None
 
     @property
     def is_config(self):

src/ncdiff/manager.py

@@ -271,7 +271,9 @@ def scan_models(self, folder='./yang', download='check'):
         if download in ['check', 'force']:
             d = ModelDownloader(self, folder)
             d.download_all(check_before_download=(download == 'check'))
-        self.compiler = ModelCompiler(folder)
+            self.compiler = ModelCompiler(folder, context=d.context)
+        else:
+            self.compiler = ModelCompiler(folder)
 
     def load_model(self, model):
         '''load_model