isis: enable "poi-tlv" feature from the IS-IS YANG module

The "poi-tlv" feature enables the "poi-tlv" configuration leaf, which
is equivalent to the "purge-originator" leaf we added in our IS-IS
augmentation module. Enable this feature and remove our augmentation,
since we want to comply with the IETF module as much as possible.

Signed-off-by: Renato Westphal <[email protected]>

Author: rwestphal

README.md

@@ -243,7 +243,7 @@ Holo supports the following Internet Standards:
 | ietf-ipv4-unicast-routing@2018-03-13 | 100.00% | 100.00% | - | - | [100.00%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
 | ietf-ipv6-unicast-routing@2018-03-13 | 40.62% | 100.00% | - | - | [45.71%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
 | ietf-isis-sr-mpls@2025-05-06 | 15.38% | 57.27% | - | - | [52.85%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
-| ietf-isis@2022-10-19 | 95.52% | 70.16% | 100.00% | 100.00% | [81.07%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
+| ietf-isis@2022-10-19 | 95.56% | 70.16% | 100.00% | 100.00% | [81.10%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
 | ietf-key-chain@2017-06-15 | 100.00% | 100.00% | - | - | [100.00%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
 | ietf-mpls-ldp@2022-03-14 | 86.96% | 92.31% | 100.00% | 100.00% | [92.38%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
 | ietf-mpls@2020-12-18 | 0.00% | 57.14% | - | - | [35.29%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |

holo-isis/src/northbound/configuration.rs

@@ -102,6 +102,7 @@ pub struct InstanceCfg {
     pub lsp_mtu: u16,
     pub lsp_lifetime: u16,
     pub lsp_refresh: u16,
+    pub purge_originator: bool,
     pub metric_type: LevelsCfg<MetricType>,
     pub default_metric: LevelsCfg<u32>,
     pub auth: LevelsOptCfg<AuthCfg>,
@@ -118,7 +119,6 @@ pub struct InstanceCfg {
     pub overload_status: bool,
     pub mt: HashMap<MtId, InstanceMtCfg>,
     pub summaries: JointPrefixMap<IpNetwork, SummaryCfg>,
-    pub purge_originator: bool,
     pub att_suppress: bool,
     pub att_ignore: bool,
     pub sr: InstanceSrCfg,
@@ -364,6 +364,11 @@ fn load_callbacks() -> Callbacks<Instance> {
             let event_queue = args.event_queue;
             event_queue.insert(Event::RefreshLsps);
         })
+        .path(isis::poi_tlv::PATH)
+        .modify_apply(|instance, args| {
+            let enabled = args.dnode.get_bool();
+            instance.config.purge_originator = enabled;
+        })
         .path(isis::metric_type::value::PATH)
         .modify_apply(|instance, args| {
             let metric_type = args.dnode.get_string();
@@ -853,11 +858,6 @@ fn load_callbacks() -> Callbacks<Instance> {
 
             mt_cfg.default_metric.l2 = None;
         })
-        .path(isis::purge_originator::PATH)
-        .modify_apply(|instance, args| {
-            let enabled = args.dnode.get_bool();
-            instance.config.purge_originator = enabled;
-        })
         .path(isis::attached_bit::suppress_advertisement::PATH)
         .modify_apply(|instance, args| {
             let enabled = args.dnode.get_bool();
@@ -2445,6 +2445,7 @@ impl Default for InstanceCfg {
         let lsp_mtu = isis::lsp_mtu::DFLT;
         let lsp_lifetime = isis::lsp_lifetime::DFLT;
         let lsp_refresh = isis::lsp_refresh::DFLT;
+        let purge_originator = isis::poi_tlv::DFLT;
         let metric_type = isis::metric_type::value::DFLT;
         let metric_type = LevelsCfg {
             all: MetricType::try_from_yang(metric_type).unwrap(),
@@ -2468,7 +2469,6 @@ impl Default for InstanceCfg {
         let spf_time_to_learn =
             isis::spf_control::ietf_spf_delay::time_to_learn::DFLT;
         let overload_status = isis::overload::status::DFLT;
-        let purge_originator = isis::purge_originator::DFLT;
         let att_suppress = isis::attached_bit::suppress_advertisement::DFLT;
         let att_ignore = isis::attached_bit::ignore_reception::DFLT;
 
@@ -2480,6 +2480,7 @@ impl Default for InstanceCfg {
             lsp_mtu,
             lsp_lifetime,
             lsp_refresh,
+            purge_originator,
             metric_type,
             default_metric,
             auth: Default::default(),
@@ -2496,7 +2497,6 @@ impl Default for InstanceCfg {
             overload_status,
             mt: Default::default(),
             summaries: Default::default(),
-            purge_originator,
             att_suppress,
             att_ignore,
             sr: Default::default(),

holo-isis/tests/conformance/pdu-lsp-purge-originator1/01-input-northbound-config-change.json

@@ -9,8 +9,8 @@
           "type": "ietf-isis:isis",
           "name": "test",
           "ietf-isis:isis": {
-            "holo-isis:purge-originator": true,
-            "@holo-isis:purge-originator": {
+            "ietf-isis:poi-tlv": true,
+            "@ietf-isis:poi-tlv": {
               "yang:operation": "replace",
               "yang:orig-default": true,
               "yang:orig-value": "false"

holo-isis/tests/conformance/pdu-lsp-purge-originator2/01-input-northbound-config-change.json

@@ -9,8 +9,8 @@
           "type": "ietf-isis:isis",
           "name": "test",
           "ietf-isis:isis": {
-            "holo-isis:purge-originator": true,
-            "@holo-isis:purge-originator": {
+            "ietf-isis:poi-tlv": true,
+            "@ietf-isis:poi-tlv": {
               "yang:operation": "replace",
               "yang:orig-default": true,
               "yang:orig-value": "false"

holo-yang/modules/augmentations/holo-isis.yang

@@ -95,13 +95,6 @@ module holo-isis {
         + "rt:control-plane-protocol/isis:isis" {
     description
       "IS-IS instance augmentations";
-    leaf purge-originator {
-      type boolean;
-      default false;
-      description
-        "Enable support for purge originator identification as specified
-         in RFC 6232.";
-    }
     container attached-bit {
       description "Configuration related to the ATT bit.";
 

holo-yang/src/lib.rs

@@ -281,6 +281,7 @@ pub static YANG_FEATURES: Lazy<HashMap<&'static str, Vec<&'static str>>> =
                 "multi-topology",
                 "node-flag",
                 "nlpid-control",
+                "poi-tlv",
                 "te-rid",
             ],
             "ietf-ospf" => vec![