Merge Transformer phase fixes to master

src/translib/transformer/xlate_from_db.go

@@ -415,12 +415,10 @@ func dbDataFromTblXfmrGet(tbl string, inParams XfmrParams, dbDataMap *map[db.DBN
 
 func yangListDataFill(dbs [db.MaxDB]*db.DB, ygRoot *ygot.GoStruct, uri string, xpath string, dbDataMap *map[db.DBNum]map[string]map[string]db.Value, resultMap map[string]interface{}, tbl string, tblKey string, cdb db.DBNum, validate bool) error {
 	var tblList []string
-	tblXfmr   := false
 
 	if tbl == "" && xYangSpecMap[xpath].xfmrTbl != nil {
 		xfmrTblFunc := *xYangSpecMap[xpath].xfmrTbl
 		if len(xfmrTblFunc) > 0 {
-			tblXfmr   = true
 			inParams := formXfmrInputRequest(dbs[cdb], dbs, cdb, ygRoot, uri, GET, tblKey, dbDataMap, nil)
 			tblList   = xfmrTblHandlerFunc(xfmrTblFunc, inParams)
 			if len(tblList) != 0 {
@@ -429,8 +427,14 @@ func yangListDataFill(dbs [db.MaxDB]*db.DB, ygRoot *ygot.GoStruct, uri string, x
 				}
 			}
 		}
-	} else if tbl != "" && !tblXfmr {
+	} else if tbl != "" && xYangSpecMap[xpath].xfmrTbl == nil {
 		tblList = append(tblList, tbl)
+	} else if tbl != "" && xYangSpecMap[xpath].xfmrTbl != nil {
+		/*key instance level GET, table name and table key filled from xpathKeyExtract which internally calls table transformer*/
+		inParams := formXfmrInputRequest(dbs[cdb], dbs, cdb, ygRoot, uri, GET, tblKey, dbDataMap, nil)
+		dbDataFromTblXfmrGet(tbl, inParams, dbDataMap)
+		tblList = append(tblList, tbl)
+
 	}
 
 	for _, tbl = range(tblList) {

src/translib/transformer/xlate_to_db.go

@@ -60,6 +60,7 @@ func dataToDBMapAdd(tableName string, dbKey string, result map[string]map[string
 
 	if field == "NONE" {
 		result[tableName][dbKey].Field["NULL"] = "NULL"
+		return
 	}
 
     result[tableName][dbKey].Field[field] = value
@@ -561,14 +562,18 @@ func sonicXpathKeyExtract(path string) (string, string, string) {
 		cdb := db.ConfigDB
 		if !ok {
 			log.Infof("No entry in xDbSpecMap for xpath %v in order to fetch DB index.", tableName)
-		} else {
-			cdb = dbInfo.dbIndex
+			return xpath, keyStr, tableName
 		}
+		cdb = dbInfo.dbIndex
 		dbOpts := getDBOptions(cdb)
-		for i, kname := range rgp.FindAllString(path, -1) {
-			if i > 0 { keyStr += dbOpts.KeySeparator }
-			val := strings.Split(kname, "=")[1]
-			keyStr += strings.TrimRight(val, "]")
+		if dbInfo.keyName != nil {
+			keyStr = *dbInfo.keyName
+		} else {
+			for i, kname := range rgp.FindAllString(path, -1) {
+				if i > 0 { keyStr += dbOpts.KeySeparator }
+				val := strings.Split(kname, "=")[1]
+				keyStr += strings.TrimRight(val, "]")
+			}
 		}
 	}
 	return xpath, keyStr, tableName
@@ -636,6 +641,7 @@ func xpathKeyExtract(d *db.DB, ygRoot *ygot.GoStruct, oper int, path string) (st
         }
         curPathWithKey += "/"
     }
+    curPathWithKey = strings.TrimSuffix(curPathWithKey, "/")
     tblPtr     := xpathInfo.tableName
     if tblPtr != nil {
         tableName = *tblPtr

src/translib/transformer/xlate_utils.go

@@ -118,6 +118,9 @@ func dbKeyToYangDataConvert(uri string, xpath string, dbKey string, dbKeySep str
 	keyDataList := strings.SplitN(dbKey, dbKeySep, id)
 	uriWithKey  := fmt.Sprintf("%v", xpath)
 	uriWithKeyCreate := true
+	if len(keyDataList) == 0 {
+		keyDataList = append(keyDataList, dbKey)
+	}
 
 	/* if uri contins key, use it else use xpath */
 	if strings.Contains(uri, "[") {
@@ -144,7 +147,7 @@ func dbKeyToYangDataConvert(uri string, xpath string, dbKey string, dbKeySep str
 		return rmap, uriWithKey, nil
 	}
 
-	if len(keyDataList) == 0 || len(keyNameList) == 0 {
+	if len(keyNameList) == 0 {
 		return nil, "", nil
 	}