ospfv3: T3859: add "log-adjacency-changes" CLI command

4 files changed, 20 insertions, 13 deletions

diff --git a/data/templates/frr/ospf6d.frr.tmpl b/data/templates/frr/ospf6d.frr.tmpl
index 0026c0d2c..a8c53738f 100644
--- a/data/templates/frr/ospf6d.frr.tmpl
+++ b/data/templates/frr/ospf6d.frr.tmpl
@@ -76,6 +76,9 @@ router ospf6
  distance ospf6 {{ 'intra-area ' + distance.ospfv3.intra_area if distance.ospfv3.intra_area is defined }} {{ 'inter-area ' + distance.ospfv3.inter_area if distance.ospfv3.inter_area is defined }} {{ 'external ' + distance.ospfv3.external if distance.ospfv3.external is defined }}
 {%   endif %}
 {% endif %}
+{% if log_adjacency_changes is defined %}
+ log-adjacency-changes {{ "detail" if log_adjacency_changes.detail is defined }}
+{% endif %}
 {% if parameters is defined and parameters is not none %}
 {%   if parameters.router_id is defined and parameters.router_id is not none %}
  ospf6 router-id {{ parameters.router_id }}
diff --git a/interface-definitions/include/ospf/log-adjacency-changes.xml.i b/interface-definitions/include/ospf/log-adjacency-changes.xml.i
new file mode 100644
index 000000000..24c6cbe7a
--- /dev/null
+++ b/interface-definitions/include/ospf/log-adjacency-changes.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from ospf/metric-type.xml.i -->
+<node name="log-adjacency-changes">
+  <properties>
+    <help>Log adjacency state changes</help>
+  </properties>
+  <children>
+    <leafNode name="detail">
+      <properties>
+        <help>Log all state changes</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 0139296ec..80931ac15 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -435,19 +435,7 @@
     </leafNode>
   </children>
 </tagNode>
-<node name="log-adjacency-changes">
-  <properties>
-    <help>Log adjacency state changes</help>
-  </properties>
-  <children>
-    <leafNode name="detail">
-      <properties>
-        <help>Log all state changes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-  </children>
-</node>
+#include <include/ospf/log-adjacency-changes.xml.i>
 <node name="max-metric">
   <properties>
     <help>OSPF maximum and infinite-distance metric</help>
diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index 7b42c448d..99cfec661 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -186,6 +186,7 @@
               #include <include/isis/passive.xml.i>
             </children>
           </tagNode>
+          #include <include/ospf/log-adjacency-changes.xml.i>
           <node name="parameters">
             <properties>
               <help>OSPFv3 specific parameters</help>