From da86902af42f5caf9b409f04822bb793a2a769f8 Mon Sep 17 00:00:00 2001 From: shilongliu Date: Wed, 1 Feb 2023 08:40:48 +0000 Subject: [PATCH 1/3] [submodule] Update submodule HEAD for sonic-mgmt-framework and sonic-telemetry --- .gitmodules | 2 +- src/sonic-mgmt-framework | 2 +- src/sonic-telemetry | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0812b366c61b..1ae57b61ee1a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -80,7 +80,7 @@ url = https://github.com/sonic-net/sonic-mgmt-framework [submodule "src/sonic-telemetry"] path = src/sonic-telemetry - url = https://github.com/sonic-net/sonic-telemetry + url = https://github.com/sonic-net/sonic-gnmi [submodule "Switch-SDK-drivers"] path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers url = https://github.com/Mellanox/Switch-SDK-drivers diff --git a/src/sonic-mgmt-framework b/src/sonic-mgmt-framework index 3c3384cec8d1..a72d9ee8450b 160000 --- a/src/sonic-mgmt-framework +++ b/src/sonic-mgmt-framework @@ -1 +1 @@ -Subproject commit 3c3384cec8d15e493e6889bff6361a5a280a8811 +Subproject commit a72d9ee8450b656d980ce039c9e91ddc5b1e6a76 diff --git a/src/sonic-telemetry b/src/sonic-telemetry index e56e9b44e4a7..727aefd3de0f 160000 --- a/src/sonic-telemetry +++ b/src/sonic-telemetry @@ -1 +1 @@ -Subproject commit e56e9b44e4a7e3b211f070c298041951c543885b +Subproject commit 727aefd3de0fb04feb020e10cbfd6788d0b93bf1 From 3b5293230fc13e2cc5c0f0918f21a69e17ed0587 Mon Sep 17 00:00:00 2001 From: ganglv <88995770+ganglyu@users.noreply.github.com> Date: Thu, 28 Jul 2022 01:00:07 +0800 Subject: [PATCH 2/3] [telemetry]: Move sonic-telemetry to sonic-net and rename sonic-gnmi. (#11531) --- .gitmodules | 6 +++--- rules/telemetry.mk | 4 ++-- src/{sonic-telemetry => sonic-gnmi} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename src/{sonic-telemetry => sonic-gnmi} (100%) diff --git a/.gitmodules b/.gitmodules index 1ae57b61ee1a..86385f273c41 100644 --- a/.gitmodules +++ b/.gitmodules @@ -78,9 +78,6 @@ [submodule "src/sonic-mgmt-framework"] path = src/sonic-mgmt-framework url = https://github.com/sonic-net/sonic-mgmt-framework -[submodule "src/sonic-telemetry"] - path = src/sonic-telemetry - url = https://github.com/sonic-net/sonic-gnmi [submodule "Switch-SDK-drivers"] path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers url = https://github.com/Mellanox/Switch-SDK-drivers @@ -117,3 +114,6 @@ [submodule "src/dhcprelay"] path = src/dhcprelay url = https://github.com/sonic-net/sonic-dhcp-relay.git +[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-telemetry b/src/sonic-gnmi similarity index 100% rename from src/sonic-telemetry rename to src/sonic-gnmi From 49baa3238919094e53d56354d88ab4aa39a7da5f Mon Sep 17 00:00:00 2001 From: shilongliu Date: Fri, 3 Feb 2023 14:16:25 +0800 Subject: [PATCH 3/3] Revert "[telemetry]: Move sonic-telemetry to sonic-net and rename sonic-gnmi. (#11531)" This reverts commit 3b5293230fc13e2cc5c0f0918f21a69e17ed0587. --- .gitmodules | 6 +++--- rules/telemetry.mk | 4 ++-- src/{sonic-gnmi => sonic-telemetry} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename src/{sonic-gnmi => sonic-telemetry} (100%) diff --git a/.gitmodules b/.gitmodules index 86385f273c41..1ae57b61ee1a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -78,6 +78,9 @@ [submodule "src/sonic-mgmt-framework"] path = src/sonic-mgmt-framework url = https://github.com/sonic-net/sonic-mgmt-framework +[submodule "src/sonic-telemetry"] + path = src/sonic-telemetry + url = https://github.com/sonic-net/sonic-gnmi [submodule "Switch-SDK-drivers"] path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers url = https://github.com/Mellanox/Switch-SDK-drivers @@ -114,6 +117,3 @@ [submodule "src/dhcprelay"] path = src/dhcprelay url = https://github.com/sonic-net/sonic-dhcp-relay.git -[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 24fe4ae2fe52..392ed4f28680 100644 --- a/rules/telemetry.mk +++ b/rules/telemetry.mk @@ -1,7 +1,7 @@ # SONiC telemetry package -SONIC_TELEMETRY = sonic-gnmi_0.1_$(CONFIGURED_ARCH).deb -$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/sonic-gnmi +SONIC_TELEMETRY = sonic-telemetry_0.1_$(CONFIGURED_ARCH).deb +$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/sonic-telemetry $(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-telemetry similarity index 100% rename from src/sonic-gnmi rename to src/sonic-telemetry