getRedisToYangKeys() needs to return an error object

Author: bradh352

cvl/cvl.go

@@ -800,7 +800,9 @@ func getRedisTblToYangList(tableName, key string) (yangList string) {
 
 // Convert Redis key to Yang keys, if multiple key components are there,
 // they are separated based on Yang schema
-func getRedisToYangKeys(tableName string, redisKey string) []keyValuePairStruct {
+func getRedisToYangKeys(tableName string, redisKey string) ([]keyValuePairStruct, CVLErrorInfo) {
+	var cvlErrObj CVLErrorInfo
+
 	keyNames := modelInfo.tableInfo[tableName].keys
 	//First split all the keys components
 	keyVals := strings.Split(redisKey, modelInfo.tableInfo[tableName].redisKeyDelim) //split by DB separator
@@ -809,7 +811,16 @@ func getRedisToYangKeys(tableName string, redisKey string) []keyValuePairStruct
 		modelInfo.tableInfo[tableName].redisKeyDelim) //split by DB separator
 
 	if len(keyNames) != len(keyVals) {
-		return nil //number key names and values does not match
+		cvlErrObj.ErrCode = CVL_SEMANTIC_KEY_INVALID
+		cvlErrObj.TableName = tableName
+		cvlErrObj.Keys = keyNames
+		if len(keyNames) < len(keyVals) {
+			cvlErrObj.Msg = "Too many keys specified."
+		} else {
+			cvlErrObj.Msg = "Missing Key \"" + keyNames[len(keyVals)] + "\"."
+			cvlErrObj.Field = keyNames[len(keyVals)]
+		}
+		return nil, cvlErrObj //number key names and values does not match
 	}
 
 	mkeys := []keyValuePairStruct{}
@@ -829,7 +840,7 @@ func getRedisToYangKeys(tableName string, redisKey string) []keyValuePairStruct
 	TRACE_LOG(TRACE_SYNTAX, "getRedisToYangKeys() returns %v "+
 		"from Redis Table '%s', Key '%s'", mkeys, tableName, redisKey)
 
-	return mkeys
+	return mkeys, cvlErrObj
 }
 
 // Checks field map values and removes "NULL" entry, create array for leaf-list

cvl/cvl_semantics.go

@@ -281,7 +281,10 @@ func (c *CVL) generateYangListData(jsonNode *jsonquery.Node,
 			listConatinerNode = c.addYangNode(origTableName, topNode, origTableName, "")
 			topNodesAdded = true
 		}
-		keyValuePair := getRedisToYangKeys(tableName, redisKey)
+		keyValuePair, cvlErrObj := getRedisToYangKeys(tableName, redisKey)
+		if cvlErrObj.ErrCode != CVL_SUCCESS {
+			return nil, cvlErrObj
+		}
 		keyCompCount := len(keyValuePair)
 		totalKeyComb := 1
 		var keyIndices []int
@@ -1527,8 +1530,8 @@ func (c *CVL) checkDepDataCompatible(tblName, key, reftblName, refTblKey, leafRe
 	}
 
 	// Fetch key value pair for both current table and ref table
-	tblKeysKVP := getRedisToYangKeys(tblName, key)
-	refTblKeysKVP := getRedisToYangKeys(reftblName, refTblKey)
+	tblKeysKVP, _ := getRedisToYangKeys(tblName, key)
+	refTblKeysKVP, _ := getRedisToYangKeys(reftblName, refTblKey)
 
 	// Determine the leafref
 	leafRef := getLeafRefInfo(reftblName, leafRefField, tblName)

cvl/cvl_syntax.go

@@ -225,7 +225,10 @@ func (c *CVL) generateTableData(config bool, jsonNode *jsonquery.Node) (*yparser
 			}
 			topNodesAdded = true
 		}
-		keyValuePair := getRedisToYangKeys(tableName, jsonNode.Data)
+		keyValuePair, cvlErrObj := getRedisToYangKeys(tableName, jsonNode.Data)
+		if cvlErrObj.ErrCode != CVL_SUCCESS {
+			return nil, cvlErrObj
+		}
 		keyCompCount := len(keyValuePair)
 		totalKeyComb := 1
 		var keyIndices []int