Make pmon feature delayed flag as jinja template #19657

yejianquan · 2024-07-23T12:58:17Z

What I did:

To fix: #19126
Depends on: sonic-net/sonic-host-services#135 and it's submodule update.

ps: this is an enhancement/fix of #19482 since Abhishek is in OOF

Why I did it

PMON was delayed originally for faster uptime of data plane related services in case of fast/warm reboot.
This is not needed for T2/SpineRouter . Infact we need PMON to be up asap because of:

pmon need to enable asap to detect ASIC's on Supervisor.
pmon need to enable asap for bring-up of 400G ports on LC's fast because of CMIS state machine present in PMON.

Work item tracking

Microsoft ADO (number only):

How to verify it

Manual Verification and UT has been added in sonic-net/sonic-host-services#135

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

peer device's Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

higher value so that BGP learnt default route is higher priority. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

save as `slice_type` as part of DEVICE_METADATA Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

…graph and" This reverts commit 0f2d26d.

save as `slice_type` as part of DEVICE_METADATA for Chassis Device type Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

pmon need to enable asap to detect ASIC's on Supervisor. pmonm need to enable asap for bring-up of 400G ports on LC's fast becuase of CMIS state machine present in PMON. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

yejianquan · 2024-07-24T13:44:34Z

Hi @mlok-nokia @arlakshm, please help to review

yejianquan · 2024-07-25T01:25:05Z

Hi @qiluo-msft @saiarcot895 , could you please help to review and merge?

yejianquan · 2024-07-25T05:18:24Z

@abdosi for viz

saiarcot895 · 2024-07-25T20:52:15Z

files/build_templates/init_cfg.json.j2

@@ -38,7 +38,7 @@
 {%- set features = [("bgp", "{% if not DEVICE_RUNTIME_METADATA['ETHERNET_PORTS_PRESENT'] or ('CHASSIS_METADATA' in DEVICE_RUNTIME_METADATA and DEVICE_RUNTIME_METADATA['CHASSIS_METADATA']['module_type'] in ['supervisor']) %}disabled{% else %}enabled{% endif %}", false, "enabled"),
                   ("database", "always_enabled", false, "always_enabled"),
                   ("lldp", "enabled", true, "enabled"),
-                   ("pmon", "enabled", true, "enabled"),
+                   ("pmon", "enabled", "{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'SpineRouter' %}False{% else %}True{% endif %}", "enabled"),


Why use titlecase instead of lowercase here?

This is to align with sonic-net/sonic-host-services#135
In this change https://github.com/sonic-net/sonic-host-services/blob/ca6b3cdb9a56604765ada4ac67234c117f0fb5ad/scripts/featured#L79 , the host-service takes titlecase only and evaluate them with python eval.

* Fix the Loopback0 IPv6 address of LC's in chassis not reachable from peer device's Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Added change to have flag Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Assign the metric vaule for Ipv6 default route learnt via RA message to higher value so that BGP learnt default route is higher priority. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Add alternate name for bridge interface on supversior in chassis systrem Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Update service_checker.py * Update init_cfg.json.j2 to handle global scope for lldp feature * Update sonic-feature.yang * Added support to parse "AssociatedSliceStr" attribute of minigraph and save as `slice_type` as part of DEVICE_METADATA Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Revert "Added support to parse "AssociatedSliceStr" attribute of minigraph and" This reverts commit 0f2d26d. * Added support to parse "AssociatedSliceStr" attribute of minigraph and save as `slice_type` as part of DEVICE_METADATA for Chassis Device type Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Update minigraph.py * pmon need not be delayed for SpineRouter/T2. pmon need to enable asap to detect ASIC's on Supervisor. pmonm need to enable asap for bring-up of 400G ports on LC's fast becuase of CMIS state machine present in PMON. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Updated Yang model for Feature delay from boolean to string Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fix Build Error Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fix build error Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Update true/false to True/False --------- Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> Co-authored-by: Abhishek Dosi <abdosi@microsoft.com> Co-authored-by: abdosi <58047199+abdosi@users.noreply.github.com>

mssonicbld · 2024-07-26T00:14:36Z

Cherry-pick PR to 202405: #19702

* Fix the Loopback0 IPv6 address of LC's in chassis not reachable from peer device's Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Added change to have flag Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Assign the metric vaule for Ipv6 default route learnt via RA message to higher value so that BGP learnt default route is higher priority. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Add alternate name for bridge interface on supversior in chassis systrem Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Update service_checker.py * Update init_cfg.json.j2 to handle global scope for lldp feature * Update sonic-feature.yang * Added support to parse "AssociatedSliceStr" attribute of minigraph and save as `slice_type` as part of DEVICE_METADATA Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Revert "Added support to parse "AssociatedSliceStr" attribute of minigraph and" This reverts commit 0f2d26d. * Added support to parse "AssociatedSliceStr" attribute of minigraph and save as `slice_type` as part of DEVICE_METADATA for Chassis Device type Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Update minigraph.py * pmon need not be delayed for SpineRouter/T2. pmon need to enable asap to detect ASIC's on Supervisor. pmonm need to enable asap for bring-up of 400G ports on LC's fast becuase of CMIS state machine present in PMON. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Updated Yang model for Feature delay from boolean to string Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fix Build Error Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fix build error Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Update true/false to True/False --------- Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> Co-authored-by: Abhishek Dosi <abdosi@microsoft.com> Co-authored-by: abdosi <58047199+abdosi@users.noreply.github.com>

abdosi and others added 30 commits August 3, 2023 04:47

Fix the Loopback0 IPv6 address of LC's in chassis not reachable from

7a3d7e5

peer device's Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge remote-tracking branch 'upstream/master'

b5b08cf

Added change to have flag

8d9dbb6

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge remote-tracking branch 'upstream/master'

d04bc54

Merge remote-tracking branch 'upstream/master'

264d912

Merge remote-tracking branch 'upstream/master'

957cd71

Assign the metric vaule for Ipv6 default route learnt via RA message to

4e8b101

higher value so that BGP learnt default route is higher priority. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge remote-tracking branch 'upstream/master'

05ec92a

Add alternate name for bridge interface on supversior in chassis systrem

fcbd38d

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge remote-tracking branch 'upstream/master'

76019a7

Merge branch 'sonic-net:master' into master

6ad8644

Merge branch 'sonic-net:master' into master

7bb9243

Update service_checker.py

fbaab85

Update init_cfg.json.j2 to handle global scope for lldp feature

6c5ed3a

Merge branch 'sonic-net:master' into master

d17cde2

Update sonic-feature.yang

33a03e1

Merge remote-tracking branch 'origin/master'

ed933ed

Merge remote-tracking branch 'upstream/master'

93ee8f2

Merge remote-tracking branch 'upstream/master'

b110783

Added support to parse "AssociatedSliceStr" attribute of minigraph and

0f2d26d

save as `slice_type` as part of DEVICE_METADATA Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Revert "Added support to parse "AssociatedSliceStr" attribute of mini…

c676b70

…graph and" This reverts commit 0f2d26d.

Added support to parse "AssociatedSliceStr" attribute of minigraph and

c862d61

save as `slice_type` as part of DEVICE_METADATA for Chassis Device type Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge remote-tracking branch 'upstream/master'

5ba4ab2

Update minigraph.py

d7705ee

Merge remote-tracking branch 'upstream/master'

121ba2a

Merge branch 'master' of https://github.com/abdosi/sonic-buildimage

1a5c764

Merge remote-tracking branch 'upstream/master'

f8196ec

pmon need not be delayed for SpineRouter/T2.

01d4ff0

pmon need to enable asap to detect ASIC's on Supervisor. pmonm need to enable asap for bring-up of 400G ports on LC's fast becuase of CMIS state machine present in PMON. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge branch 'sonic-net:master' into master

47bde91

Updated Yang model for Feature delay from boolean to string

a5a41dd

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

abdosi added 2 commits July 13, 2024 01:13

Fix Build Error

a9a38de

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Fix build error

3411eb5

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

yejianquan requested a review from lguohan as a code owner July 23, 2024 12:58

yejianquan marked this pull request as draft July 23, 2024 12:58

yejianquan mentioned this pull request Jul 23, 2024

Made pmon feature delayed flag as jinja template #19482

Closed

Update true/false to True/False

2c7fe37

yejianquan force-pushed the jianquanye/pmon branch from 6ba7135 to 2c7fe37 Compare July 24, 2024 01:46

yejianquan marked this pull request as ready for review July 24, 2024 13:42

yejianquan requested a review from qiluo-msft as a code owner July 24, 2024 13:42

yejianquan requested review from arlakshm and mlok-nokia July 24, 2024 13:43

yejianquan added the Request for 202405 Branch label Jul 24, 2024

yejianquan requested a review from yxieca July 25, 2024 01:24

yejianquan requested a review from saiarcot895 July 25, 2024 01:42

saiarcot895 reviewed Jul 25, 2024

View reviewed changes

saiarcot895 approved these changes Jul 25, 2024

View reviewed changes

yxieca merged commit 4932a38 into sonic-net:master Jul 26, 2024
22 checks passed

yejianquan added the Approved for 202405 Branch label Jul 26, 2024

mssonicbld mentioned this pull request Jul 26, 2024

[action] [PR:19657] Make pmon feature delayed flag as jinja template (#19657) #19702

Merged

mssonicbld added the Created PR to 202405 Branch label Jul 26, 2024

mssonicbld added Included in 202405 Branch and removed Created PR to 202405 Branch labels Jul 26, 2024

arista-nwolfe mentioned this pull request Aug 13, 2024

[Arista][T2] Seeing ports linkDown when PMON startup isn't delayed #19892

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make pmon feature delayed flag as jinja template #19657

Make pmon feature delayed flag as jinja template #19657

yejianquan commented Jul 23, 2024 •

edited

Loading

yejianquan commented Jul 24, 2024

yejianquan commented Jul 25, 2024 •

edited

Loading

yejianquan commented Jul 25, 2024

saiarcot895 Jul 25, 2024

yejianquan Jul 25, 2024

mssonicbld commented Jul 26, 2024

Make pmon feature delayed flag as jinja template #19657

Make pmon feature delayed flag as jinja template #19657

Conversation

yejianquan commented Jul 23, 2024 • edited Loading

What I did:

Why I did it

Work item tracking

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

yejianquan commented Jul 24, 2024

yejianquan commented Jul 25, 2024 • edited Loading

yejianquan commented Jul 25, 2024

saiarcot895 Jul 25, 2024

Choose a reason for hiding this comment

yejianquan Jul 25, 2024

Choose a reason for hiding this comment

mssonicbld commented Jul 26, 2024

yejianquan commented Jul 23, 2024 •

edited

Loading

yejianquan commented Jul 25, 2024 •

edited

Loading