From 5f9d0ad5b258258654a9a897f35a6da8d9447670 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Wed, 8 Jun 2022 10:12:47 +0000
Subject: event-handler: Change tagNode event-handler to node

Before:
set service event-handler Foo
After:
set service event-handler event Foo
---
 interface-definitions/service-event-handler.xml.in | 85 ++++++++++++----------
 src/conf_mode/service_event_handler.py             |  2 +-
 2 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/interface-definitions/service-event-handler.xml.in b/interface-definitions/service-event-handler.xml.in
index ed6d41d1b..aef6bc1bc 100644
--- a/interface-definitions/service-event-handler.xml.in
+++ b/interface-definitions/service-event-handler.xml.in
@@ -2,62 +2,69 @@
 <interfaceDefinition>
   <node name="service">
     <children>
-      <tagNode name="event-handler" owner="${vyos_conf_scripts_dir}/service_event_handler.py">
+      <node name="event-handler" owner="${vyos_conf_scripts_dir}/service_event_handler.py">
         <properties>
-          <help>Event handler name</help>
+          <help>Service event handler</help>
         </properties>
         <children>
-          <node name="filter">
+          <tagNode name="event">
             <properties>
-              <help>Logs filter settings</help>
+              <help>Event handler name</help>
             </properties>
             <children>
-              <leafNode name="pattern">
+              <node name="filter">
                 <properties>
-                  <help>Match pattern (regex)</help>
-                </properties>
-              </leafNode>
-              <leafNode name="syslog-identifier">
-                <properties>
-                  <help>Identifier of a process in syslog (string)</help>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <node name="script">
-            <properties>
-              <help>Event handler script file</help>
-            </properties>
-            <children>
-              <leafNode name="arguments">
-                <properties>
-                  <help>Script arguments</help>
-                </properties>
-              </leafNode>
-              <tagNode name="environment">
-                <properties>
-                  <help>Script environment arguments</help>
+                  <help>Logs filter settings</help>
                 </properties>
                 <children>
-                  <leafNode name="value">
+                  <leafNode name="pattern">
                     <properties>
-                      <help>Environment value</help>
+                      <help>Match pattern (regex)</help>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="syslog-identifier">
+                    <properties>
+                      <help>Identifier of a process in syslog (string)</help>
                     </properties>
                   </leafNode>
                 </children>
-              </tagNode>
-              <leafNode name="path">
+              </node>
+              <node name="script">
                 <properties>
-                  <help>Path to the script</help>
-                  <constraint>
-                    <validator name="script"/>
-                  </constraint>
+                  <help>Event handler script file</help>
                 </properties>
-              </leafNode>
+                <children>
+                  <leafNode name="arguments">
+                    <properties>
+                      <help>Script arguments</help>
+                    </properties>
+                  </leafNode>
+                  <tagNode name="environment">
+                    <properties>
+                      <help>Script environment arguments</help>
+                    </properties>
+                    <children>
+                      <leafNode name="value">
+                        <properties>
+                          <help>Environment value</help>
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </tagNode>
+                  <leafNode name="path">
+                    <properties>
+                      <help>Path to the script</help>
+                      <constraint>
+                        <validator name="script"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
             </children>
-          </node>
+          </tagNode>
         </children>
-      </tagNode>
+      </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/src/conf_mode/service_event_handler.py b/src/conf_mode/service_event_handler.py
index bb12da11d..5440d1056 100755
--- a/src/conf_mode/service_event_handler.py
+++ b/src/conf_mode/service_event_handler.py
@@ -34,7 +34,7 @@ def get_config(config=None):
     else:
         conf = Config()
 
-    base = ['service', 'event-handler']
+    base = ['service', 'event-handler', 'event']
     config = conf.get_config_dict(base,
                                   get_first_key=True,
                                   no_tag_node_value_mangle=True)
-- 
cgit v1.2.3