[multi-asic] Added Support for multi-asic for telemetry/gnmi server

Makefile

@@ -60,12 +60,14 @@ check:
  sudo cp ./testdata/database_config.json ${DBDIR}
  sudo mkdir -p /usr/models/yang || true
  sudo find $(MGMT_COMMON_DIR)/models -name '*.yang' -exec cp {} /usr/models/yang/ \;
- -$(GO) test -mod=vendor $(BLD_FLAGS) -v github.com/Azure/sonic-telemetry/gnmi_server
- -$(GO) test -mod=vendor $(BLD_FLAGS) -v github.com/Azure/sonic-telemetry/dialout/dialout_client
+ -sudo $(GO) test -v github.com/Azure/sonic-telemetry/sonic_db_config
+ -sudo $(GO) test -mod=vendor $(BLD_FLAGS) -v github.com/Azure/sonic-telemetry/gnmi_server
+ -sudo $(GO) test -mod=vendor $(BLD_FLAGS) -v github.com/Azure/sonic-telemetry/dialout/dialout_client
 
 clean:
  $(RM) -r build
  $(RM) -r vendor
+ sudo $(RM) -r ${DBDIR}
 
 $(TELEMETRY_TEST_BIN): $(TEST_FILES) $(SRC_FILES)
  mkdir -p $(@D)

dialout/dialout_client/dialout_client.go

@@ -8,11 +8,11 @@ import (
  spb "github.com/Azure/sonic-telemetry/proto"
  sdc "github.com/Azure/sonic-telemetry/sonic_data_client"
  sdcfg "github.com/Azure/sonic-telemetry/sonic_db_config"
+ "github.com/Workiva/go-datastructures/queue"
  "github.com/go-redis/redis"
  log "github.com/golang/glog"
  gpb "github.com/openconfig/gnmi/proto/gnmi"
  "github.com/openconfig/ygot/ygot"
- "github.com/Workiva/go-datastructures/queue"
  "golang.org/x/net/context"
  "google.golang.org/grpc"
  "google.golang.org/grpc/credentials"
@@ -462,7 +462,7 @@ func setupDestGroupClients(ctx context.Context, destGroupName string) {
 // start/stop/update telemetry publist client as requested
 // TODO: more validation on db data
 func processTelemetryClientConfig(ctx context.Context, redisDb *redis.Client, key string, op string) error {
- separator, _ := sdc.GetTableKeySeparator("CONFIG_DB")
+ separator, _ := sdc.GetTableKeySeparator("CONFIG_DB", sdcfg.GetDbDefaultNamespace())
  tableKey := "TELEMETRY_CLIENT" + separator + key
  fv, err := redisDb.HGetAll(tableKey).Result()
  if err != nil {
@@ -642,28 +642,28 @@ func processTelemetryClientConfig(ctx context.Context, redisDb *redis.Client, ke
 // read configDB data for telemetry client and start publishing service for client subscription
 func DialOutRun(ctx context.Context, ccfg *ClientConfig) error {
  clientCfg = ccfg
- dbn := sdcfg.GetDbId("CONFIG_DB")
+ dbn := sdcfg.GetDbId("CONFIG_DB", sdcfg.GetDbDefaultNamespace())
 
  var redisDb *redis.Client
  if sdc.UseRedisLocalTcpPort == false {
  redisDb = redis.NewClient(&redis.Options{
  Network: "unix",
- Addr: sdcfg.GetDbSock("CONFIG_DB"),
+ Addr: sdcfg.GetDbSock("CONFIG_DB", sdcfg.GetDbDefaultNamespace()),
  Password: "", // no password set
  DB: dbn,
  DialTimeout: 0,
  })
  } else {
  redisDb = redis.NewClient(&redis.Options{
  Network: "tcp",
- Addr: sdcfg.GetDbTcpAddr("CONFIG_DB"),
+ Addr: sdcfg.GetDbTcpAddr("CONFIG_DB", sdcfg.GetDbDefaultNamespace()),
  Password: "", // no password set
  DB: dbn,
  DialTimeout: 0,
  })
  }
 
- separator, _ := sdc.GetTableKeySeparator("CONFIG_DB")
+ separator, _ := sdc.GetTableKeySeparator("CONFIG_DB", sdcfg.GetDbDefaultNamespace())
  pattern := "__keyspace@" + strconv.Itoa(int(dbn)) + "__:TELEMETRY_CLIENT" + separator
  prefixLen := len(pattern)
  pattern += "*"

dialout/dialout_client/dialout_client_test.go

@@ -97,9 +97,9 @@ func runServer(t *testing.T, s *sds.Server) {
 func getRedisClient(t *testing.T) *redis.Client {
  rclient := redis.NewClient(&redis.Options{
  Network: "tcp",
- Addr: sdcfg.GetDbTcpAddr("COUNTERS_DB"),
+ Addr: sdcfg.GetDbTcpAddr("COUNTERS_DB", sdcfg.GetDbDefaultNamespace()),
  Password: "", // no password set
- DB: sdcfg.GetDbId("COUNTERS_DB"),
+ DB: sdcfg.GetDbId("COUNTERS_DB", sdcfg.GetDbDefaultNamespace()),
  DialTimeout: 0,
  })
  _, err := rclient.Ping().Result()
@@ -126,9 +126,9 @@ func exe_cmd(t *testing.T, cmd string) {
 func getConfigDbClient(t *testing.T) *redis.Client {
  rclient := redis.NewClient(&redis.Options{
  Network: "tcp",
- Addr: sdcfg.GetDbTcpAddr("CONFIG_DB"),
+ Addr: sdcfg.GetDbTcpAddr("CONFIG_DB", sdcfg.GetDbDefaultNamespace()),
  Password: "", // no password set
- DB: sdcfg.GetDbId("CONFIG_DB"),
+ DB: sdcfg.GetDbId("CONFIG_DB", sdcfg.GetDbDefaultNamespace()),
  DialTimeout: 0,
  })
  _, err := rclient.Ping().Result()

gnmi_server/client_subscribe.go

@@ -123,7 +123,7 @@ func (c *Client) Run(stream gnmipb.GNMI_SubscribeServer) (err error) {
 
  if target == "OTHERS" {
  dc, err = sdc.NewNonDbClient(paths, prefix)
- } else if isTargetDb(target) == true {
+ } else if _, ok, _, _ := sdc.IsTargetDb(target); ok {
  dc, err = sdc.NewDbClient(paths, prefix)
  } else {
  /* For any other target or no target create new Transl Client. */