Merge pull request #4991 from c-po/policy-xml-cleanup

xml: T8271: cleanup duplicate includes and split duplicate code into new building blocks

9 files changed, 61 insertions, 94 deletions

diff --git a/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i b/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i
index e8da1a0e1..85f1071a6 100644
--- a/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i
+++ b/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i
@@ -27,7 +27,12 @@
     #include <include/firewall/geoip.xml.i>
     #include <include/firewall/mac-address.xml.i>
     #include <include/firewall/port.xml.i>
-    #include <include/firewall/source-destination-group.xml.i>
+    #include <include/firewall/source-destination-group-ipv4.xml.i>
+    <node name="group">
+      <children>
+        #include <include/firewall/mac-group.xml.i>
+      </children>
+    </node>
   </children>
 </node>
 <node name="source">
@@ -41,7 +46,12 @@
     #include <include/firewall/geoip.xml.i>
     #include <include/firewall/mac-address.xml.i>
     #include <include/firewall/port.xml.i>
-    #include <include/firewall/source-destination-group.xml.i>
+    #include <include/firewall/source-destination-group-ipv4.xml.i>
+    <node name="group">
+      <children>
+        #include <include/firewall/mac-group.xml.i>
+      </children>
+    </node>
   </children>
 </node>
-<!-- include end -->
\ No newline at end of file
+<!-- include end -->
diff --git a/interface-definitions/include/firewall/common-rule-ipv4.xml.i b/interface-definitions/include/firewall/common-rule-ipv4.xml.i
index b67ef25dc..b6c1b13b3 100644
--- a/interface-definitions/include/firewall/common-rule-ipv4.xml.i
+++ b/interface-definitions/include/firewall/common-rule-ipv4.xml.i
@@ -14,7 +14,12 @@
     #include <include/firewall/geoip.xml.i>
     #include <include/firewall/mac-address.xml.i>
     #include <include/firewall/port.xml.i>
-    #include <include/firewall/source-destination-group.xml.i>
+    #include <include/firewall/source-destination-group-ipv4.xml.i>
+    <node name="group">
+      <children>
+        #include <include/firewall/mac-group.xml.i>
+      </children>
+    </node>
     #include <include/firewall/source-destination-dynamic-group.xml.i>
     #include <include/firewall/source-destination-remote-group.xml.i>
   </children>
@@ -38,9 +43,14 @@
     #include <include/firewall/geoip.xml.i>
     #include <include/firewall/mac-address.xml.i>
     #include <include/firewall/port.xml.i>
-    #include <include/firewall/source-destination-group.xml.i>
+    #include <include/firewall/source-destination-group-ipv4.xml.i>
+    <node name="group">
+      <children>
+        #include <include/firewall/mac-group.xml.i>
+      </children>
+    </node>
     #include <include/firewall/source-destination-dynamic-group.xml.i>
     #include <include/firewall/source-destination-remote-group.xml.i>
   </children>
 </node>
-<!-- include end -->
\ No newline at end of file
+<!-- include end -->
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/icmpv6.xml.i b/interface-definitions/include/firewall/icmpv6.xml.i
index c0118626e..9631f0012 100644
--- a/interface-definitions/include/firewall/icmpv6.xml.i
+++ b/interface-definitions/include/firewall/icmpv6.xml.i
@@ -6,7 +6,7 @@
   <children>
     <leafNode name="code">
       <properties>
-        <help>ICMPv6 code</help>
+        <help>ICMPv6 code field - depends on the message type</help>
         <valueHelp>
           <format>u32:0-255</format>
           <description>ICMPv6 code (0-255)</description>
@@ -18,10 +18,14 @@
     </leafNode>
     <leafNode name="type">
       <properties>
-        <help>ICMPv6 type</help>
+        <help>ICMPv6 message type</help>
         <valueHelp>
-          <format>u32:0-255</format>
-          <description>ICMPv6 type (0-255)</description>
+          <format>u32:0-127</format>
+          <description>ICMPv6 error message</description>
+        </valueHelp>
+        <valueHelp>
+          <format>u32:128-255</format>
+          <description>ICMPv6 information message</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-255"/>
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
deleted file mode 100644
index 6ebee356c..000000000
--- a/interface-definitions/include/firewall/source-destination-group.xml.i
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- include start from firewall/source-destination-group.xml.i -->
-<node name="group">
-  <properties>
-    <help>Group</help>
-  </properties>
-  <children>
-    <leafNode name="address-group">
-      <properties>
-        <help>Group of addresses</help>
-        <completionHelp>
-          <path>firewall group address-group</path>
-        </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>
-        <completionHelp>
-          <path>firewall group network-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    <leafNode name="port-group">
-      <properties>
-        <help>Group of ports</help>
-        <completionHelp>
-          <path>firewall group port-group</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->