Skip to content

Commit

Permalink
Improve full path logic (#146)
Browse files Browse the repository at this point in the history
Why I did it
Full path has dependency for prefix.

How I did it
Always generate full path with API.

How to verify it
Run sonic-gnmi unit test.
  • Loading branch information
ganglyu authored Aug 25, 2023
1 parent ac94807 commit 7a1b7cd
Showing 1 changed file with 6 additions and 24 deletions.
30 changes: 6 additions & 24 deletions sonic_data_client/mixed_db_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,7 @@ func (c *MixedDbClient) populateDbtablePath(path *gnmipb.Path, value *gnmipb.Typ
return fmt.Errorf("Invalid target dbNameSpace %v", targetDbNameSpace)
}

fullPath := path
if c.prefix != nil {
fullPath = c.gnmiFullPath(c.prefix, path)
}
fullPath := c.gnmiFullPath(c.prefix, path)

stringSlice := []string{targetDbName}
separator, _ := GetTableKeySeparator(targetDbName, dbNamespace)
Expand Down Expand Up @@ -816,10 +813,7 @@ func (c *MixedDbClient) ConvertToJsonPatch(prefix *gnmipb.Path, path *gnmipb.Pat
return fmt.Errorf("Value encoding is not IETF JSON")
}
}
fullPath := path
if prefix != nil {
fullPath = c.gnmiFullPath(prefix, path)
}
fullPath := c.gnmiFullPath(prefix, path)

elems := fullPath.GetElem()
if t == nil {
Expand Down Expand Up @@ -914,10 +908,7 @@ func (c *MixedDbClient) SetIncrementalConfig(delete []*gnmipb.Path, replace []*g
text := `[`
/* DELETE */
for _, path := range delete {
fullPath := path
if c.prefix != nil {
fullPath = c.gnmiFullPath(c.prefix, path)
}
fullPath := c.gnmiFullPath(c.prefix, path)
log.V(2).Infof("Path #%v", fullPath)

stringSlice := []string{}
Expand All @@ -944,10 +935,7 @@ func (c *MixedDbClient) SetIncrementalConfig(delete []*gnmipb.Path, replace []*g

/* REPLACE */
for _, path := range replace {
fullPath := path.GetPath()
if c.prefix != nil {
fullPath = c.gnmiFullPath(c.prefix, path.GetPath())
}
fullPath := c.gnmiFullPath(c.prefix, path.GetPath())
log.V(2).Infof("Path #%v", fullPath)

stringSlice := []string{}
Expand Down Expand Up @@ -983,10 +971,7 @@ func (c *MixedDbClient) SetIncrementalConfig(delete []*gnmipb.Path, replace []*g

/* UPDATE */
for _, path := range update {
fullPath := path.GetPath()
if c.prefix != nil {
fullPath = c.gnmiFullPath(c.prefix, path.GetPath())
}
fullPath := c.gnmiFullPath(c.prefix, path.GetPath())
log.V(2).Infof("Path #%v", fullPath)

stringSlice := []string{}
Expand Down Expand Up @@ -1146,10 +1131,7 @@ func (c *MixedDbClient) GetCheckPoint() ([]*spb.Value, error) {
}
log.V(2).Infof("Getting #%v", c.jClient.jsonData)
for _, path := range c.paths {
fullPath := path
if c.prefix != nil {
fullPath = c.gnmiFullPath(c.prefix, path)
}
fullPath := c.gnmiFullPath(c.prefix, path)
log.V(2).Infof("Path #%v", fullPath)

stringSlice := []string{}
Expand Down

0 comments on commit 7a1b7cd

Please sign in to comment.