From 59d376152fc4c5267d53802bcdda758c9f518f1a Mon Sep 17 00:00:00 2001 From: ganglyu Date: Tue, 26 Jul 2022 03:16:21 +0000 Subject: [PATCH] Move sonic-telemetry to sonic-net and rename sonic-gnmi. --- .gitmodules | 6 +++--- rules/telemetry.mk | 4 ++-- src/sonic-gnmi | 1 + src/sonic-telemetry | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) create mode 160000 src/sonic-gnmi delete mode 160000 src/sonic-telemetry diff --git a/.gitmodules b/.gitmodules index c8bbca863dce..eba302a62912 100644 --- a/.gitmodules +++ b/.gitmodules @@ -71,9 +71,6 @@ [submodule "src/sonic-mgmt-framework"] path = src/sonic-mgmt-framework url = https://github.com/Azure/sonic-mgmt-framework -[submodule "src/sonic-telemetry"] - path = src/sonic-telemetry - url = https://github.com/Azure/sonic-telemetry [submodule "Switch-SDK-drivers"] path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers url = https://github.com/Mellanox/Switch-SDK-drivers @@ -112,3 +109,6 @@ [submodule "src/sonic-host-services"] path = src/sonic-host-services url = https://github.com/sonic-net/sonic-host-services +[submodule "src/sonic-gnmi"] + path = src/sonic-gnmi + url = https://github.com/sonic-net/sonic-gnmi.git diff --git a/rules/telemetry.mk b/rules/telemetry.mk index 392ed4f28680..24fe4ae2fe52 100644 --- a/rules/telemetry.mk +++ b/rules/telemetry.mk @@ -1,7 +1,7 @@ # SONiC telemetry package -SONIC_TELEMETRY = sonic-telemetry_0.1_$(CONFIGURED_ARCH).deb -$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/sonic-telemetry +SONIC_TELEMETRY = sonic-gnmi_0.1_$(CONFIGURED_ARCH).deb +$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/sonic-gnmi $(SONIC_TELEMETRY)_DEPENDS = $(SONIC_MGMT_COMMON) $(SONIC_MGMT_COMMON_CODEGEN) $(SONIC_TELEMETRY)_RDEPENDS = SONIC_DPKG_DEBS += $(SONIC_TELEMETRY) diff --git a/src/sonic-gnmi b/src/sonic-gnmi new file mode 160000 index 000000000000..92428dac99b2 --- /dev/null +++ b/src/sonic-gnmi @@ -0,0 +1 @@ +Subproject commit 92428dac99b2d6d97b4c904cb83933cbc8f7e848 diff --git a/src/sonic-telemetry b/src/sonic-telemetry deleted file mode 160000 index e56e9b44e4a7..000000000000 --- a/src/sonic-telemetry +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e56e9b44e4a7e3b211f070c298041951c543885b