Merge branch 'master' into master

sneelam20 · web-flow · commit d8aa6b685518 · 2024-05-21T10:56:27.000-07:00
diff --git a/sonic_data_client/mixed_db_client.go b/sonic_data_client/mixed_db_client.go
@@ -1353,7 +1353,7 @@ func (c *MixedDbClient) SetFullConfig(delete []*gnmipb.Path, replace []*gnmipb.U
 		return err
 	}
 
-	PyCodeInGo := fmt.Sprintf(PyCodeForYang, ietf_json_val)
+	PyCodeInGo := fmt.Sprintf(PyCodeForYang, fileName)
 	err = RunPyCode(PyCodeInGo)
 	if err != nil {
 		return fmt.Errorf("Yang validation failed!")

Original file line number	Diff line number	Diff line change
`@@ -1353,7 +1353,7 @@ func (c MixedDbClient) SetFullConfig(delete []gnmipb.Path, replace []*gnmipb.U`
`1353`	`1353`	`return err`
`1354`	`1354`	`}`
`1355`	`1355`
`1356`		`- PyCodeInGo := fmt.Sprintf(PyCodeForYang, ietf_json_val)`
	`1356`	`+ PyCodeInGo := fmt.Sprintf(PyCodeForYang, fileName)`
`1357`	`1357`	`err = RunPyCode(PyCodeInGo)`
`1358`	`1358`	`if err != nil {`
`1359`	`1359`	`return fmt.Errorf("Yang validation failed!")`