xml: T8271: create re-usable XML block for port-group and domain-group

$ make interface_definitions
$ git add -f templates-cfg
$ ... refactor
$ make interface_definitions
$ git diff templates-cfg

No change in any node.def file detected.

6 files changed, 30 insertions, 59 deletions

diff --git a/interface-definitions/include/firewall/domain-group.xml.i b/interface-definitions/include/firewall/domain-group.xml.i
new file mode 100644
index 000000000..46e00ce09
--- /dev/null
+++ b/interface-definitions/include/firewall/domain-group.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from firewall/domain-group.xml.i -->
+<leafNode name="domain-group">
+  <properties>
+    <help>Group of domains</help>
+    <completionHelp>
+      <path>firewall group domain-group</path>
+    </completionHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/firewall/port-group.xml.i b/interface-definitions/include/firewall/port-group.xml.i
new file mode 100644
index 000000000..297f0d781
--- /dev/null
+++ b/interface-definitions/include/firewall/port-group.xml.i
@@ -0,0 +1,10 @@
+    <!-- include start from firewall/port-group.xml.i -->
+    <leafNode name="port-group">
+      <properties>
+        <help>Group of ports</help>
+        <completionHelp>
+          <path>firewall group port-group</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <!-- include end -->
diff --git a/interface-definitions/include/firewall/source-destination-group-inet.xml.i b/interface-definitions/include/firewall/source-destination-group-inet.xml.i
index 174051624..775fda9b3 100644
--- a/interface-definitions/include/firewall/source-destination-group-inet.xml.i
+++ b/interface-definitions/include/firewall/source-destination-group-inet.xml.i
@@ -20,7 +20,6 @@
         </completionHelp>
       </properties>
     </leafNode>
-    #include <include/firewall/mac-group.xml.i>
     <leafNode name="ipv4-network-group">
       <properties>
         <help>Group of IPv4 networks</help>
@@ -37,14 +36,8 @@
         </completionHelp>
       </properties>
     </leafNode>
-    <leafNode name="port-group">
-      <properties>
-        <help>Group of ports</help>
-        <completionHelp>
-          <path>firewall group port-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
+    #include <include/firewall/mac-group.xml.i>
+    #include <include/firewall/port-group.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/firewall/source-destination-group-ipv4.xml.i b/interface-definitions/include/firewall/source-destination-group-ipv4.xml.i
index 8c34fb933..ccee5b247 100644
--- a/interface-definitions/include/firewall/source-destination-group-ipv4.xml.i
+++ b/interface-definitions/include/firewall/source-destination-group-ipv4.xml.i
@@ -12,14 +12,6 @@
         </completionHelp>
       </properties>
     </leafNode>
-    <leafNode name="domain-group">
-      <properties>
-        <help>Group of domains</help>
-        <completionHelp>
-          <path>firewall group domain-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
     <leafNode name="network-group">
       <properties>
         <help>Group of networks</help>
@@ -28,14 +20,8 @@
         </completionHelp>
       </properties>
     </leafNode>
-    <leafNode name="port-group">
-      <properties>
-        <help>Group of ports</help>
-        <completionHelp>
-          <path>firewall group port-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
+    #include <include/firewall/domain-group.xml.i>
+    #include <include/firewall/port-group.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/firewall/source-destination-group-ipv6.xml.i b/interface-definitions/include/firewall/source-destination-group-ipv6.xml.i
index 2a42d236c..43a9e9cf5 100644
--- a/interface-definitions/include/firewall/source-destination-group-ipv6.xml.i
+++ b/interface-definitions/include/firewall/source-destination-group-ipv6.xml.i
@@ -12,15 +12,6 @@
         </completionHelp>
       </properties>
     </leafNode>
-    <leafNode name="domain-group">
-      <properties>
-        <help>Group of domains</help>
-        <completionHelp>
-          <path>firewall group domain-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    #include <include/firewall/mac-group.xml.i>
     <leafNode name="network-group">
       <properties>
         <help>Group of networks</help>
@@ -29,14 +20,9 @@
         </completionHelp>
       </properties>
     </leafNode>
-    <leafNode name="port-group">
-      <properties>
-        <help>Group of ports</help>
-        <completionHelp>
-          <path>firewall group port-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
+    #include <include/firewall/mac-group.xml.i>
+    #include <include/firewall/domain-group.xml.i>
+    #include <include/firewall/port-group.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/firewall/source-destination-group.xml.i b/interface-definitions/include/firewall/source-destination-group.xml.i
index 6ebee356c..06bd319ed 100644
--- a/interface-definitions/include/firewall/source-destination-group.xml.i
+++ b/interface-definitions/include/firewall/source-destination-group.xml.i
@@ -12,15 +12,6 @@
         </completionHelp>
       </properties>
     </leafNode>
-    <leafNode name="domain-group">
-      <properties>
-        <help>Group of domains</help>
-        <completionHelp>
-          <path>firewall group domain-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    #include <include/firewall/mac-group.xml.i>
     <leafNode name="network-group">
       <properties>
         <help>Group of networks</help>
@@ -29,14 +20,9 @@
         </completionHelp>
       </properties>
     </leafNode>
-    <leafNode name="port-group">
-      <properties>
-        <help>Group of ports</help>
-        <completionHelp>
-          <path>firewall group port-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
+    #include <include/firewall/mac-group.xml.i>
+    #include <include/firewall/domain-group.xml.i>
+    #include <include/firewall/port-group.xml.i>
   </children>
 </node>
 <!-- include end -->