From b8bd0a1739c4fa1c1c965628eab4f4a65b31f25f Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 13 Nov 2023 09:14:38 +0100
Subject: pim: T5733: split out XML definitions to be re-used by pim6

(cherry picked from commit c5e2c25f8968c0f06a9e4e992decc46a4f690868)
---
 .../include/pim/join-prune-interval.xml.i                 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 interface-definitions/include/pim/join-prune-interval.xml.i

(limited to 'interface-definitions/include/pim/join-prune-interval.xml.i')

diff --git a/interface-definitions/include/pim/join-prune-interval.xml.i b/interface-definitions/include/pim/join-prune-interval.xml.i
new file mode 100644
index 000000000..f7519ad67
--- /dev/null
+++ b/interface-definitions/include/pim/join-prune-interval.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from pim/join-prune-interval.xml.i -->
+<leafNode name="join-prune-interval">
+  <properties>
+    <help>Join Prune Send Interval</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+  <defaultValue>60</defaultValue>
+</leafNode>
+<!-- include end -->
-- 
cgit v1.2.3


From b9493ce110fb1ae2090299a5bcb5d3c7fc3dfd60 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Wed, 15 Nov 2023 18:20:39 +0100
Subject: pim: T5733: incorporate feedback from peer review

(cherry picked from commit 64b4cfc71d402222fd6b034336b3588b5986ba24)
---
 interface-definitions/include/pim/dr-priority.xml.i            | 4 ++--
 interface-definitions/include/pim/join-prune-interval.xml.i    | 2 +-
 interface-definitions/include/pim/register-suppress-time.xml.i | 4 ++--
 interface-definitions/protocols-pim.xml.in                     | 2 +-
 src/conf_mode/protocols_pim.py                                 | 2 --
 5 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'interface-definitions/include/pim/join-prune-interval.xml.i')

diff --git a/interface-definitions/include/pim/dr-priority.xml.i b/interface-definitions/include/pim/dr-priority.xml.i
index bfda4e257..e4b3067c2 100644
--- a/interface-definitions/include/pim/dr-priority.xml.i
+++ b/interface-definitions/include/pim/dr-priority.xml.i
@@ -1,10 +1,10 @@
 <!-- include start from pim/dr-priority.xml.i -->
 <leafNode name="dr-priority">
   <properties>
-    <help>Designated Router Election Priority</help>
+    <help>Designated router election priority</help>
     <valueHelp>
       <format>u32:1-4294967295</format>
-      <description>Value of the new DR Priority</description>
+      <description>DR Priority</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-4294967295"/>
diff --git a/interface-definitions/include/pim/join-prune-interval.xml.i b/interface-definitions/include/pim/join-prune-interval.xml.i
index f7519ad67..882787d3f 100644
--- a/interface-definitions/include/pim/join-prune-interval.xml.i
+++ b/interface-definitions/include/pim/join-prune-interval.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from pim/join-prune-interval.xml.i -->
 <leafNode name="join-prune-interval">
   <properties>
-    <help>Join Prune Send Interval</help>
+    <help>Join prune send interval</help>
     <valueHelp>
       <format>u32:1-65535</format>
       <description>Interval in seconds</description>
diff --git a/interface-definitions/include/pim/register-suppress-time.xml.i b/interface-definitions/include/pim/register-suppress-time.xml.i
index 80180e9b6..919945b52 100644
--- a/interface-definitions/include/pim/register-suppress-time.xml.i
+++ b/interface-definitions/include/pim/register-suppress-time.xml.i
@@ -1,10 +1,10 @@
 <!-- include start from pim/register-suppress-time.xml.i -->
 <leafNode name="register-suppress-time">
   <properties>
-    <help>Register Suppress Timer</help>
+    <help>Register suppress timer</help>
     <valueHelp>
       <format>u32:1-65535</format>
-      <description>In seconds</description>
+      <description>Timer in seconds</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-65535"/>
diff --git a/interface-definitions/protocols-pim.xml.in b/interface-definitions/protocols-pim.xml.in
index 39188398b..4a20c0d9b 100644
--- a/interface-definitions/protocols-pim.xml.in
+++ b/interface-definitions/protocols-pim.xml.in
@@ -182,7 +182,7 @@
           </leafNode>
           <node name="spt-switchover">
             <properties>
-              <help>Send v6 secondary addresses</help>
+              <help>Shortest-path tree (SPT) switchover</help>
             </properties>
             <children>
               <node name="infinity-and-beyond">
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py
index 5e6225f6f..09c3be8df 100755
--- a/src/conf_mode/protocols_pim.py
+++ b/src/conf_mode/protocols_pim.py
@@ -22,9 +22,7 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.config import config_dict_merge
-from vyos.configdict import dict_merge
 from vyos.configdict import node_changed
-from vyos.utils.dict import dict_search
 from vyos.configverify import verify_interface_exists
 from vyos.utils.process import process_named_running
 from vyos.utils.process import call
-- 
cgit v1.2.3