-
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
[sonic-utilities]: integrate into base image #282
Conversation
build_debian.sh
Outdated
@@ -188,7 +188,20 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in | |||
usbutils \ | |||
pciutils \ | |||
iptables-persistent \ | |||
logrotate | |||
logrotate \ | |||
grub2-common |
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.
can you add grub2-common as into sonic-utilities depends so that we do not need to explicitly specify here.
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.
It already is
Reason that I mentioned it explicitly is that apt-get install -f removes sonic-utilities instead of installing grub2-common
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.
Checked again - it was failing because of tabulate package (removed grub2-common from this line)
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.
Done
build_debian.sh
Outdated
grub2-common | ||
|
||
# Python tabulate required for sonic-utilities | ||
python_tabulate_url=http://ftp.ca.debian.org/debian/pool/main/p/python-tabulate/python-tabulate_0.7.7-1_all.deb |
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.
uploaded this package to here. can you use this url
http://packages.microsoft.com/repos/sonic-dev/pool/main/p/python-tabulate/python-tabulate_0.7.7-1_all.deb
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.
Done
build_debian.sh
Outdated
} | ||
# Sonic utilities | ||
sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/sonic-utilities_*.deb || \ | ||
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f |
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.
instead of here, is it better move all these into sonic_debian_extension.sh since this tools requires oneimage to work?
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.
This is generic package that has nothing vendor related.
sonic-generic.bin can have it with no problems.
decd7e7
to
06e3d49
Compare
not exactly, the tools in sonic-utilities assumes a fully functional sonic, for example the sfputil require the hw-management package to be install and running. |
Signed-off-by: marian-pritsak <[email protected]>
06e3d49
to
88c85b8
Compare
Moved to extension |
sonic-swss: [vnet]: Extend Bitmap VNET test with "remove" flows (sonic-net#900) [vxlanorch] Ambiguous return code for removeNextHopTunnel (sonic-net#880) Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (sonic-net#839) Set LAG mtu value based on kernel netlink msg (sonic-net#922) [orchagent]: Remove try/catch for correct coredump file (sonic-net#790) [aclorch] unittest by gtest (sonic-net#924) [orchagent]: Added support of PFC WD for BFN platform (sonic-net#823) [vnetorch]: Fix tunnel route removal flow for bitmap VNET (sonic-net#912) pkill -9 zebra for frr warm restart VS test fix (sonic-net#927) swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB (sonic-net#907) [debian]: Do not build test when building with real SAI (sonic-net#932) sonic-swss-common: Add schema for dot1p to tc mapping config table (sonic-net#274) Fix MIRROR_SESSION table macro name (sonic-net#264) [schema] Add VNET Route tables in config_db (sonic-net#279) [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#280) White-list clear_stats op from orchagent to syncd (sonic-net#281) Correct comment (sonic-net#282) sonic-sairedis: [debian]: Change build order in target binary (sonic-net#452) [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#461) Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (sonic-net#462) add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (sonic-net#460) Check if port VID exists in db on flex counter query (sonic-net#464) Full sleep wait change for PFC watchdog (sonic-net#465) Add synchronous clear_stats operation path (sonic-net#463) Modify sai_create_port to breakout a port for virtual switch (sonic-net#454) Fix typo (sonic-net#467) Signed-off-by: Shu0T1an ChenG <[email protected]>
sonic-swss: [vnet]: Extend Bitmap VNET test with "remove" flows (#900) [vxlanorch] Ambiguous return code for removeNextHopTunnel (#880) Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (#839) Set LAG mtu value based on kernel netlink msg (#922) [orchagent]: Remove try/catch for correct coredump file (#790) [aclorch] unittest by gtest (#924) [orchagent]: Added support of PFC WD for BFN platform (#823) [vnetorch]: Fix tunnel route removal flow for bitmap VNET (#912) pkill -9 zebra for frr warm restart VS test fix (#927) swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB (#907) [debian]: Do not build test when building with real SAI (#932) sonic-swss-common: Add schema for dot1p to tc mapping config table (#274) Fix MIRROR_SESSION table macro name (#264) [schema] Add VNET Route tables in config_db (#279) [debian] increment debian compatibility to 10 to enable parallel package build (#280) White-list clear_stats op from orchagent to syncd (#281) Correct comment (#282) sonic-sairedis: [debian]: Change build order in target binary (#452) [debian] increment debian compatibility to 10 to enable parallel package build (#461) Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (#462) add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (#460) Check if port VID exists in db on flex counter query (#464) Full sleep wait change for PFC watchdog (#465) Add synchronous clear_stats operation path (#463) Modify sai_create_port to breakout a port for virtual switch (#454) Fix typo (#467) Signed-off-by: Shu0T1an ChenG <[email protected]>
* Update src/sonic-swss-common from branch 'broadcom_sonic' to 124d498601ff860736888c2ece1c9753b4da41b9 - Merge 201904 branch to broadcom_sonic branch on Mon Jul 1 13:57:58 PDT 2019 Change-Id: I38ebacb16ce081d657b369dadb0ae213737484b0 - Correct comment (sonic-net#282) Signed-off-by: Wenda Ni <[email protected]> - White-list clear_stats op from orchagent to syncd (sonic-net#281) Signed-off-by: Wenda Ni <[email protected]> - [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#280) From debhelper man pages: "If neither option is specified, debhelper currently defaults to --parallel in compat 10 (or later) and --no-parallel otherwise." - [schema] Add VNET Route tables in config_db (sonic-net#279) * Add VNET Route tables in config_db * fix the space alignment * address alighment by replacing tab with space - Fix MIRROR_SESSION table macro name (sonic-net#264) Signed-off-by: Jipan Yang <[email protected]> - Add schema for dot1p to tc mapping config table (sonic-net#274) Signed-off-by: Wenda Ni <[email protected]>
* Add missing SWSS_LOG_ENTER macros * Fix missing include
4.0.0 testplan
Update sonic-linux-kernel submodule pointer to include the following: * [202012][patch] mlxsw: i2c: Prevent transaction execution for special chip states ([sonic-net#282](sonic-net/sonic-linux-kernel#282)) Signed-off-by: dprital <[email protected]>
Update sonic-linux-kernel submodule pointer to include the following: * [202012][patch] mlxsw: i2c: Prevent transaction execution for special chip states ([#282](sonic-net/sonic-linux-kernel#282)) Signed-off-by: dprital <[email protected]>
…aemon] advance submodule head linkmgrd: * 17240f1 2022-08-02 | [active-active] Update unhealthy label definition (sonic-net#102) (HEAD -> 202205, github/202205) [Jing Zhang] * 99a7b4b 2022-07-28 | Update the definition of healthy label (sonic-net#99) [Jing Zhang] * 551144b 2022-08-08 | [Active-Standby]Remove unnecessary `handleMuxWaitTimeout` logs (sonic-net#100) [Jing Zhang] utilities: * 8cbbe4f 2022-08-08 | [crm] add checking for CRM interval range (sonic-net#2293) (HEAD -> 202205, github/202205) [Andriy Yurkiv] * 7dac7a7 2022-08-03 | Fix version in db_migrator for `PORT_QOS_MAP|global` (sonic-net#2289) [bingwang-ms] * e14f0c9 2022-08-03 | Add override testcase to verify removal (sonic-net#2288) [jingwenxie] * 61ea21d 2022-07-29 | [watermarkstat] Fix CLI script for unconfigured PG counters (sonic-net#2239) [Nazarii Hnydyn] * e206e2d 2022-05-19 | [portconfig] Allow to configure interface mtu for physical ports only [Sudharsan Dhamal Gopalarathnam] * 9751479 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#2285) [Liu Shilong] * 218b175 2022-07-29 | [202205][counters] Keep counters cache in a single directory (sonic-net#2280) [Stepan Blyshchak] swss: * d772a70 2022-08-09 | [muxorch] return true if the nbr IP is in the skip_neighbors list (sonic-net#2407) (HEAD -> 202205) [Nikola Dancejic] * a3ac275 2022-08-08 | [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (sonic-net#2404) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * 67c1376 2022-08-09 | [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (sonic-net#2379) [Stephen Sun] * 0295a35 2022-07-21 | [Buffer Orch] Support removing buffer port profile list (sonic-net#2371) [Stephen Sun] * 450e9ec 2022-07-07 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#2357) [Qi Luo] * c1c1147 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#2308) [Qi Luo] swss-common: * 749cd6f 2022-07-21 | Fix PING database command not backward compatible with python version issue. (sonic-net#650) (HEAD -> 202205) [Hua Liu] * 4fa7484 2022-06-27 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#640) [Qi Luo] * 4d0dc7a 2022-06-23 | [sonic-cli] Fix sonic-db-cli output format not backward compatible with python version issue. (sonic-net#631) [Hua Liu] * c5573fe 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#628) [Qi Luo] * 0ade483 2022-08-02 | Add docker-mux related table names (sonic-net#627) [Jing Zhang] * 675d793 2022-05-26 | Re-write sonic-db-cli with c++ for sonic startup performance issue (sonic-net#607) [Hua Liu] * 1155773 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#661) (github/202205) [Liu Shilong] sairedis: * c62a453 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#1057) (HEAD -> 202205) [Qi Luo] * 8be9292 2022-07-20 | [syncd] Remove error message when tryTranslateVidToRid fails (sonic-net#1048) [Kamil Cudnik] * eb552ee 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#1099) (github/202205) [Liu Shilong] platform-daemon: * d150229 2022-08-11 | Correct the peer forwarding state table (sonic-net#281) (HEAD -> 202205) [Longxiang Lyu] * 9507e6c 2022-08-10 | [ycabled] remove some spurious logs (sonic-net#282) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>
…aemon] advance submodule head (#11652) linkmgrd: * 17240f1 2022-08-02 | [active-active] Update unhealthy label definition (#102) (HEAD -> 202205, github/202205) [Jing Zhang] * 99a7b4b 2022-07-28 | Update the definition of healthy label (#99) [Jing Zhang] * 551144b 2022-08-08 | [Active-Standby]Remove unnecessary `handleMuxWaitTimeout` logs (#100) [Jing Zhang] utilities: * 8cbbe4f 2022-08-08 | [crm] add checking for CRM interval range (#2293) (HEAD -> 202205, github/202205) [Andriy Yurkiv] * 7dac7a7 2022-08-03 | Fix version in db_migrator for `PORT_QOS_MAP|global` (#2289) [bingwang-ms] * e14f0c9 2022-08-03 | Add override testcase to verify removal (#2288) [jingwenxie] * 61ea21d 2022-07-29 | [watermarkstat] Fix CLI script for unconfigured PG counters (#2239) [Nazarii Hnydyn] * e206e2d 2022-05-19 | [portconfig] Allow to configure interface mtu for physical ports only [Sudharsan Dhamal Gopalarathnam] * 9751479 2022-08-01 | Transfer organization from Azure to sonic-net (#2285) [Liu Shilong] * 218b175 2022-07-29 | [202205][counters] Keep counters cache in a single directory (#2280) [Stepan Blyshchak] swss: * d772a70 2022-08-09 | [muxorch] return true if the nbr IP is in the skip_neighbors list (#2407) (HEAD -> 202205) [Nikola Dancejic] * a3ac275 2022-08-08 | [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (#2404) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * 67c1376 2022-08-09 | [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (#2379) [Stephen Sun] * 0295a35 2022-07-21 | [Buffer Orch] Support removing buffer port profile list (#2371) [Stephen Sun] * 450e9ec 2022-07-07 | Fix: missing sonic-db-cli in docker-sonic-vs image (#2357) [Qi Luo] * c1c1147 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (#2308) [Qi Luo] swss-common: * 749cd6f 2022-07-21 | Fix PING database command not backward compatible with python version issue. (#650) (HEAD -> 202205) [Hua Liu] * 4fa7484 2022-06-27 | Fix: missing sonic-db-cli in docker-sonic-vs image (#640) [Qi Luo] * 4d0dc7a 2022-06-23 | [sonic-cli] Fix sonic-db-cli output format not backward compatible with python version issue. (#631) [Hua Liu] * c5573fe 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (#628) [Qi Luo] * 0ade483 2022-08-02 | Add docker-mux related table names (#627) [Jing Zhang] * 675d793 2022-05-26 | Re-write sonic-db-cli with c++ for sonic startup performance issue (#607) [Hua Liu] * 1155773 2022-08-01 | Transfer organization from Azure to sonic-net (#661) (github/202205) [Liu Shilong] sairedis: * c62a453 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (#1057) (HEAD -> 202205) [Qi Luo] * 8be9292 2022-07-20 | [syncd] Remove error message when tryTranslateVidToRid fails (#1048) [Kamil Cudnik] * eb552ee 2022-08-01 | Transfer organization from Azure to sonic-net (#1099) (github/202205) [Liu Shilong] platform-daemon: * d150229 2022-08-11 | Correct the peer forwarding state table (#281) (HEAD -> 202205) [Longxiang Lyu] * 9507e6c 2022-08-10 | [ycabled] remove some spurious logs (#282) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>
…aemon] advance submodule head (sonic-net#11652) linkmgrd: * 17240f1 2022-08-02 | [active-active] Update unhealthy label definition (sonic-net#102) (HEAD -> 202205, github/202205) [Jing Zhang] * 99a7b4b 2022-07-28 | Update the definition of healthy label (sonic-net#99) [Jing Zhang] * 551144b 2022-08-08 | [Active-Standby]Remove unnecessary `handleMuxWaitTimeout` logs (sonic-net#100) [Jing Zhang] utilities: * 8cbbe4f 2022-08-08 | [crm] add checking for CRM interval range (sonic-net#2293) (HEAD -> 202205, github/202205) [Andriy Yurkiv] * 7dac7a7 2022-08-03 | Fix version in db_migrator for `PORT_QOS_MAP|global` (sonic-net#2289) [bingwang-ms] * e14f0c9 2022-08-03 | Add override testcase to verify removal (sonic-net#2288) [jingwenxie] * 61ea21d 2022-07-29 | [watermarkstat] Fix CLI script for unconfigured PG counters (sonic-net#2239) [Nazarii Hnydyn] * e206e2d 2022-05-19 | [portconfig] Allow to configure interface mtu for physical ports only [Sudharsan Dhamal Gopalarathnam] * 9751479 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#2285) [Liu Shilong] * 218b175 2022-07-29 | [202205][counters] Keep counters cache in a single directory (sonic-net#2280) [Stepan Blyshchak] swss: * d772a70 2022-08-09 | [muxorch] return true if the nbr IP is in the skip_neighbors list (sonic-net#2407) (HEAD -> 202205) [Nikola Dancejic] * a3ac275 2022-08-08 | [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (sonic-net#2404) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * 67c1376 2022-08-09 | [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (sonic-net#2379) [Stephen Sun] * 0295a35 2022-07-21 | [Buffer Orch] Support removing buffer port profile list (sonic-net#2371) [Stephen Sun] * 450e9ec 2022-07-07 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#2357) [Qi Luo] * c1c1147 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#2308) [Qi Luo] swss-common: * 749cd6f 2022-07-21 | Fix PING database command not backward compatible with python version issue. (sonic-net#650) (HEAD -> 202205) [Hua Liu] * 4fa7484 2022-06-27 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#640) [Qi Luo] * 4d0dc7a 2022-06-23 | [sonic-cli] Fix sonic-db-cli output format not backward compatible with python version issue. (sonic-net#631) [Hua Liu] * c5573fe 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#628) [Qi Luo] * 0ade483 2022-08-02 | Add docker-mux related table names (sonic-net#627) [Jing Zhang] * 675d793 2022-05-26 | Re-write sonic-db-cli with c++ for sonic startup performance issue (sonic-net#607) [Hua Liu] * 1155773 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#661) (github/202205) [Liu Shilong] sairedis: * c62a453 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#1057) (HEAD -> 202205) [Qi Luo] * 8be9292 2022-07-20 | [syncd] Remove error message when tryTranslateVidToRid fails (sonic-net#1048) [Kamil Cudnik] * eb552ee 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#1099) (github/202205) [Liu Shilong] platform-daemon: * d150229 2022-08-11 | Correct the peer forwarding state table (sonic-net#281) (HEAD -> 202205) [Longxiang Lyu] * 9507e6c 2022-08-10 | [ycabled] remove some spurious logs (sonic-net#282) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>
Update sonic-platform-daemons submodule pointer to include the following: * [ycabled] enable telemetry for 'active-active'; fix gRPC portid ordering ([sonic-net#284](sonic-net/sonic-platform-daemons#284)) * [ycabled] remove some spurious logs ([sonic-net#282](sonic-net/sonic-platform-daemons#282)) * Correct the peer forwarding state table ([sonic-net#281](sonic-net/sonic-platform-daemons#281)) * add psu input voltage and current ([sonic-net#276](sonic-net/sonic-platform-daemons#276)) * [ycabled] add capability to enable/disable telemetry ([sonic-net#279](sonic-net/sonic-platform-daemons#279)) Signed-off-by: dprital <[email protected]>
- Why I did it Update sonic-platform-daemons submodule pointer to include the following: [ycabled] enable telemetry for 'active-active'; fix gRPC portid ordering (#284) [ycabled] remove some spurious logs (#282) Correct the peer forwarding state table (#281) add psu input voltage and current (#276) [ycabled] add capability to enable/disable telemetry (#279) Signed-off-by: dprital <[email protected]>
Related work items: sonic-net#90, sonic-net#282, sonic-net#7652, sonic-net#11220, sonic-net#11333, sonic-net#11358, sonic-net#11359, sonic-net#11371, sonic-net#11383, sonic-net#11386, sonic-net#11391, sonic-net#11398, sonic-net#11400, sonic-net#11406, sonic-net#11414, sonic-net#11421, sonic-net#11422, sonic-net#11427, sonic-net#11448, sonic-net#11451
* [ycabled] remove some spurious logs For Ports which do not belong to active-active or active-standby type, we should not try to post muxcable telemetry information for them. This PR remove the warning message for such a posting. Also fixes the PR pipeline by changing the ConsumerTable to SubscriberStateTable Signed-off-by: vaibhav-dahiya <[email protected]>
Signed-off-by: marian-pritsak [email protected]