1 files changed, 2 insertions, 55 deletions
diff --git a/interface-definitions/include/firewall/common-rule-ipv4.xml.i b/interface-definitions/include/firewall/common-rule-ipv4.xml.i
index 158c7a662..803b94b06 100644
--- a/interface-definitions/include/firewall/common-rule-ipv4.xml.i
+++ b/interface-definitions/include/firewall/common-rule-ipv4.xml.i
@@ -1,29 +1,8 @@
 <!-- include start from firewall/common-rule-ipv4.xml.i -->
+#include <include/firewall/add-addr-to-group-ipv4.xml.i>
 #include <include/firewall/common-rule-inet.xml.i>
+#include <include/firewall/icmp.xml.i>
 #include <include/firewall/ttl.xml.i>
-<node name="add-address-to-group">
-  <properties>
-    <help>Add ip address to dynamic address-group</help>
-  </properties>
-  <children>
-    <node name="source-address">
-      <properties>
-        <help>Add source ip addresses to dynamic address-group</help>
-      </properties>
-      <children>
-        #include <include/firewall/add-dynamic-address-groups.xml.i>
-      </children>
-    </node>
-    <node name="destination-address">
-      <properties>
-        <help>Add destination ip addresses to dynamic address-group</help>
-      </properties>
-      <children>
-        #include <include/firewall/add-dynamic-address-groups.xml.i>
-      </children>
-    </node>
-  </children>
-</node>
 <node name="destination">
   <properties>
     <help>Destination parameters</help>
@@ -39,38 +18,6 @@
     #include <include/firewall/source-destination-dynamic-group.xml.i>
   </children>
 </node>
-<node name="icmp">
-  <properties>
-    <help>ICMP type and code information</help>
-  </properties>
-  <children>
-    <leafNode name="code">
-      <properties>
-        <help>ICMP code</help>
-        <valueHelp>
-          <format>u32:0-255</format>
-          <description>ICMP code (0-255)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-255"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="type">
-      <properties>
-        <help>ICMP type</help>
-        <valueHelp>
-          <format>u32:0-255</format>
-          <description>ICMP type (0-255)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-255"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    #include <include/firewall/icmp-type-name.xml.i>
-  </children>
-</node>
 <leafNode name="jump-target">
   <properties>
     <help>Set jump target. Action jump must be defined to use this setting</help>