test/infamy: improve feedback on netconf/restconf error a bit

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

Author: troglobit

test/infamy/netconf.py

@@ -319,15 +319,25 @@ def put_config_dicts(self, models):
         infer_put_dict(self.name, models)
 
         for model in models.keys():
-            mod = self.ly.get_module(model)
+            try:
+                mod = self.ly.get_module(model)
+            except libyang.util.LibyangError:
+                raise Exception(f"YANG model '{model}' not found on device. "
+                               f"Model may not be installed or enabled. "
+                               f"Available models can be checked with get_schema_list()") from None
             lyd = mod.parse_data_dict(models[model], no_state=True, validate=False)
             config += lyd.print_mem("xml", with_siblings=True, pretty=False) + "\n"
         # print(f"Send new XML config: {config}")
         return self.put_config(config)
 
     def put_config_dict(self, modname, edit):
         """Convert Python dictionary to XMl and send as configuration"""
-        mod = self.ly.get_module(modname)
+        try:
+            mod = self.ly.get_module(modname)
+        except libyang.util.LibyangError:
+            raise Exception(f"YANG model '{modname}' not found on device. "
+                           f"Model may not be installed or enabled. "
+                           f"Available models can be checked with get_schema_list()") from None
         lyd = mod.parse_data_dict(edit, no_state=True, validate=False)
         config = lyd.print_mem("xml", with_siblings=True, pretty=False)
         # print(f"Send new XML config: {config}")
@@ -339,7 +349,12 @@ def call(self, call):
 
     def call_dict(self, modname, call):
         """Call RPC, Python dictionary version"""
-        mod = self.ly.get_module(modname)
+        try:
+            mod = self.ly.get_module(modname)
+        except libyang.util.LibyangError:
+            raise Exception(f"YANG model '{modname}' not found on device. "
+                           f"Model may not be installed or enabled. "
+                           f"Available models can be checked with get_schema_list()") from None
         lyd = mod.parse_data_dict(call, rpc=True)
         return self.call(lyd.print_mem("xml", with_siblings=True, pretty=False))
 

test/infamy/restconf.py

@@ -266,7 +266,12 @@ def put_config_dicts(self, models):
         running = self.get_running()
 
         for model in models.keys():
-            mod = self.lyctx.get_module(model)
+            try:
+                mod = self.lyctx.get_module(model)
+            except libyang.util.LibyangError:
+                raise Exception(f"YANG model '{model}' not found on device. "
+                               f"Model may not be installed or enabled. "
+                               f"Available models can be checked with get_schema_list()") from None
             lyd = mod.parse_data_dict(models[model], no_state=True, validate=False)
             running.merge(lyd)
 
@@ -279,7 +284,12 @@ def put_config_dict(self, modname, edit):
 
         # This is hacky, refactor when rousette have PATCH support.
         running = self.get_running()
-        mod = self.lyctx.get_module(modname)
+        try:
+            mod = self.lyctx.get_module(modname)
+        except libyang.util.LibyangError:
+            raise Exception(f"YANG model '{modname}' not found on device. "
+                           f"Model may not be installed or enabled. "
+                           f"Available models can be checked with get_schema_list()") from None
 
         for k, _ in edit.items():
             module = modname + ":" + k