Skip to content

Commit 92428da

Browse files
authored
Merge pull request #4 from ganglyu/gnmi_repo
Why I did it Move sonic-telemetry to sonic-net How I did it Replace path "github.com/Azure/sonic-telemetry" How to verify it Run unit test and buildimage.
2 parents 1ac0e0e + 2dafc3b commit 92428da

27 files changed

+75
-75
lines changed

Makefile

+13-13
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ GO_DEPS := vendor/.done
2525
PATCHES := $(wildcard patches/*.patch)
2626
PATCHES += $(shell find $(MGMT_COMMON_DIR)/patches -type f)
2727

28-
all: sonic-telemetry $(TELEMETRY_TEST_BIN)
28+
all: sonic-gnmi $(TELEMETRY_TEST_BIN)
2929

3030
go.mod:
31-
$(GO) mod init github.com/Azure/sonic-telemetry
31+
$(GO) mod init github.com/sonic-net/sonic-gnmi
3232

3333
$(GO_DEPS): go.mod $(PATCHES)
3434
$(GO) mod vendor
@@ -48,31 +48,31 @@ go-deps: $(GO_DEPS)
4848
go-deps-clean:
4949
$(RM) -r vendor
5050

51-
sonic-telemetry: $(GO_DEPS)
51+
sonic-gnmi: $(GO_DEPS)
5252
ifeq ($(CROSS_BUILD_ENVIRON),y)
53-
$(GO) build -o ${GOBIN}/telemetry -mod=vendor $(BLD_FLAGS) github.com/Azure/sonic-telemetry/telemetry
54-
$(GO) build -o ${GOBIN}/dialout_client_cli -mod=vendor $(BLD_FLAGS) github.com/Azure/sonic-telemetry/dialout/dialout_client_cli
53+
$(GO) build -o ${GOBIN}/telemetry -mod=vendor $(BLD_FLAGS) github.com/sonic-net/sonic-gnmi/telemetry
54+
$(GO) build -o ${GOBIN}/dialout_client_cli -mod=vendor $(BLD_FLAGS) github.com/sonic-net/sonic-gnmi/dialout/dialout_client_cli
5555
$(GO) build -o ${GOBIN}/gnmi_get -mod=vendor github.com/jipanyang/gnxi/gnmi_get
5656
$(GO) build -o ${GOBIN}/gnmi_set -mod=vendor github.com/jipanyang/gnxi/gnmi_set
5757
$(GO) build -o ${GOBIN}/gnmi_cli -mod=vendor github.com/openconfig/gnmi/cmd/gnmi_cli
58-
$(GO) build -o ${GOBIN}/gnoi_client -mod=vendor github.com/Azure/sonic-telemetry/gnoi_client
58+
$(GO) build -o ${GOBIN}/gnoi_client -mod=vendor github.com/sonic-net/sonic-gnmi/gnoi_client
5959
else
60-
$(GO) install -mod=vendor $(BLD_FLAGS) github.com/Azure/sonic-telemetry/telemetry
61-
$(GO) install -mod=vendor $(BLD_FLAGS) github.com/Azure/sonic-telemetry/dialout/dialout_client_cli
60+
$(GO) install -mod=vendor $(BLD_FLAGS) github.com/sonic-net/sonic-gnmi/telemetry
61+
$(GO) install -mod=vendor $(BLD_FLAGS) github.com/sonic-net/sonic-gnmi/dialout/dialout_client_cli
6262
$(GO) install -mod=vendor github.com/jipanyang/gnxi/gnmi_get
6363
$(GO) install -mod=vendor github.com/jipanyang/gnxi/gnmi_set
6464
$(GO) install -mod=vendor github.com/openconfig/gnmi/cmd/gnmi_cli
65-
$(GO) install -mod=vendor github.com/Azure/sonic-telemetry/gnoi_client
65+
$(GO) install -mod=vendor github.com/sonic-net/sonic-gnmi/gnoi_client
6666
endif
6767

6868
check:
6969
sudo mkdir -p ${DBDIR}
7070
sudo cp ./testdata/database_config.json ${DBDIR}
7171
sudo mkdir -p /usr/models/yang || true
7272
sudo find $(MGMT_COMMON_DIR)/models -name '*.yang' -exec cp {} /usr/models/yang/ \;
73-
-sudo $(GO) test -coverprofile=coverage-config.txt -covermode=atomic -v github.com/Azure/sonic-telemetry/sonic_db_config
74-
-sudo $(GO) test -coverprofile=coverage-gnmi.txt -covermode=atomic -mod=vendor $(BLD_FLAGS) -v github.com/Azure/sonic-telemetry/gnmi_server
75-
-sudo $(GO) test -coverprofile=coverage-dialcout.txt -covermode=atomic -mod=vendor $(BLD_FLAGS) -v github.com/Azure/sonic-telemetry/dialout/dialout_client
73+
-sudo $(GO) test -coverprofile=coverage-config.txt -covermode=atomic -v github.com/sonic-net/sonic-gnmi/sonic_db_config
74+
-sudo $(GO) test -coverprofile=coverage-gnmi.txt -covermode=atomic -mod=vendor $(BLD_FLAGS) -v github.com/sonic-net/sonic-gnmi/gnmi_server
75+
-sudo $(GO) test -coverprofile=coverage-dialcout.txt -covermode=atomic -mod=vendor $(BLD_FLAGS) -v github.com/sonic-net/sonic-gnmi/dialout/dialout_client
7676
$(GO) get github.com/axw/gocov/...
7777
$(GO) get github.com/AlekSi/gocov-xml
7878
gocov convert coverage-*.txt | gocov-xml -source $(shell pwd) > coverage.xml
@@ -85,7 +85,7 @@ clean:
8585
$(TELEMETRY_TEST_BIN): $(TEST_FILES) $(SRC_FILES)
8686
mkdir -p $(@D)
8787
cp -r testdata $(@D)/
88-
$(GO) test -mod=vendor $(BLD_FLAGS) -c -cover github.com/Azure/sonic-telemetry/gnmi_server -o $@
88+
$(GO) test -mod=vendor $(BLD_FLAGS) -c -cover github.com/sonic-net/sonic-gnmi/gnmi_server -o $@
8989

9090
install:
9191
$(INSTALL) -D $(BUILD_DIR)/telemetry $(DESTDIR)/usr/sbin/telemetry

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ Install __go__ in your system https://golang.org/doc/install. Requires golang1.8
1515

1616
To install dial-in mode system telemetry server, run
1717

18-
go get -u github.com/Azure/sonic-telemetry/telemetry
18+
go get -u github.com/sonic-net/sonic-gnmi/telemetry
1919

2020
To install dial-out mode system telemetry client, run
2121

22-
go get -u github.com/Azure/sonic-telemetry/dialout/dialout_client_cli
22+
go get -u github.com/sonic-net/sonic-gnmi/dialout/dialout_client_cli
2323

2424
There is also a test program dialout_server_cli for collecting data from dial-out mode system telemetry client. _Note_: it is for testing purpose only.
2525

26-
go get -u github.com/Azure/sonic-telemetry/dialout/dialout_server_cli
26+
go get -u github.com/sonic-net/sonic-gnmi/dialout/dialout_server_cli
2727

2828
The binaries will be installed under $GOPATH/bin/, they may be copied to any SONiC switch and run there.
2929

3030
You can also build a debian package and install it:
3131

32-
git clone https://github.com/Azure/sonic-telemetry.git
33-
pushd sonic-telemetry
32+
git clone https://github.com/sonic-net/sonic-gnmi.git
33+
pushd sonic-gnmi
3434
dpkg-buildpackage -rfakeroot -b -us -uc
3535
popd
3636

azure-pipelines.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ stages:
3333
variables:
3434
DIFF_COVER_CHECK_THRESHOLD: 80
3535
DIFF_COVER_ENABLE: 'true'
36-
DIFF_COVER_WORKING_DIRECTORY: $(System.DefaultWorkingDirectory)/sonic-telemetry
36+
DIFF_COVER_WORKING_DIRECTORY: $(System.DefaultWorkingDirectory)/sonic-gnmi
3737

3838
container:
3939
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest
@@ -100,17 +100,17 @@ stages:
100100
101101
popd
102102
103-
pushd sonic-telemetry
103+
pushd sonic-gnmi
104104
105105
dpkg-buildpackage -rfakeroot -us -uc -b -j$(nproc) && cp ../*.deb $(Build.ArtifactStagingDirectory)/
106106
displayName: "Build"
107107
108108
- publish: $(Build.ArtifactStagingDirectory)/
109-
artifact: sonic-telemetry
109+
artifact: sonic-gnmi
110110
displayName: "Archive artifacts"
111111

112112
- task: PublishCodeCoverageResults@1
113113
inputs:
114114
codeCoverageTool: Cobertura
115-
summaryFileLocation: '$(System.DefaultWorkingDirectory)/sonic-telemetry/coverage.xml'
115+
summaryFileLocation: '$(System.DefaultWorkingDirectory)/sonic-gnmi/coverage.xml'
116116
displayName: 'Publish coverage'

debian/changelog

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sonic-telemetry (0.1) UNRELEASED; urgency=medium
1+
sonic-gnmi (0.1) UNRELEASED; urgency=medium
22

33
* Initial release.
44

debian/control

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
Source: sonic-telemetry
1+
Source: sonic-gnmi
22
Section: devel
33
Priority: optional
44
Maintainer: Jipan Yang <[email protected]>
55
Build-Depends: debhelper (>= 8.0.0),
66
Standards-Version: 3.9.3
7-
Homepage: https://github.com/Azure/sonic-telemetry
8-
XS-Go-Import-Path: github.com/Azure/sonic-telemetry
7+
Homepage: https://github.com/sonic-net/sonic-gnmi
8+
XS-Go-Import-Path: github.com/sonic-net/sonic-gnmi
99

10-
Package: sonic-telemetry
10+
Package: sonic-gnmi
1111
Architecture: any
1212
Built-Using: ${misc:Built-Using}
1313
Depends: ${misc:Depends},
1414
${shlibs:Depends}
15-
Description: SONiC telemetry
16-
sonic-telemetry
15+
Description: SONiC gNMI
16+
sonic-gnmi

dialout/dialout_client/dialout_client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"crypto/tls"
66
"errors"
77
"fmt"
8-
spb "github.com/Azure/sonic-telemetry/proto"
9-
sdc "github.com/Azure/sonic-telemetry/sonic_data_client"
10-
sdcfg "github.com/Azure/sonic-telemetry/sonic_db_config"
8+
spb "github.com/sonic-net/sonic-gnmi/proto"
9+
sdc "github.com/sonic-net/sonic-gnmi/sonic_data_client"
10+
sdcfg "github.com/sonic-net/sonic-gnmi/sonic_db_config"
1111
"github.com/Workiva/go-datastructures/queue"
1212
"github.com/go-redis/redis"
1313
log "github.com/golang/glog"

dialout/dialout_client/dialout_client_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"encoding/json"
99
"github.com/go-redis/redis"
1010
//"github.com/golang/protobuf/proto"
11-
testcert "github.com/Azure/sonic-telemetry/testdata/tls"
11+
testcert "github.com/sonic-net/sonic-gnmi/testdata/tls"
1212

1313
//"github.com/kylelemons/godebug/pretty"
1414
//"github.com/openconfig/gnmi/client"
@@ -28,9 +28,9 @@ import (
2828
"testing"
2929
"time"
3030

31-
sds "github.com/Azure/sonic-telemetry/dialout/dialout_server"
32-
sdc "github.com/Azure/sonic-telemetry/sonic_data_client"
33-
sdcfg "github.com/Azure/sonic-telemetry/sonic_db_config"
31+
sds "github.com/sonic-net/sonic-gnmi/dialout/dialout_server"
32+
sdc "github.com/sonic-net/sonic-gnmi/sonic_data_client"
33+
sdcfg "github.com/sonic-net/sonic-gnmi/sonic_db_config"
3434
gclient "github.com/openconfig/gnmi/client/gnmi"
3535
)
3636

dialout/dialout_client_cli/dialout_client_cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package main
44
import (
55
"crypto/tls"
66
"flag"
7-
dc "github.com/Azure/sonic-telemetry/dialout/dialout_client"
7+
dc "github.com/sonic-net/sonic-gnmi/dialout/dialout_client"
88
log "github.com/golang/glog"
99
gpb "github.com/openconfig/gnmi/proto/gnmi"
1010
"golang.org/x/net/context"

dialout/dialout_server/dialout_server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dialout_server
33
import (
44
"errors"
55
"fmt"
6-
spb "github.com/Azure/sonic-telemetry/proto"
6+
spb "github.com/sonic-net/sonic-gnmi/proto"
77
log "github.com/golang/glog"
88
"github.com/google/gnxi/utils"
99
gpb "github.com/openconfig/gnmi/proto/gnmi"

dialout/dialout_server_cli/dialout_server_cli.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"google.golang.org/grpc"
1111
"google.golang.org/grpc/credentials"
1212

13-
ds "github.com/Azure/sonic-telemetry/dialout/dialout_server"
14-
testcert "github.com/Azure/sonic-telemetry/testdata/tls"
13+
ds "github.com/sonic-net/sonic-gnmi/dialout/dialout_server"
14+
testcert "github.com/sonic-net/sonic-gnmi/testdata/tls"
1515
)
1616

1717
var (

doc/gNMI_usage_examples.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The examples use the following open source gNMI CLI tools:
88
- [gnmi_set](https://github.com/google/gnxi/tree/master/gnmi_get): This tools allows for update, replace and delete operations.
99
- [gnmi_cli](https://github.com/openconfig/gnmi/tree/master/cmd/gnmi_cli): This tool allows for dial-in Subscription operations as well as Capabilities request to list available models.
1010

11-
The above tools also have custom patches applied for additional features [here](https://github.com/Azure/sonic-telemetry/tree/master/patches). The patched versions of these tools are built with the sonic-telemetry repo and are installed in /usr/bin in the telemetry container.
11+
The above tools also have custom patches applied for additional features [here](https://github.com/sonic-net/sonic-gnmi/tree/master/patches). The patched versions of these tools are built with the sonic-telemetry repo and are installed in /usr/bin in the telemetry container.
1212

1313
## Openconfig Models:
1414

gnmi_server/basicAuth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gnmi
22

33
import (
4-
"github.com/Azure/sonic-telemetry/common_utils"
4+
"github.com/sonic-net/sonic-gnmi/common_utils"
55
"github.com/golang/glog"
66
"golang.org/x/net/context"
77
"google.golang.org/grpc/codes"

gnmi_server/clientCertAuth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gnmi
22

33
import (
4-
"github.com/Azure/sonic-telemetry/common_utils"
4+
"github.com/sonic-net/sonic-gnmi/common_utils"
55
"github.com/golang/glog"
66
"golang.org/x/net/context"
77
"google.golang.org/grpc/codes"

gnmi_server/client_subscribe.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"google.golang.org/grpc"
1212
"google.golang.org/grpc/codes"
1313

14-
sdc "github.com/Azure/sonic-telemetry/sonic_data_client"
14+
sdc "github.com/sonic-net/sonic-gnmi/sonic_data_client"
1515
gnmipb "github.com/openconfig/gnmi/proto/gnmi"
1616
)
1717

gnmi_server/gnoi.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
gnoi_system_pb "github.com/openconfig/gnoi/system"
66
log "github.com/golang/glog"
77
"time"
8-
spb "github.com/Azure/sonic-telemetry/proto/gnoi"
9-
transutil "github.com/Azure/sonic-telemetry/transl_utils"
10-
spb_jwt "github.com/Azure/sonic-telemetry/proto/gnoi/jwt"
8+
spb "github.com/sonic-net/sonic-gnmi/proto/gnoi"
9+
transutil "github.com/sonic-net/sonic-gnmi/transl_utils"
10+
spb_jwt "github.com/sonic-net/sonic-gnmi/proto/gnoi/jwt"
1111
"google.golang.org/grpc/status"
1212
"google.golang.org/grpc/codes"
1313
"os/user"

gnmi_server/jwtAuth.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package gnmi
22

33
import (
4-
"github.com/Azure/sonic-telemetry/common_utils"
4+
"github.com/sonic-net/sonic-gnmi/common_utils"
55
"crypto/rand"
66
jwt "github.com/dgrijalva/jwt-go"
77
"github.com/golang/glog"
88
"golang.org/x/net/context"
99
"google.golang.org/grpc/codes"
1010
"google.golang.org/grpc/metadata"
1111
"google.golang.org/grpc/status"
12-
spb "github.com/Azure/sonic-telemetry/proto/gnoi/jwt"
12+
spb "github.com/sonic-net/sonic-gnmi/proto/gnoi/jwt"
1313
"time"
1414
)
1515

gnmi_server/pamAuth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gnmi
22

33
import (
4-
"github.com/Azure/sonic-telemetry/common_utils"
4+
"github.com/sonic-net/sonic-gnmi/common_utils"
55
"errors"
66
"github.com/golang/glog"
77
"github.com/msteinert/pam"

gnmi_server/server.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"errors"
66
"fmt"
77
"github.com/Azure/sonic-mgmt-common/translib"
8-
"github.com/Azure/sonic-telemetry/common_utils"
9-
spb "github.com/Azure/sonic-telemetry/proto"
10-
spb_gnoi "github.com/Azure/sonic-telemetry/proto/gnoi"
11-
spb_jwt_gnoi "github.com/Azure/sonic-telemetry/proto/gnoi/jwt"
12-
sdc "github.com/Azure/sonic-telemetry/sonic_data_client"
8+
"github.com/sonic-net/sonic-gnmi/common_utils"
9+
spb "github.com/sonic-net/sonic-gnmi/proto"
10+
spb_gnoi "github.com/sonic-net/sonic-gnmi/proto/gnoi"
11+
spb_jwt_gnoi "github.com/sonic-net/sonic-gnmi/proto/gnoi/jwt"
12+
sdc "github.com/sonic-net/sonic-gnmi/sonic_data_client"
1313
log "github.com/golang/glog"
1414
"github.com/golang/protobuf/proto"
1515
gnmipb "github.com/openconfig/gnmi/proto/gnmi"

gnmi_server/server_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"strings"
1111

12-
testcert "github.com/Azure/sonic-telemetry/testdata/tls"
12+
testcert "github.com/sonic-net/sonic-gnmi/testdata/tls"
1313
"github.com/go-redis/redis"
1414
"github.com/golang/protobuf/proto"
1515

@@ -34,11 +34,11 @@ import (
3434
"google.golang.org/grpc/status"
3535

3636
// Register supported client types.
37-
spb "github.com/Azure/sonic-telemetry/proto"
38-
sgpb "github.com/Azure/sonic-telemetry/proto/gnoi"
39-
sdc "github.com/Azure/sonic-telemetry/sonic_data_client"
40-
sdcfg "github.com/Azure/sonic-telemetry/sonic_db_config"
41-
"github.com/Azure/sonic-telemetry/test_utils"
37+
spb "github.com/sonic-net/sonic-gnmi/proto"
38+
sgpb "github.com/sonic-net/sonic-gnmi/proto/gnoi"
39+
sdc "github.com/sonic-net/sonic-gnmi/sonic_data_client"
40+
sdcfg "github.com/sonic-net/sonic-gnmi/sonic_db_config"
41+
"github.com/sonic-net/sonic-gnmi/test_utils"
4242
gclient "github.com/jipanyang/gnmi/client/gnmi"
4343
"github.com/jipanyang/gnxi/utils/xpath"
4444
gnoi_system_pb "github.com/openconfig/gnoi/system"

gnoi_client/gnoi_client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"google.golang.org/grpc"
55
gnoi_system_pb "github.com/openconfig/gnoi/system"
6-
spb "github.com/Azure/sonic-telemetry/proto/gnoi"
7-
spb_jwt "github.com/Azure/sonic-telemetry/proto/gnoi/jwt"
6+
spb "github.com/sonic-net/sonic-gnmi/proto/gnoi"
7+
spb_jwt "github.com/sonic-net/sonic-gnmi/proto/gnoi/jwt"
88
"context"
99
"os"
1010
"os/signal"

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/Azure/sonic-telemetry
1+
module github.com/sonic-net/sonic-gnmi
22

33
go 1.12
44

sonic_data_client/db_client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414

1515
log "github.com/golang/glog"
1616

17-
spb "github.com/Azure/sonic-telemetry/proto"
18-
sdcfg "github.com/Azure/sonic-telemetry/sonic_db_config"
17+
spb "github.com/sonic-net/sonic-gnmi/proto"
18+
sdcfg "github.com/sonic-net/sonic-gnmi/sonic_db_config"
1919
"github.com/Workiva/go-datastructures/queue"
2020
"github.com/go-redis/redis"
2121
gnmipb "github.com/openconfig/gnmi/proto/gnmi"
@@ -156,7 +156,7 @@ func (c *DbClient) StreamRun(q *queue.PriorityQueue, stop chan struct{}, w *sync
156156

157157
if subscribe.GetSubscription() == nil {
158158
log.V(2).Infof("No incoming subscription, it is considered a dialout connection.")
159-
// NOTE: per https://github.com/Azure/sonic-telemetry/blob/master/doc/dialout.md#dialout_client_cli-and-dialout_server_cli
159+
// NOTE: per https://github.com/sonic-net/sonic-gnmi/blob/master/doc/dialout.md#dialout_client_cli-and-dialout_server_cli
160160
// TELEMETRY_CLIENT subscription doesn't specificy type of the stream.
161161
// Handling it as a ON_CHANGE stream for backward compatibility.
162162
for gnmiPath := range c.pathG2S {

sonic_data_client/non_db_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"gopkg.in/yaml.v2"
1111

12-
spb "github.com/Azure/sonic-telemetry/proto"
12+
spb "github.com/sonic-net/sonic-gnmi/proto"
1313
"github.com/Workiva/go-datastructures/queue"
1414
linuxproc "github.com/c9s/goprocinfo/linux"
1515
log "github.com/golang/glog"

sonic_data_client/transl_data_client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
package client
33

44
import (
5-
spb "github.com/Azure/sonic-telemetry/proto"
6-
transutil "github.com/Azure/sonic-telemetry/transl_utils"
5+
spb "github.com/sonic-net/sonic-gnmi/proto"
6+
transutil "github.com/sonic-net/sonic-gnmi/transl_utils"
77
log "github.com/golang/glog"
88
"github.com/golang/protobuf/proto"
99
gnmipb "github.com/openconfig/gnmi/proto/gnmi"
@@ -14,7 +14,7 @@ import (
1414
"fmt"
1515
"reflect"
1616
"github.com/Azure/sonic-mgmt-common/translib"
17-
"github.com/Azure/sonic-telemetry/common_utils"
17+
"github.com/sonic-net/sonic-gnmi/common_utils"
1818
"bytes"
1919
"encoding/json"
2020
"context"

0 commit comments

Comments
 (0)