From 1e052231d28dcfac454bad945ae5cd3d3ad1cab0 Mon Sep 17 00:00:00 2001 From: liora Date: Sun, 13 Jun 2021 02:38:00 +0000 Subject: [PATCH 1/3] [sonic-cfggen] Allow cfggen to work on system without ports Signed-off-by: liora --- src/sonic-config-engine/sonic-cfggen | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen index 26692399d95..de563a83484 100755 --- a/src/sonic-config-engine/sonic-cfggen +++ b/src/sonic-config-engine/sonic-cfggen @@ -317,11 +317,8 @@ def main(): if args.port_config is None: args.port_config = device_info.get_path_to_port_config_file(hwsku) (ports, _, _) = get_port_config(hwsku, platform, args.port_config, asic_id) - if not ports: - print('Failed to get port config', file=sys.stderr) - sys.exit(1) - deep_update(data, {'PORT': ports}) - + if ports: + deep_update(data, {'PORT': ports}) brkout_table = get_breakout_mode(hwsku, platform, args.port_config) if brkout_table is not None: deep_update(data, {'BREAKOUT_CFG': brkout_table}) From 75ff366cf9e2b7b4d5088bc06be681037dc479da Mon Sep 17 00:00:00 2001 From: liora Date: Sun, 13 Jun 2021 03:31:18 +0000 Subject: [PATCH 2/3] [sonic-buildimage] Update submodules for zero ports support Signed-off-by: liora --- .gitmodules | 8 ++++---- src/sonic-py-swsssdk | 2 +- src/sonic-snmpagent | 2 +- src/sonic-swss | 2 +- src/sonic-utilities | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 96e5645dcae..a30b97c0133 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://github.com/Azure/sonic-sairedis [submodule "sonic-swss"] path = src/sonic-swss - url = https://github.com/Azure/sonic-swss + url = https://github.com/liorghub/sonic-swss [submodule "src/p4c-bm/p4c-bm"] path = platform/p4/p4c-bm/p4c-bm url = https://github.com/krambn/p4c-bm @@ -25,16 +25,16 @@ url = https://github.com/Azure/sonic-dbsyncd [submodule "src/sonic-py-swsssdk"] path = src/sonic-py-swsssdk - url = https://github.com/Azure/sonic-py-swsssdk.git + url = https://github.com/liorghub/sonic-py-swsssdk.git [submodule "src/sonic-snmpagent"] path = src/sonic-snmpagent - url = https://github.com/Azure/sonic-snmpagent + url = https://github.com/liorghub/sonic-snmpagent [submodule "src/ptf"] path = src/ptf url = https://github.com/p4lang/ptf.git [submodule "src/sonic-utilities"] path = src/sonic-utilities - url = https://github.com/Azure/sonic-utilities + url = https://github.com/liorghub/sonic-utilities [submodule "platform/broadcom/sonic-platform-modules-arista"] path = platform/broadcom/sonic-platform-modules-arista url = https://github.com/aristanetworks/sonic diff --git a/src/sonic-py-swsssdk b/src/sonic-py-swsssdk index 6e42d58c15f..40637b8d2b5 160000 --- a/src/sonic-py-swsssdk +++ b/src/sonic-py-swsssdk @@ -1 +1 @@ -Subproject commit 6e42d58c15fc78977e59462bfc8cba2bb3017ae2 +Subproject commit 40637b8d2b5a6c2b179b8e6b45d241e1bb843c92 diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent index 28b9dfd3a29..cd55670cc21 160000 --- a/src/sonic-snmpagent +++ b/src/sonic-snmpagent @@ -1 +1 @@ -Subproject commit 28b9dfd3a294904150b2d33bd3ff35a1a637d28d +Subproject commit cd55670cc2110648af8f30af98515264eeabf56a diff --git a/src/sonic-swss b/src/sonic-swss index dad128777e9..828a49c9919 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit dad128777e90df61ca312f694ce142e400a78b40 +Subproject commit 828a49c991956e1c24069a22bd58d3a3dc4042ba diff --git a/src/sonic-utilities b/src/sonic-utilities index 00bd0cea4f2..4632c559cad 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 00bd0cea4f260ca8cecc382a6bcea05272dfd070 +Subproject commit 4632c559cad79fe8280e9e56c02773730af51b05 From dd2e9d8db0e34b535b0e1a6a7effa4b71f8d6506 Mon Sep 17 00:00:00 2001 From: liora Date: Mon, 28 Jun 2021 14:37:58 +0000 Subject: [PATCH 3/3] Revert "[sonic-buildimage] Update submodules for zero ports support" This reverts commit 75ff366cf9e2b7b4d5088bc06be681037dc479da. --- .gitmodules | 8 ++++---- src/sonic-py-swsssdk | 2 +- src/sonic-snmpagent | 2 +- src/sonic-swss | 2 +- src/sonic-utilities | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index a30b97c0133..96e5645dcae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://github.com/Azure/sonic-sairedis [submodule "sonic-swss"] path = src/sonic-swss - url = https://github.com/liorghub/sonic-swss + url = https://github.com/Azure/sonic-swss [submodule "src/p4c-bm/p4c-bm"] path = platform/p4/p4c-bm/p4c-bm url = https://github.com/krambn/p4c-bm @@ -25,16 +25,16 @@ url = https://github.com/Azure/sonic-dbsyncd [submodule "src/sonic-py-swsssdk"] path = src/sonic-py-swsssdk - url = https://github.com/liorghub/sonic-py-swsssdk.git + url = https://github.com/Azure/sonic-py-swsssdk.git [submodule "src/sonic-snmpagent"] path = src/sonic-snmpagent - url = https://github.com/liorghub/sonic-snmpagent + url = https://github.com/Azure/sonic-snmpagent [submodule "src/ptf"] path = src/ptf url = https://github.com/p4lang/ptf.git [submodule "src/sonic-utilities"] path = src/sonic-utilities - url = https://github.com/liorghub/sonic-utilities + url = https://github.com/Azure/sonic-utilities [submodule "platform/broadcom/sonic-platform-modules-arista"] path = platform/broadcom/sonic-platform-modules-arista url = https://github.com/aristanetworks/sonic diff --git a/src/sonic-py-swsssdk b/src/sonic-py-swsssdk index 40637b8d2b5..6e42d58c15f 160000 --- a/src/sonic-py-swsssdk +++ b/src/sonic-py-swsssdk @@ -1 +1 @@ -Subproject commit 40637b8d2b5a6c2b179b8e6b45d241e1bb843c92 +Subproject commit 6e42d58c15fc78977e59462bfc8cba2bb3017ae2 diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent index cd55670cc21..28b9dfd3a29 160000 --- a/src/sonic-snmpagent +++ b/src/sonic-snmpagent @@ -1 +1 @@ -Subproject commit cd55670cc2110648af8f30af98515264eeabf56a +Subproject commit 28b9dfd3a294904150b2d33bd3ff35a1a637d28d diff --git a/src/sonic-swss b/src/sonic-swss index 828a49c9919..dad128777e9 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 828a49c991956e1c24069a22bd58d3a3dc4042ba +Subproject commit dad128777e90df61ca312f694ce142e400a78b40 diff --git a/src/sonic-utilities b/src/sonic-utilities index 4632c559cad..00bd0cea4f2 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 4632c559cad79fe8280e9e56c02773730af51b05 +Subproject commit 00bd0cea4f260ca8cecc382a6bcea05272dfd070