sonic-yang-models: error strings are different in libyang3

Author: bradh352

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

@@ -61,8 +61,8 @@ def test_crm_valid_data(self, yang_model, resource, threshold):
 
     @pytest.mark.parametrize(
         "high, low, error_message", [
-            (-1, 70, 'Invalid value "-1"'),
-            (100, -70, 'Invalid value "-70"'),
+            (-1, 70, 'Value "-1" is out of type uint16 min/max bounds'),
+            (100, -70, 'Value "-70" is out of type uint16 min/max bounds'),
             (10, 70, 'high_threshold should be more than low_threshold')]
         )
     def test_crm_thresholds(self, yang_model, resource, threshold, high, low, error_message):
@@ -82,7 +82,7 @@ def test_crm_thresholds(self, yang_model, resource, threshold, high, low, error_
 
     @pytest.mark.parametrize(
         "high, low, th_type, error_message", [
-            (100, 70, 'wrong', 'Value "wrong" does not satisfy the constraint'),
+            (100, 70, 'wrong', 'Unsatisfied pattern'),
             (110, 20, 'percentage', 'Must condition')]
         )
     def test_crm_threshold_type(self, yang_model, resource, high, low, th_type, error_message):

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

@@ -68,8 +68,8 @@ def test_dash_crm_valid_data(self, yang_model, data, resource, threshold):
 
     @pytest.mark.parametrize(
         "high, low, error_message", [
-            (-1, 70, 'Invalid value "-1"'),
-            (100, -70, 'Invalid value "-70"'),
+            (-1, 70, 'Value "-1" is out of type uint16 min/max bounds'),
+            (100, -70, 'Value "-70" is out of type uint16 min/max bounds'),
             (10, 70, 'high_threshold should be more than low_threshold')]
         )
     def test_dash_crm_thresholds(self, yang_model, data, resource, threshold, high, low, error_message):
@@ -87,7 +87,7 @@ def test_dash_crm_thresholds(self, yang_model, data, resource, threshold, high,
 
     @pytest.mark.parametrize(
         "high, low, th_type, error_message", [
-            (100, 70, 'wrong', 'Value "wrong" does not satisfy the constraint'),
+            (100, 70, 'wrong', 'Unsatisfied pattern'),
             (110, 20, 'percentage', 'Must condition')]
         )
     def test_dash_crm_threshold_type(self, yang_model, data, resource, high, low, th_type, error_message):

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

@@ -32,7 +32,7 @@ def test_valid_data(self, yang_model):
     @pytest.mark.parametrize(
         "bridge_name, error_message", [
             ("bridge-midplane", None),
-            ("wrong_name", 'Value "wrong_name" does not satisfy the constraint "bridge-midplane"')]
+            ("wrong_name", 'Unsatisfied pattern')]
         )
     def test_bridge_name(self, yang_model, bridge_name, error_message):
         data = {
@@ -51,7 +51,7 @@ def test_bridge_name(self, yang_model, bridge_name, error_message):
     @pytest.mark.parametrize(
         "ip_prefix, error_message", [
             ("169.254.200.254/24", None),
-            ("169.254.xyz.254/24", 'Value "169.254.xyz.254/24" does not satisfy the constraint')]
+            ("169.254.xyz.254/24", 'Unsatisfied pattern')]
         )
     def test_bridge_ip_prefix(self, yang_model, ip_prefix, error_message):
         data = {
@@ -70,7 +70,7 @@ def test_bridge_ip_prefix(self, yang_model, ip_prefix, error_message):
     @pytest.mark.parametrize(
         "dpu_name, error_message", [
             ("dpu0", None),
-            ("xyz", 'Value "xyz" does not satisfy the constraint "dpu[0-9]+')]
+            ("xyz", 'Unsatisfied pattern')]
         )
     def test_dpu_name(self, yang_model, dpu_name, error_message):
         data = {
@@ -91,7 +91,7 @@ def test_dpu_name(self, yang_model, dpu_name, error_message):
     @pytest.mark.parametrize(
         "midplane_interface, error_message", [
             ("dpu0", None),
-            ("xyz", 'Value "xyz" does not satisfy the constraint "dpu[0-9]+')]
+            ("xyz", 'Unsatisfied pattern')]
         )
     def test_dpu_midplane_interface(self, yang_model, midplane_interface, error_message):
         data = {
@@ -112,7 +112,7 @@ def test_dpu_midplane_interface(self, yang_model, midplane_interface, error_mess
     @pytest.mark.parametrize(
         "port_name, error_message", [
             ("dpu0", None),
-            ("dp0rt0", 'Value "dp0rt0" does not satisfy the constraint "[a-zA-Z]+[0-9]+"')]
+            ("dp0rt0", 'Unsatisfied pattern')]
         )
     def test_dpu_port_name(self, yang_model, port_name, error_message):
         data = {
@@ -139,7 +139,7 @@ def test_dpu_port_name(self, yang_model, port_name, error_message):
     @pytest.mark.parametrize(
         "vip_ipv4, error_message", [
             ("192.168.1.1", None),
-            ("192.168.1.xyz", 'Value "192.168.1.xyz" does not satisfy the constraint')]
+            ("192.168.1.xyz", 'Unsatisfied pattern')]
         )
     def test_dpu_port_vip_ipv4(self, yang_model, vip_ipv4, error_message):
         data = {
@@ -166,7 +166,7 @@ def test_dpu_port_vip_ipv4(self, yang_model, vip_ipv4, error_message):
     @pytest.mark.parametrize(
         "vip_ipv6, error_message", [
             ("2001:db8::1", None),
-            ("2001:db8::xyz", 'Value "2001:db8::xyz" does not satisfy the constraint')]
+            ("2001:db8::xyz", 'Unsatisfied pattern')]
         )
     def test_dpu_port_vip_ipv6(self, yang_model, vip_ipv6, error_message):
         data = {
@@ -193,7 +193,7 @@ def test_dpu_port_vip_ipv6(self, yang_model, vip_ipv6, error_message):
     @pytest.mark.parametrize(
         "pa_ipv4, error_message", [
             ("192.168.1.2", None),
-            ("192.168.1.xyz", 'Value "192.168.1.xyz" does not satisfy the constraint')]
+            ("192.168.1.xyz", 'Unsatisfied pattern')]
         )
     def test_dpu_port_pa_ipv4(self, yang_model, pa_ipv4, error_message):
         data = {
@@ -220,7 +220,7 @@ def test_dpu_port_pa_ipv4(self, yang_model, pa_ipv4, error_message):
     @pytest.mark.parametrize(
         "pa_ipv6, error_message", [
             ("2001:db8::2", None),
-            ("2001:db8::xyz", 'Value "2001:db8::xyz" does not satisfy the constraint')]
+            ("2001:db8::xyz", 'Unsatisfied pattern')]
         )
     def test_dpu_port_pa_ipv6(self, yang_model, pa_ipv6, error_message):
         data = {
@@ -247,7 +247,7 @@ def test_dpu_port_pa_ipv6(self, yang_model, pa_ipv6, error_message):
     @pytest.mark.parametrize(
         "gnmi_port, error_message", [
             (8080, None),
-            (99999, 'Invalid value "99999" in "gnmi_port" element.')]
+            (99999, 'Value "99999" is out of type uint16 min/max bounds')]
         )
     def test_dpu_port_gnmi(self, yang_model, gnmi_port, error_message):
         data = {

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

@@ -40,27 +40,23 @@ class Test_yang_models:
     def initTest(self):
         self.defaultYANGFailure = {
             'Must': ['Must condition', 'not satisfied'],
-            'InvalidValue': ['Invalid value'],  # libyang3: ['Invalid', 'value', 'Data path']
-            'LeafRef': ['Leafref', 'non-existing'], #libyang3: ['Invalid leafref', 'no target instance']
+            'InvalidValue': ['Invalid', 'value', 'Data path'],
+            'LeafRef': ['Invalid leafref', 'no target instance'],
             'When': ['When condition', 'not satisfied'],
-            'Pattern': ['pattern', 'does not satisfy'], #libyang3: ['pattern', 'Unsatisfied pattern']
-            'Mandatory': ['required element', 'Missing'], #libyang3: ['Mandatory node', 'does not exist']
+            'Pattern': ['pattern', 'Unsatisfied pattern'],
+            'Mandatory': ['Mandatory node', 'does not exist'],
             'Verify': ['verified'],
-            'Range': ['does not satisfy', 'range'], #libyang3: ['Unsatisfied range']
+            'Range': ['Unsatisfied range'],
             'MinElements': ['Too few'],
             'MaxElements': ['Too many'],
-            'UnknownElement': ['Unknown element'],
+            'UnknownElement': ['not found as a child'],
             'None': [],
-# New keys are needed for libyang3's messages which are different.  Go
-# ahead and add them now with the libyang1 values (which are duplicates
-# of the above).  This will make migrating to libyang3 easier with less
-# code review.
-            'Length': ['does not satisfy', 'range'], # libyang3: ['Unsatisfied length']
-            'DecimalFractionExceed': ['Invalid value'], # libyang3: ['Value', 'exceeds defined number', 'fraction digits']
-            'Bounds': ['Invalid value'], #libyang3 ['Value', 'out of type', 'min/max bounds'],
-            'ListKey': ['Missing required element'], #libyang3 ['List instance is missing its key']
-            'DateTime': ['pattern', 'does not satisfy'], #libyang3: ['Invalid date-and-time']
-            'IPv4': ['pattern', 'does not satisfy'], #libyang3 ['Failed to convert IPv4 address'],
+            'Length': ['Unsatisfied length'],
+            'DecimalFractionExceed': ['Value', 'exceeds defined number', 'fraction digits'],
+            'Bounds': ['Value', 'out of type', 'min/max bounds'],
+            'ListKey': ['List instance is missing its key'],
+            'DateTime': ['Invalid date-and-time'],
+            'IPv4': ['Failed to convert IPv4 address'],
         }
 
         self.ExceptionTests = { }