fix test cases

Author: bradh352

cvl/cvl_error_test.go

@@ -67,18 +67,24 @@ func expandMessagePatterns(ex *CVLErrorInfo) {
 		ex.Msg = strings.ReplaceAll(ex.Msg, "{{field}}", ex.Field)
 		ex.Msg = strings.ReplaceAll(ex.Msg, "{{value}}", ex.Value)
 		ex.Msg = strings.TrimSuffix(ex.Msg, " \"\"") // if value is empty
+	case invalidValueNoValueErrMessage:
+		ex.Msg = strings.ReplaceAll(ex.Msg, "{{field}}", ex.Field)
 	case unknownFieldErrMessage:
 		ex.Msg = strings.ReplaceAll(ex.Msg, "{{field}}", ex.Field)
+	case missingKeyErrMessage:
+		ex.Msg = strings.ReplaceAll(ex.Msg, "{{field}}", ex.Field)
 	}
 }
 
 const (
-	invalidValueErrMessage   = "Field \"{{field}}\" has invalid value \"{{value}}\""
-	unknownFieldErrMessage   = "Unknown field \"{{field}}\""
-	genericValueErrMessage   = "Data validation failed"
-	mustExpressionErrMessage = "Must expression validation failed"
-	whenExpressionErrMessage = "When expression validation failed"
-	instanceInUseErrMessage  = "Validation failed for Delete operation, given instance is in use"
+	invalidValueErrMessage        = "Field \"{{field}}\" has invalid value \"{{value}}\""
+	invalidValueNoValueErrMessage = "Field \"{{field}}\" has invalid value"
+	unknownFieldErrMessage        = "Unknown field \"{{field}}\""
+	genericValueErrMessage        = "Data validation failed"
+	mustExpressionErrMessage      = "Must expression validation failed"
+	whenExpressionErrMessage      = "When expression validation failed"
+	instanceInUseErrMessage       = "Validation failed for Delete operation, given instance is in use"
+	missingKeyErrMessage          = "Missing Key \"{{field}}\"."
 )
 
 func verifyValidateEditConfig(t *testing.T, data []CVLEditConfigData, exp CVLErrorInfo) {

cvl/cvl_test.go

@@ -1559,10 +1559,10 @@ func TestValidateEditConfig_Create_Syntax_IncompleteKey_Negative(t *testing.T) {
 	}
 
 	verifyValidateEditConfig(t, cfgData, CVLErrorInfo{
-		ErrCode:   cvl.CVL_SYNTAX_MISSING_FIELD,
+		ErrCode:   CVL_SYNTAX_ERROR,
 		TableName: "ACL_RULE",
-		Field:     "aclname",
-		Msg:       invalidValueErrMessage,
+		Field:     "rulename",
+		Msg:       missingKeyErrMessage,
 	})
 }
 
@@ -1783,10 +1783,10 @@ func TestValidateEditConfig_Delete_InvalidKey_Negative(t *testing.T) {
 	}
 
 	verifyValidateEditConfig(t, cfgData, CVLErrorInfo{
-		ErrCode:   cvl.CVL_SYNTAX_MISSING_FIELD,
+		ErrCode:   CVL_SYNTAX_ERROR,
 		TableName: "ACL_RULE",
-		Field:     "aclname",
-		Msg:       invalidValueErrMessage,
+		Field:     "rulename",
+		Msg:       missingKeyErrMessage,
 	})
 }
 
@@ -1811,10 +1811,10 @@ func TestValidateEditConfig_Update_Semantic_Invalid_Key_Negative(t *testing.T) {
 	}
 
 	verifyValidateEditConfig(t, cfgData, CVLErrorInfo{
-		ErrCode:   cvl.CVL_SYNTAX_MISSING_FIELD,
+		ErrCode:   CVL_SYNTAX_ERROR,
 		TableName: "ACL_RULE",
-		Field:     "aclname",
-		Msg:       invalidValueErrMessage,
+		Field:     "rulename",
+		Msg:       missingKeyErrMessage,
 	})
 }
 

cvl/cvl_when_test.go

@@ -22,6 +22,7 @@ package cvl_test
 import (
 	"testing"
 
+	"github.com/Azure/sonic-mgmt-common/cvl"
 	cmn "github.com/Azure/sonic-mgmt-common/cvl/common"
 )
 
@@ -44,7 +45,8 @@ func TestValidateEditConfig_When_Exp_In_Choice_Negative(t *testing.T) {
 			map[string]string{
 				"PACKET_ACTION":     "FORWARD",
 				"IP_TYPE":           "IPV6",
-				"SRC_IP":            "10.1.1.1/32", //Invalid field
+				"SRC_IP":            "10.1.1.1/32", //Invalid field due to IP_TYPE
+				"DST_IP":            "10.1.1.2/32", //Invalid too
 				"L4_SRC_PORT":       "1909",
 				"IP_PROTOCOL":       "103",
 				"L4_DST_PORT_RANGE": "9000-12000",
@@ -54,12 +56,12 @@ func TestValidateEditConfig_When_Exp_In_Choice_Negative(t *testing.T) {
 	}
 
 	verifyValidateEditConfig(t, cfgDataRule, CVLErrorInfo{
-		ErrCode:   CVL_SEMANTIC_ERROR,
+		ErrCode:   cvl.CVL_SYNTAX_MISSING_FIELD,
 		TableName: "ACL_RULE",
-		//Keys:      []string{"TestACL1", "Rule1"},  <<< BUG: cvl is not populating the key
-		Field: "SRC_IP",
-		Value: "10.1.1.1/32",
-		Msg:   whenExpressionErrMessage,
+		Keys:      []string{"TestACL1", "Rule1"},
+		Field:     "DST_IP",
+		Value:     "10.1.1.2/32",
+		Msg:       whenExpressionErrMessage,
 	})
 }
 

cvl/internal/yparser/yparser.go

@@ -600,10 +600,6 @@ func (yp *YParser) mergeDepData(data *(*C.struct_lyd_node), depData *YParserNode
 
 // ValidateSyntax Perform syntax checks
 func (yp *YParser) ValidateSyntax(data *YParserNode, depData *YParserNode) YParserError {
-	if data == nil {
-		return YParserError{ErrCode: YP_INTERNAL_UNKNOWN}
-	}
-
 	dataPtr := (*C.struct_lyd_node)(data)
 
 	if depData != nil {