From bde5ae20e1500d31e22f3e95550990f05c1cd2e9 Mon Sep 17 00:00:00 2001 From: liuh-80 Date: Thu, 19 Jun 2025 02:56:14 +0000 Subject: [PATCH 1/7] Update submodule --- .gitmodules | 3 ++- src/sonic-swss | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 383455ec62b..1be8a613c25 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,8 @@ url = https://github.com/sonic-net/sonic-sairedis [submodule "sonic-swss"] path = src/sonic-swss - url = https://github.com/sonic-net/sonic-swss + url = https://github.com/liuh-80/sonic-swss + branch = dev/liuh/improve_route_orch [submodule "src/p4c-bm/p4c-bm"] path = platform/p4/p4c-bm/p4c-bm url = https://github.com/krambn/p4c-bm diff --git a/src/sonic-swss b/src/sonic-swss index db7d9392cc6..b29d841777d 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit db7d9392cc694cf8960a0c0a36f811b4f8f8f67c +Subproject commit b29d841777d1cb988c3ca9e1772056d29664b5ef From be174d3fb51093599184e5e341967733253f9dc0 Mon Sep 17 00:00:00 2001 From: liuh-80 Date: Thu, 19 Jun 2025 05:39:04 +0000 Subject: [PATCH 2/7] Enable feature --- .gitmodules | 3 ++- dockers/docker-orchagent/orch_zmq_tables.conf.j2 | 4 ++-- dockers/docker-orchagent/orchagent.sh | 6 +++--- src/sonic-swss-common | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1be8a613c25..c2572984322 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "sonic-swss-common"] path = src/sonic-swss-common - url = https://github.com/sonic-net/sonic-swss-common + url = https://github.com/liuh-80/sonic-swss-common + branch = dev/liuh/fix_zmq_port [submodule "sonic-linux-kernel"] path = src/sonic-linux-kernel url = https://github.com/sonic-net/sonic-linux-kernel diff --git a/dockers/docker-orchagent/orch_zmq_tables.conf.j2 b/dockers/docker-orchagent/orch_zmq_tables.conf.j2 index b3cb9f99644..3014b87fa12 100644 --- a/dockers/docker-orchagent/orch_zmq_tables.conf.j2 +++ b/dockers/docker-orchagent/orch_zmq_tables.conf.j2 @@ -1,4 +1,4 @@ -{% if DEVICE_METADATA.localhost.orch_dash_zmq_enabled == "false" %} +{% if DEVICE_METADATA.localhost.orch_northbond_dash_zmq_enabled == "false" %} DASH_VNET_TABLE DASH_QOS_TABLE DASH_ENI_TABLE @@ -23,7 +23,7 @@ DASH_METER_RULE_TABLE DASH_ROUTING_APPLIANCE_TABLE DASH_ENI_FORWARD_TABLE {% endif %} -{% if DEVICE_METADATA.localhost.orch_route_zmq_enabled == "true" %} +{% if DEVICE_METADATA.localhost.orch_northbond_route_zmq_enabled == "true" %} ROUTE_TABLE LABEL_ROUTE_TABLE {% endif %} diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh index 1f473e9278a..79f58caddae 100755 --- a/dockers/docker-orchagent/orchagent.sh +++ b/dockers/docker-orchagent/orchagent.sh @@ -100,12 +100,12 @@ if [[ x"${LOCALHOST_SUBTYPE}" == x"SmartSwitch" ]]; then mgmt_ip=$( ip -json -4 addr show eth0 | jq -r ".[0].addr_info[0].local" ) if [[ $midplane_mgmt_state == "UP" ]]; then # Enable ZMQ with eth0-midplane interface name - ORCHAGENT_ARGS+=" -q tcp://eth0-midplane:8100" + ORCHAGENT_ARGS+=" -q tcp://eth0-midplane" elif [[ $mgmt_ip != "" ]] && [[ $mgmt_ip != "null" ]]; then # If eth0-midplane interface does not up, enable ZMQ with eth0 address - ORCHAGENT_ARGS+=" -q tcp://${mgmt_ip}:8100" + ORCHAGENT_ARGS+=" -q tcp://${mgmt_ip}" else - ORCHAGENT_ARGS+=" -q tcp://127.0.0.1:8100" + ORCHAGENT_ARGS+=" -q tcp://127.0.0.1" fi fi diff --git a/src/sonic-swss-common b/src/sonic-swss-common index 08bc52dbe8c..24b54c045c8 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit 08bc52dbe8cd0f77cc48fa321465544c08847663 +Subproject commit 24b54c045c8362a317afb7a040225d814d36c38b From fad4005a9ff116955e87ecede593d77e504a39fc Mon Sep 17 00:00:00 2001 From: Hua Liu <58683130+liuh-80@users.noreply.github.com> Date: Fri, 20 Jun 2025 10:59:31 +0800 Subject: [PATCH 3/7] Update sonic-device_metadata.yang --- src/sonic-yang-models/yang-models/sonic-device_metadata.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang index b00e5d96bac..766533bdf2c 100644 --- a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang +++ b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang @@ -300,13 +300,13 @@ module sonic-device_metadata { description "Set source of anchor route"; } - leaf orch_dash_zmq_enabled { + leaf orch_northbond_dash_zmq_enabled { type boolean; description "Enable ZMQ feature on APPL_DB DASH tables."; default "true"; } - leaf orch_route_zmq_enabled { + leaf orch_northbond_route_zmq_enabled { type boolean; description "Enable ZMQ feature on APPL_DB ROUTE tables."; default "false"; From b65b15f66b00a4898f9db31578753886a01c2837 Mon Sep 17 00:00:00 2001 From: Hua Liu <58683130+liuh-80@users.noreply.github.com> Date: Fri, 20 Jun 2025 11:01:11 +0800 Subject: [PATCH 4/7] Update device_metadata.json --- .../tests/yang_model_tests/tests_config/device_metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json index 068c576cfcf..7ab3a70a012 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json @@ -674,7 +674,7 @@ "sonic-device_metadata:sonic-device_metadata": { "sonic-device_metadata:DEVICE_METADATA": { "sonic-device_metadata:localhost": { - "orch_dash_zmq_enabled": true + "orch_northbond_dash_zmq_enabled": true } } } @@ -683,7 +683,7 @@ "sonic-device_metadata:sonic-device_metadata": { "sonic-device_metadata:DEVICE_METADATA": { "sonic-device_metadata:localhost": { - "orch_route_zmq_enabled": true + "orch_northbond_route_zmq_enabled": true } } } From cd3e72f017a56714a7849d83feafd86368025a29 Mon Sep 17 00:00:00 2001 From: liuh-80 Date: Mon, 30 Jun 2025 02:12:42 +0000 Subject: [PATCH 5/7] Enable ZMQ by default for other ZMQ feature, for example ZMQ route --- dockers/docker-orchagent/orchagent.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh index 79f58caddae..89699101322 100755 --- a/dockers/docker-orchagent/orchagent.sh +++ b/dockers/docker-orchagent/orchagent.sh @@ -93,7 +93,7 @@ else ORCHAGENT_ARGS+="-m $MAC_ADDRESS" fi -# Enable ZMQ for SmartSwitch +# Enable ZMQ LOCALHOST_SUBTYPE=`sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "subtype"` if [[ x"${LOCALHOST_SUBTYPE}" == x"SmartSwitch" ]]; then midplane_mgmt_state=$( ip -json -4 addr show eth0-midplane | jq -r ".[0].operstate" ) @@ -107,6 +107,9 @@ if [[ x"${LOCALHOST_SUBTYPE}" == x"SmartSwitch" ]]; then else ORCHAGENT_ARGS+=" -q tcp://127.0.0.1" fi +else + # For other platforms, use the default ZMQ address + ORCHAGENT_ARGS+=" -q tcp://127.0.0.1" fi # Add VRF parameter when mgmt-vrf enabled From 0b319321560cae03b89f6c5e6d5aa0cfb573fb35 Mon Sep 17 00:00:00 2001 From: sonicbld Date: Mon, 7 Jul 2025 08:46:48 +0000 Subject: [PATCH 6/7] Update submodule --- .gitmodules | 3 +-- src/sonic-swss | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1be8a613c25..383455ec62b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,8 +9,7 @@ url = https://github.com/sonic-net/sonic-sairedis [submodule "sonic-swss"] path = src/sonic-swss - url = https://github.com/liuh-80/sonic-swss - branch = dev/liuh/improve_route_orch + url = https://github.com/sonic-net/sonic-swss [submodule "src/p4c-bm/p4c-bm"] path = platform/p4/p4c-bm/p4c-bm url = https://github.com/krambn/p4c-bm diff --git a/src/sonic-swss b/src/sonic-swss index 4cee2136c0c..de1d48a1405 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 4cee2136c0ca0a7fb68ed432eff952a1d9f0729f +Subproject commit de1d48a14054fec027c928cf20cc74dd10a0ef0e From 8ddfb503e97282335d91c8259c90f4354d614309 Mon Sep 17 00:00:00 2001 From: Hua Liu <58683130+liuh-80@users.noreply.github.com> Date: Tue, 15 Jul 2025 10:11:57 +0800 Subject: [PATCH 7/7] Update orch_zmq_tables.conf.j2 --- dockers/docker-orchagent/orch_zmq_tables.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-orchagent/orch_zmq_tables.conf.j2 b/dockers/docker-orchagent/orch_zmq_tables.conf.j2 index 3014b87fa12..65d77b91d44 100644 --- a/dockers/docker-orchagent/orch_zmq_tables.conf.j2 +++ b/dockers/docker-orchagent/orch_zmq_tables.conf.j2 @@ -1,4 +1,4 @@ -{% if DEVICE_METADATA.localhost.orch_northbond_dash_zmq_enabled == "false" %} +{% if DEVICE_METADATA.localhost.orch_northbond_dash_zmq_enabled != "false" %} DASH_VNET_TABLE DASH_QOS_TABLE DASH_ENI_TABLE