sonic-yang-models: Port code to new libyang-py3

Author: bradh352

src/sonic-yang-models/tests/yang_model_pytests/conftest.py

@@ -1,37 +1,38 @@
 import os
 import pytest
-import yang as ly
+import libyang as ly
 from json import dumps
 from glob import glob
 
-
 class YangModel:
 
     def __init__(self) -> None:
         cur_dir = os.path.dirname(os.path.abspath(__file__))
         project_root = os.path.abspath(os.path.join(cur_dir, '..', '..'))
         self.model_dir = os.path.join(project_root, 'yang-models')
-
         self._load_model()
 
+    def __del__(self) -> None:
+        self.ctx.destroy()
+        self.ctx = None
+
     def _load_model(self) -> None:
-        self.ctx = ly.Context(self.model_dir)
+        self.ctx = ly.Context(self.model_dir, loose_json_datatypes=True)
         yang_files = glob(self.model_dir +"/*.yang")
-
         for file in yang_files:
-            m = self.ctx.parse_module_path(file, ly.LYS_IN_YANG)
-            if not m:
-                raise RuntimeError("Failed to parse '{file}' model")
+            with open(file, 'r') as f:
+                m = self.ctx.parse_module_file(f, "yang")
+                if not m:
+                    raise RuntimeError("Failed to parse '{file}' model")
 
     def _load_data(self, data) -> None:
-        self.ctx.parse_data_mem(dumps(data), ly.LYD_JSON,
-                                ly.LYD_OPT_CONFIG | ly.LYD_OPT_STRICT)
+        dnode = self.ctx.parse_data_mem(dumps(data), "json", strict=True, no_state=True)
+        dnode.free()
 
     def load_data(self, data, expected_error=None) -> None:
         if expected_error:
-            with pytest.raises(RuntimeError) as exc_info:
+            with pytest.raises(Exception) as exc_info:
                 self._load_data(data)
-
             assert expected_error in str(exc_info)
         else:
             self._load_data(data)

src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py

@@ -1,11 +1,12 @@
 # This script is used to
 
-import yang as ly
+import libyang as ly
 import logging
 import argparse
 import sys
 import ijson
 import json
+import pytest
 #import sonic_yang as sy
 from glob import glob
 from os import listdir
@@ -63,6 +64,7 @@ def initTest(self):
         }
 
         self.ExceptionTests = { }
+        self.FailedTests = []
 
         for test_file in glob("./tests/yang_model_tests/tests/*.json"):
             try:
@@ -116,17 +118,18 @@ def loadYangModel(self, yangDir):
 
         try:
             # create context
-            self.ctx = ly.Context(yangDir)
+            self.ctx = ly.Context(yangDir, loose_json_datatypes=True)
             # get all files
             yangFiles = glob(yangDir +"/*.yang")
             # load yang modules
             for file in yangFiles:
                 log.debug(file)
-                m = self.ctx.parse_module_path(file, ly.LYS_IN_YANG)
-                if m is not None:
-                    log.info("module: {} is loaded successfully".format(m.name()))
-                else:
-                    log.info("Could not load module: {}".format(file))
+                with open(file, 'r') as f:
+                    m = self.ctx.parse_module_file(f, "yang")
+                    if m is not None:
+                        log.info("module: {} is loaded successfully".format(m.name()))
+                    else:
+                        log.info("Could not load module: {}".format(file))
 
         except Exception as e:
             printExceptionDetails()
@@ -178,26 +181,35 @@ def logStartTest(self, desc):
     """
     def loadConfigData(self, jInput, verify=None):
         s = ""
+        node = None
+        try:
+            node = self.ctx.parse_data_mem(jInput, "json", strict=True, no_state=True)
+        except Exception as e:
+            printExceptionDetails()
+            s = str(e)
+            log.info(s)
+            return s
+
         try:
-            node = self.ctx.parse_data_mem(jInput, ly.LYD_JSON, \
-            ly.LYD_OPT_CONFIG | ly.LYD_OPT_STRICT)
             # verify the data tree if asked
             if verify is not None:
                 xpath = verify['xpath']
                 log.info("Verify xpath: {}".format(xpath))
-                set = node.find_path(xpath)
-                for dnode in set.data():
+                nodes = node.find_all(xpath)
+                for dnode in nodes:
                     if (xpath == dnode.path()):
                         log.info("Verify dnode: {}".format(dnode.path()))
-                        data = dnode.print_mem(ly.LYD_JSON, ly.LYP_WITHSIBLINGS \
-                            | ly.LYP_FORMAT | ly.LYP_WD_ALL)
+                        data = dnode.print_mem("json", with_siblings=True, pretty=True, include_implicit_defaults=True)
                         data = json.loads(data)
-                        log.info("Verify data: {}".format(data))
+                        log.info("Verify path value {} is {} in {}".format(verify['key'], verify['value'], data))
+                        assert (verify['key'] in data)
                         assert (data[verify['key']] == verify['value'])
                         s = 'verified'
         except Exception as e:
-            s = str(e)
-            log.info(s)
+            printExceptionDetails()
+
+        node.free()
+
         return s
 
     """
@@ -221,9 +233,12 @@ def runExceptionTest(self, test):
                 log.info(desc + " Passed\n")
                 return PASS
             else:
-                raise Exception("Mismatch {} and {}".format(eStr, s))
+                errstr = "{}: Mismatch {} and {}".format(test, eStr, s)
+                self.FailedTests.append(errstr)
+                raise Exception(errstr)
         except Exception as e:
             printExceptionDetails()
+
         log.info(desc + " Failed\n")
         return FAIL
 
@@ -253,7 +268,9 @@ def runVlanSpecialTest(self, test):
                 log.debug(jInput)
                 s = self.loadConfigData(json.dumps(jInput))
                 if s!="":
-                    raise Exception("{} in not empty".format(s))
+                    errstr="{}[{}]: {} in not empty".format(test,i,s)
+                    self.FailedTests.append(errstr)
+                    raise Exception(errstr)
             return PASS
         except Exception as e:
             printExceptionDetails()
@@ -282,6 +299,17 @@ def test_run_tests(self):
             ret = FAIL * len(self.tests)
             printExceptionDetails()
 
+        if len(self.FailedTests):
+            print("{} Failures:".format(len(self.FailedTests)))
+            log.error("{} Failures:".format(len(self.FailedTests)))
+            for x in self.FailedTests:
+                print(x)
+                log.error(x)
+
+        if self.ctx:
+            self.ctx.destroy()
+            self.ctx = None
+
         assert ret == 0
         return
 # End of Class