-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow similar devices configs sharing #1933
Allow similar devices configs sharing #1933
Conversation
src/sonic-device-data/Makefile
Outdated
@@ -13,6 +13,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : | |||
# Create a new dir and copy all ONIE-platform-string-named dirs into it | |||
mkdir ./device | |||
cp -r ../../../device/*/* ./device/ | |||
find ./device/ -type l -exec bash -c 'test -e {} && (original=$$(readlink -f {}) && rm -rf {} && cp -rf -L $$original {} ) ' \; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to use one line for both cp and resolving?
cp -r -H ../../../device/*/* ./device/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Since we don't need anymore "hw-managment" links to "/etc/mlx/msn*" which could not be resolved in build server file system. So now it is removed and can links can be resolved during "cp".
retest this please |
can you resolve the conflict? |
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
fa60d64
to
120ec2f
Compare
3fa0854 [CLI][show bgp] On chassis don't show internal BGP sessions by default (sonic-net#1927) 6de91af [Auto-Techsupport] Issues related to Multiple Cores crashing handled (sonic-net#1948) 656ade1 SFP-Refactor: Vendor revision is not displayed properly (sonic-net#1950) 67466cb [port] Fix port speed set (sonic-net#1952) 5172972 Fix invalid output of syslog IPv6 servers (sonic-net#1933) 290ff5f Routed subinterface enhancements (sonic-net#1821) 1ea88e2 Enhance sfputil for CMIS QSFP (sonic-net#1949) Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
f81043b1f9ff02196629655f4735b33afd7f0ae1 (HEAD -> 202111, origin/202111) [port2alias]: Fix to get right number of return values (#1906) bbbf65943ec46e9330eadaed8bcdf1612cb8bd55 [CLI][show bgp] On chassis don't show internal BGP sessions by default (#1927) e12de7e7bf6cff3ec127f261bf88e4d29776d27b [port] Fix port speed set (#1952) cae7af752d484956d7fe40e4c3a849ddad460976 Fix invalid output of syslog IPv6 servers (#1933) 6009341ddf790094166be5f0a81b4c114f00220b Routed subinterface enhancements (#1821) 6ab9d67ca6550c592b97afb513804be474f84eb0 Enhance sfputil for CMIS QSFP (#1949) 76cc67ba4f81c69b20efb3341808037c9db8f703 [debug dump] Refactoring Modules and Unit Tests (#1943) cff58a8171423e4012bc8caf9748996a1e98b7e2 Add command reference for trap flow counters (#1876) 71cf3ee43524d56ad57dd90b937cfbf4bf63ba6a [Reclaim buffer] [Mellanox] Db migrator support reclaiming reserved buffer for unused ports (#1822) e699b49fb722e6d6fe5a1d2dacd2d39eb085c1e4 Add show command for BFD sessions (#1942) bb6c5774c843dbfad5f1ba00ee76dae7720902d1 [warm-reboot] Fix failures of warm reboot on disconnect of ssh session (#1529) 2e8bbb308477862a76d2327fcf696875e8f08650 Add trap flow counter support (#1868) 58407c1386ef13772a9a9320a795e380f162ab2c [load_minigraph] Delay pfcwd start until the buffer templates are rendered (#1937) eb388e0584ba1fe8d8dba58f1c5a148036ffe047 [sonic-package-manager] support sonic-cli-gen and packages with YANG model (#1650) 2371d84e7d281bdb9988b5a1a012498dbbfb89ec generic_config_updater: Filename changed & VLAN validator added (#1919) 7c0718dfaf23289d4ecc3ada9332e465c9a4e56b [config reload] Update command reference (#1941) Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
#### Why I did it Including below commits: ``` fe00bbf 2021-12-17 | Revert "[sonic-package-manager] support sonic-cli-gen and packages with YANG model (#1650)" (#1972) [Prince George] 5fe6d92 2021-12-16 | [warm/fast-reboot] Fix kexec portion to support platforms based on Device Tree (#1966) [dflynn-Nokia] 74d2a09 2021-12-17 | [portstat] check TX/RX utilization calculation correctness (#1840) [Andriy Yurkiv] e44c3f6 2021-12-16 | [generic-config-updater] Improving CreateOnly validator and marking /LOOPBACK_INTERFACE/LOOPBACK#/vrf_name as create-only (#1969) [Mohamed Ghoneim] 0067cc4 2021-12-15 | [build] adapt for upstream target path change (#1971) [Qi Luo] 96143ee 2021-12-09 | preserve old order for config reload (#1964) [arlakshm] f08c81d 2021-12-10 | [vxlan] remove unnecessary whitespace for show commands (#1792) [Gord Chen] 14889ce 2021-12-09 | [soft-reboot] Add support for platforms based on Device Tree (#1963) [dflynn-Nokia] 7ceccd7 2021-12-08 | [generic-config-updater] Adding non-strict mode (#1929) [Mohamed Ghoneim] 2e462ef 2021-12-07 | [sfputil] Firmware download/upgrade CLI support for QSFP-DD (#1947) [Prince George] 7c34b79 2021-12-07 | [config] Add portchannel support for static route (#1857) [Dmytro] 54cc370 2021-12-06 | [doc] Refine doc on show loopback/mgmt ports (#1958) [Qi Luo] 3714f63 2021-12-06 | [port2alias]: Fix to get right number of return values (#1906) [SuvarnaMeenakshi] 3fa0854 2021-12-06 | [CLI][show bgp] On chassis don't show internal BGP sessions by default (#1927) [Mahesh Maddikayala] 6de91af 2021-12-06 | [Auto-Techsupport] Issues related to Multiple Cores crashing handled (#1948) [Vivek Reddy] 656ade1 2021-12-06 | SFP-Refactor: Vendor revision is not displayed properly (#1950) [Aravind Mani] 67466cb 2021-12-05 | [port] Fix port speed set (#1952) [Mykola Gerasymenko] 5172972 2021-12-04 | Fix invalid output of syslog IPv6 servers (#1933) [jingwenxie] 290ff5f 2021-12-03 | Routed subinterface enhancements (#1821) [Preetham] 1ea88e2 2021-12-01 | Enhance sfputil for CMIS QSFP (#1949) [andywongarista] 4e132c1 2021-11-30 | [debug dump] Refactoring Modules and Unit Tests (#1943) [Vivek Reddy] b550c44 2021-11-30 | Add command reference for trap flow counters (#1876) [Junchao-Mellanox] 67a267b 2021-11-30 | [Reclaim buffer] [Mellanox] Db migrator support reclaiming reserved buffer for unused ports (#1822) [Stephen Sun] 30e4654 2021-11-25 | Add show command for BFD sessions (#1942) [Shi Su] e63f47e 2021-11-25 | [warm-reboot] Fix failures of warm reboot on disconnect of ssh session (#1529) [maksymbelei95] c05845d 2021-11-25 | Add trap flow counter support (#1868) [Junchao-Mellanox] ef82f00 2021-11-24 | [load_minigraph] Delay pfcwd start until the buffer templates are rendered (#1937) [Neetha John] f5e5a56 2021-11-24 | [sonic-package-manager] support sonic-cli-gen and packages with YANG model (#1650) [Stepan Blyshchak] 64777a4 2021-11-23 | generic_config_updater: Filename changed & VLAN validator added (#1919) [Renuka Manavalan] 1f8f6ab 2021-11-23 | [config reload] Update command reference (#1941) [Sudharsan Dhamal Gopalarathnam] ```
#### What I did Modify the filter function of `show runningconfiguration syslog` #### How I did it Filter by ending "]" rather than split by ":" #### How to verify it add a syslog v6 server `sudo config syslog add f587::1:1` run command `show runningconfiguration syslog` #### Previous command output (if the output of a command-line utility has changed) ``` admin@vlab-01:~$ show runningconfiguration syslog Syslog Servers ---------------- [10.0.0.5] [10.0.0.6] [f587 ``` #### New command output (if the output of a command-line utility has changed) ``` admin@vlab-01:~$ show runningconfiguration syslog Syslog Servers ---------------- [10.0.0.5] [10.0.0.6] [f587::1:1] ```
Signed-off-by: Stepan Blyschak stepanb@mellanox.com
- What I did
Tried to provide a solution to allow configs sharing between similar platforms;
This also fixes broken links in swss/syncd containers on mellanox platform:
- How I did it$(HWSKU) directories to files from other $ (HWSKU) directories I added a line to resolve all symbolic links when building sonic-device-data package. So in sources we will have symbolic links pointing to another device configs, but when installing into image will have all symbolic links resolved.
To allow symbolic links in
- How to verify it
Build image, install on different devices, run some tests;
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)