Skip to content

[fast-reboot] don't restore original image when no new image defined#718

Merged
lguohan merged 1 commit intosonic-net:masterfrom
yxieca:fast-reboot
Oct 5, 2018
Merged

[fast-reboot] don't restore original image when no new image defined#718
lguohan merged 1 commit intosonic-net:masterfrom
yxieca:fast-reboot

Conversation

@yxieca
Copy link
Collaborator

@yxieca yxieca commented Oct 5, 2018

Signed-off-by: Ying Xie [email protected]

Type of change

  • Bug fix
  • [] Testbed and Framework(new/improvement)
  • [] Test case(new/improvement)

Approach

How did you do it?

It appears taht ansible ignores 'when' condition for tasks under 'always' section.
When new image is not defined. The original image is not set. So when test executed
to always section trying to restore the origin image, an ansible error occurs.

Use notify/handler mechanism to make sure original image is restored when necessary,
even under failure conditions.

How did you verify/test it?

Tested fast-reboot on my local DUT. With vlan subnet fixed, the test passes, (not 100% pass yet, but better than 100% failure).

@yxieca
[fast-reboot] don't restore original image when no new image defined
3acd4b3 
It appears taht ansible ignores 'when' condition for tasks under 'always' section.
When new image is not defined. The original image is not set. So when test executed
to always section trying to restore the origin image, an ansible error occurs.

Use notify/handler mechanism to make sure original image is restored when necessary,
even under failure conditions.

Signed-off-by: Ying Xie <[email protected]>
@lguohan lguohan merged commit fa02309 into sonic-net:master Oct 5, 2018
@yxieca yxieca deleted the fast-reboot branch October 5, 2018 16:53
yxieca added a commit that referenced this pull request Oct 5, 2018
@yxieca
[fast-reboot] don't restore original image when no new image defined (#…
7f97bc4 
…718)

It appears taht ansible ignores 'when' condition for tasks under 'always' section.
When new image is not defined. The original image is not set. So when test executed
to always section trying to restore the origin image, an ansible error occurs.

Use notify/handler mechanism to make sure original image is restored when necessary,
even under failure conditions.

Signed-off-by: Ying Xie <[email protected]>
wangxin pushed a commit to wangxin/sonic-mgmt that referenced this pull request Oct 27, 2025
@ccroy-arista
[TH5] Skip VxLAN Tests for Non-Applicable Topologies (sonic-net#718)
659a17b 
Note: this is a manual cherry-pick to msft-202412 of
sonic-net#20552
Note: depends on sonic-net#20382 to
pass static analysis.

### Description of PR
Skip the following tests:
decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=set_unset]
vxlan/test_vxlan_decap.py

for the following topologes:
- t0-isolated-d32u32s2
- t0-isolated-d256u256s2
- t0-isolated-v6-d32u32s2
- t0-isolated-v6-d256u256s2
- t1-isolated-d56u2
- t1-isolated-d56u1-lag
- t1-isolated-d448u15-lag
- t1-isolated-v6-d56u2
- t1-isolated-v6-d56u1-lag
- t1-isolated-v6-d448u15-lag
- t1-isolated-d32
- t1-isolated-d128
- t1-isolated-v6-d128
- t0-isolated-d96u32s2
- t0-isolated-v6-d96u32s2

Summary:
Fixes # (issue)

### Type of change
- [ ] Bug fix
- [ ] Testbed and Framework(new/improvement)
- [ ] New Test case
    - [ ] Skipped for non-supported platforms
- [x] Test case improvement

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [x] 202412

### Approach
#### What is the motivation for this PR?
Skip tests that are not required for the following topologies:
t0-isolated-d32u32s2, t0-isolated-d256u256s2, t0-isolated-v6-d32u32s2,
t0-isolated-v6-d256u256s2, t1-isolated-d56u2, t1-isolated-d56u1-lag,
t1-isolated-d448u15-lag, t1-isolated-v6-d56u2, t1-isolated-v6-d56u1-lag,
t1-isolated-v6-d448u15-lag, t1-isolated-d32, t1-isolated-d128,
t1-isolated-v6-d128, t0-isolated-d96u32s2, t0-isolated-v6-d96u32s2.

#### How did you do it?
Added a skip conditional mark to the following tests:
decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=set_unset]
vxlan/test_vxlan_decap.py

#### How did you verify/test it?
Tried to run the test and confirmed it is skipped.
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@tsvanduyn @qiluo-msft
[snmp]: updated to support snmp config from redis configdb (sonic-net…
0226140 
…#6134)

**- Why I did it**
I'm updating the jinja2 template to support getting SNMP information from the redis configdb. 
I'm using the format approved here: 
sonic-net/SONiC#718

This will pave the way for us to decrement using the snmp.yml in the future.  
Right now we will still be using both the snmp.yml and configdb to get variable information in order to create the snmpd.conf via the sonic-cfggen tool. 

**- How I did it**
I first updated the SNMP Schema in PR sonic-net#718 to get that approved as a standardized format. 
Then I verified I could add snmp configs to the configdb using this standard schema.  Once the configs were added to the configdb then I updated the snmpd.conf.j2 file to support the updates via the configdb while still using the variables in the snmp.yml file in parallel.  This way we will have backward compatibility until we can fully migrate to the configdb only. 

By updating the snmpd.conf.j2 template and running the sonic-cfggen tool the snmpd.conf gets generated with using the values in both the configdb and snmp.yml file. 

Co-authored-by: trvanduy <[email protected]>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@prsunny
[Submodule] Update swss-common (sonic-net#13406)
21ad987 
Swss-common submodule update:
c5ed58a - 2023-01-17 : 202012 cast of PR sonic-net/sonic-swss-common#725 (sonic-net#738) [siqbal1986]
fe28725 - 2022-11-30 : Use github code scanning instead of LGTM (sonic-net#718) [Liu Shilong]
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@yxieca
[202205][linkmgrd][utilities][swss][swss-common][platform-daemons][pl…
3f51143 
…atform-common][py-swsssdk] advance submodule head (sonic-net#13260)

linkmgrd:
* bf75a93 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#157) (HEAD -> 202205, github/202205) [Liu Shilong]

utilities:
* c1fa31d 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#2530) (HEAD -> 202205) [Liu Shilong]
* 9990208 2022-05-19 | Add sonic-delayed.target to Application Extension .timer file generator (sonic-net#2176) [noaOrMlnx]

swss:
* bbccc68 2023-01-04 | [vstest] Only collect stdout of orchagent_restart_check in vstest (sonic-net#2597) (HEAD -> 202205, github/202205) [bingwang-ms]
* f7a7c05 2023-01-04 | Avoid aborting orchagent when setting TUNNEL attributes (sonic-net#2591) [Stephen Sun]
* 84064fa 2022-12-20 | Fixed a bug causing error state of same configuration is applied twice. (sonic-net#2580) [siqbal1986]
* 4851bef 2022-12-20 | Only collect stdout of orchagent_restart_check in vstest (sonic-net#2578) [bingwang-ms]
* 2904d95 2022-12-05 | sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552) [Sambath Kumar Balasubramanian]
* ac84e41 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#2546) [Liu Shilong]
* 502bd69 2022-12-20 | Fix `test_vlan.py` (sonic-net#2541) [Longxiang Lyu]
* 1e37d0e 2022-12-19 | [voq][chassis]Add show fabric counters port/queue commands (sonic-net#2522) [jfeng-arista]
* 17cdad3 2022-12-20 | [bufferorch] : Support for buffer profiles for VoQ on chassis (sonic-net#2465) [vmittal-msft]
* 5345338 2023-01-04 | Disable `arp_evict_nocarrier` for vlan host intf  (sonic-net#2590) [Longxiang Lyu]

swss-common:
* 9616287 2023-01-04 | Added customer monitoring  tables in app db and state db (sonic-net#725) (HEAD -> 202205) [siqbal1986]
* d03b95d 2022-11-30 |  Use github code scanning instead of LGTM (sonic-net#718) [Liu Shilong]
* 8a276c6 2022-12-28 | Fix sonic-slave docker image environment issue. (sonic-net#728) (github/202205) [Liu Shilong]
* 8fee1b4 2022-11-14 | Fix memory leak issue in ConfigDBConnector. (sonic-net#655) (sonic-net#706) [Hua Liu]

sairedis:
* 5387602 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#1160) (HEAD -> 202205) [Liu Shilong]

platform-daemons:
* b499412 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#316) (HEAD -> 202205, github/202205) [Liu Shilong]

platform-common:
* d11e983 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#328) (HEAD -> 202205) [Liu Shilong]

py-swsssdk:
* b654e91 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#131) (HEAD -> 202205) [Liu Shilong]

Signed-off-by: Ying Xie <[email protected]>

Signed-off-by: Ying Xie <[email protected]>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@abdosi
[submodule update] sonic-sairedis
adbf788 
e98a7af95a9767093904d9e8fd320067163d5f87 (HEAD -> 201911, origin/201911) [syncd] Translate removed RIDs in fdb notification (sonic-net#729)
3ceeae5371eee5b69064fa1af88f51e27caa2d36 [syncd] Process all cases fdb flush notification (sonic-net#726)
115ba0783edf85658fd0329eb23796d758c309f5 fix compile error when compiling with g++-4.8.4 (sonic-net#718)
a67f94d3d91325516069ef8c0d99bdec30bafbce Fix typo at SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT32 (sonic-net#662)

Signed-off-by: Abhishek Dosi <[email protected]>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@StormLiangMS
[submodules] advance submodules for 202211 sonic-net#13781
1d155b8 
Why I did it
Submodule advances:
sonic-utilities

8e8e6088 - [202211][dhcp_relay] Remove add field of vlanid to DHCP_RELAY table while adding vlan ([201811 sub-module] advance sub-modules: utilities, swss, swss-common sonic-net#2679) (16 hours ago) [Yaqiang Zhu]
1400fb94 - [GCU] Ignore bgpraw in GCU applier (Fix sfputil indexing for 7170-Q59S20 sonic-net#2623) (15 hours ago) [jingwenxie]
f76a6364 - [vlan] Refresh dhcpv6_relay config while adding/deleting a vlan ([sonic-py-swsssdk] Update submodule sonic-net#2660) (15 hours ago) [Yaqiang Zhu]
7849e18d - [db_migrator] make LOG_LEVEL_DB migration more robust (Mellanox platform: attach queues 2 and 6 to lossy profile using generic buffer template sonic-net#2651) (16 hours ago) [Stepan Blyshchak]
c7df6dfa - Fixed a bug in "show vnet routes all" causing screen overrun. (Add hook to allow customizing link cable lengths sonic-net#2644) (16 hours ago) [siqbal1986]
a5505f02 - show logging CLI support for logs stored in tmpfs (Traceback error seen while issuing show interface commands with if_names sonic-net#2641) (16 hours ago) [mihirpat1]
bbacb91a - [system-health] Fix issue: show system-health CLI crashes (Updating deb package for platform and sai sonic-net#2635) (16 hours ago) [Junchao-Mellanox]
8d724024 - [sai_failure_dump]Invoking dump during SAI failure ([dockers]: Upgrade LLDP docker to stretch build sonic-net#2633) (16 hours ago) [Sudharsan Dhamal Gopalarathnam]
3c3be526 - Add transceiver info CLI support to show output from TRANSCEIVER_INFO for ZR ([submodule]: Update sonic-sairedis pointer sonic-net#2630) (16 hours ago) [mihirpat1]
37f41666 - [show] add support for gRPC show commands for active-active ([bitmap-vnet]: Bitmap vnet test image [DO NOT MERGE] sonic-net#2629) (16 hours ago) [vdahiya12]
b06d7fe4 - [show_bfd] add local discriminator in show bfd command ([Pmon] Selectively load pmon container daemons sonic-net#2625) (16 hours ago) [Baorong Liu]
6adcd3e8 - [GCU] Ignore bgpraw table in GCU operation ([Mellanox] Fix SAI version sonic-net#2628) (16 hours ago) [jingwenxie]
c65bdc35 - [muxcable][config] Add support to enable/disable ceasing to be an advertisement interface when radv service is stopped (Add knob in ConfigDB to enable/disable telemetry container sonic-net#2622) (16 hours ago) [Jing Zhang]
91e9457f - Add Transceiver PM basic CLI support to show output from TRANSCEIVER_PM table for ZR ([201803] Restart SwSS, syncd and dependent services if a critical process in syncd container exits sonic-net#2615) (16 hours ago) [longhuan-cisco]
54cc8c5a - Remove TODO comment which is no longer relevant (Warm-reboot: teamd warm restart caused neighbor deleted and learned again.  sonic-net#2600) (16 hours ago) [Lior Avramov]
6891b4fb - Making 'show feature autorestart' more resilient to missing auto_restart config in CONFIG_DB ([submodule] update mellanox hw-mgmgt pointer (V.2.0.0061) sonic-net#2592) (16 hours ago) [kartik-arista]
1e8bea37 - [storyteller] add link prober state change to story teller ([sonic-buildimage] New feature managementVRF(L3mdev) sonic-net#2585) (16 hours ago) [Jing Zhang]
7481a20f - Extend fast-reboot STATE_DB entry timer ([submodule]: update sonic-swss-common, sonic-py-swsssdk, sonic-snmpagent sonic-net#2577) (16 hours ago) [Aryeh Feigin]
0e08701c - [sonic_installer] use /etc/resolv.conf from the host when migrating packages (Set a rate limit on syslog messages from all Docker containers sonic-net#2573) (16 hours ago) [Stepan Blyshchak]
06096780 - Fixed admin state config CLI for Backport interfaces (Prior to install a new ONIE SONiC image, delete all partitions except EFI/ONIE sonic-net#2557) (16 hours ago) [anamehra]
9f1f13e4 - [show] Add bgpraw to show run all (Fixed typo on paragraph sonic-net#40 sonic-net#2537) (16 hours ago) [jingwenxie]
98bc8bd2 - [chassis][voq] Add "show fabric reachability" command. ([ntp]: Build 4.2.6 locally. sonic-net#2528) (16 hours ago) [jfeng-arista]
3a50b63f - Preserve copp tables through DB migration ([docker-radvd]: upgrade docker radvd to stretch based sonic-net#2524) (16 hours ago) [Aryeh Feigin]
28f6b127 - [masic] 'show interfaces counters' reminds to use '-d all' option to check for internal links (solve dependency issue sonic-net#2466) (16 hours ago) [wenyiz2021]
15026e14 - suppport multi asic for show queue counter ([dockers] Prevent old supervisord messages from gettting re-logged to syslog sonic-net#2439) (16 hours ago) [zhixzhu]
2d773e17 - [masic support] 'show run bgp' support for multi-asic (lo address not synced to the asic sonic-net#2427) (16 hours ago) [wenyiz2021]
sonic-swss

4f304bc - [EVPN]Handling race condition when remote VNI arrives before tunnel map entry ([sonic-quagga] Function defect, do NOT cancel route while connect IP down sonic-net#2642) (15 hours ago) [Sudharsan Dhamal Gopalarathnam]
34fc615 - [sai_failure_dump]Invoking dump during SAI failure (Add hook to allow customizing link cable lengths sonic-net#2644) (15 hours ago) [Sudharsan Dhamal Gopalarathnam]
b817695 - [autoneg]Fixing adv interface types to be set when AN is disabled (Fix issue with platform file path name sonic-net#2638) (15 hours ago) [Sudharsan Dhamal Gopalarathnam]
ab36bd4 - [bfdorch] add local discriminator to state DB ([bitmap-vnet]: Bitmap vnet test image [DO NOT MERGE] sonic-net#2629) (15 hours ago) [Baorong Liu]
6343471 - Remove TODO comments that are no longer relevant (Add knob in ConfigDB to enable/disable telemetry container sonic-net#2622) (15 hours ago) [Lior Avramov]
2b1869c - [refactor]Refactoring sai handle status (Rollback kernel submodule update. sonic-net#2621) (15 hours ago) [Sudharsan Dhamal Gopalarathnam]
c41a1b7 - Fix issue ARP entry is out of sync between kernel and APPL_DB after warm reboot if the ARP entry is updated more than once during warm reboot in PFC watchdog warm reboot test sonic-net#13341 ARP entry can be out of sync between kernel and APPL_DB if multiple updates are received from RTNL ([sub module] advance sonic-utilities sub module for 201811 branch sonic-net#2619) (15 hours ago) [Stephen Sun]
da0cf7a - Changed the BFD default detect multiplier to 10x ("failed to load plugin io.containerd.snapshotter..." seen during linux boot up sonic-net#2614) (15 hours ago) [siqbal1986]
13b5adf - [vstest] Only collect stdout of orchagent_restart_check in vstest ([submodules] update swss and utilities pointers sonic-net#2597) (15 hours ago) [bingwang-ms]
2b9d94d - Avoid aborting orchagent when setting TUNNEL attributes (build failing for PLATFORM=p4 sonic-net#2591) (15 hours ago) [Stephen Sun]
99b7d3b - Only collect stdout of orchagent_restart_check in vstest ( [saibcm-modules]: import new bcm modules sonic-net#2578) (15 hours ago) [bingwang-ms]
5209c42 - dereg acl-rule counters during acl-table del ([201803] Set a rate limit on syslog messages from all Docker containers sonic-net#2574) (15 hours ago) [Vivek]
ae68054 - Fixed set mtu for deleted subintf due to late notification ([vs]: Add option to specify platform name for DVS orchagent sonic-net#2571) (15 hours ago) [EdenGri]
ab13dfa - Remove TODO comments which are no longer needed (support set timezone in ConfigDB sonic-net#2568) (15 hours ago) [Junchao-Mellanox]
a3545cf - Modify coppmgr mergeConfig to support preserving copp tables through reboot. (Added new SN3700/SN3700C Mellanox platforms sonic-net#2548) (15 hours ago) [Aryeh Feigin]
be16e79 - Use github code scanning instead of LGTM ([201803] [services] Restart SwSS service upon unexpected critical process exit sonic-net#2546) (15 hours ago) [Liu Shilong]
63c0234 - Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID (Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… sonic-net#2538) (15 hours ago) [Tapash Das]
4844111 - Fix potential risks ([mlnx] Fix sai xml path for boxer platform sonic-net#2516) (15 hours ago) [Liran-Ar]
6420808 - [p4orch]: PINS Extension tables support ([build] When generating image version, handle case where current commit has no reachable tags sonic-net#2506) (15 hours ago) [svshah-intel]
sonic-swss-common

1badd46 - Increase the netlink buffer size from 3MB to 16MB. (arp_update doesn't sleep 300 between each execution sonic-net#739) (14 hours ago) [KISHORE KUNAL]
6555057 - Refactor eventpublisher deinit ([acl] Add default deny rule for l3 table sonic-net#734) (14 hours ago) [Zain Budhwani]
f4d6de7 - Use github code scanning instead of LGTM ([sonic-quagga]:update submodule sonic-net#718) (14 hours ago) [Liu Shilong]
sonic-linux-kernel

74f9a8f - Update linux kernel for hw-mgmt V.7.0020.4104 (Move template files to /usr/share/sonic/templates sonic-net#305) (14 hours ago) [Stephen Sun]
6365701 - Fixes for emmc unreliability ([build_debian.sh]: Integrate system dump script sonic-net#270) (14 hours ago) [Samuel Angebault]
How I did it
How to verify it
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lguohan lguohan lguohan approved these changes

@pavel-shirshov pavel-shirshov Awaiting requested review from pavel-shirshov

@stepanblyschak stepanblyschak Awaiting requested review from stepanblyschak

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@yxieca @lguohan