diff options
4 files changed, 18 insertions, 41 deletions
diff --git a/interface-definitions/include/static/static-route-blackhole.xml.i b/interface-definitions/include/static/static-route-blackhole.xml.i index f2ad23e69..487f775f5 100644 --- a/interface-definitions/include/static/static-route-blackhole.xml.i +++ b/interface-definitions/include/static/static-route-blackhole.xml.i @@ -1,10 +1,11 @@  <!-- include start from static/static-route-blackhole.xml.i -->  <node name="blackhole">    <properties> -    <help>Silently discard packets when matched</help> +    <help>Silently discard pkts when matched</help>    </properties>    <children>      #include <include/static/static-route-distance.xml.i> +    #include <include/static/static-route-tag.xml.i>    </children>  </node>  <!-- include end --> diff --git a/interface-definitions/include/static/static-route-tag.xml.i b/interface-definitions/include/static/static-route-tag.xml.i new file mode 100644 index 000000000..24bfa732e --- /dev/null +++ b/interface-definitions/include/static/static-route-tag.xml.i @@ -0,0 +1,14 @@ +<!-- include start from static/static-route-tag.xml.i --> +<leafNode name="tag"> +  <properties> +    <help>Tag value for this route</help> +    <valueHelp> +      <format>u32:1-4294967295</format> +      <description>Tag value for this route</description> +    </valueHelp> +    <constraint> +      <validator name="numeric" argument="--range 1-4294967295"/> +    </constraint> +  </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i index 903915066..8433703a5 100644 --- a/interface-definitions/include/static/static-route.xml.i +++ b/interface-definitions/include/static/static-route.xml.i @@ -11,26 +11,7 @@      </constraint>    </properties>    <children> -    <node name="blackhole"> -      <properties> -        <help>Silently discard pkts when matched</help> -      </properties> -      <children> -        #include <include/static/static-route-distance.xml.i> -        <leafNode name="tag"> -          <properties> -            <help>Tag value for this route</help> -            <valueHelp> -              <format>u32:1-4294967295</format> -              <description>Tag value for this route</description> -            </valueHelp> -            <constraint> -              <validator name="numeric" argument="--range 1-4294967295"/> -            </constraint> -          </properties> -        </leafNode> -      </children> -    </node> +    #include <include/static/static-route-blackhole.xml.i>      #include <include/dhcp-interface.xml.i>      <tagNode name="interface">        <properties> diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i index e705c45fa..124b2b062 100644 --- a/interface-definitions/include/static/static-route6.xml.i +++ b/interface-definitions/include/static/static-route6.xml.i @@ -11,26 +11,7 @@      </constraint>    </properties>    <children> -    <node name="blackhole"> -      <properties> -        <help>Silently discard pkts when matched</help> -      </properties> -      <children> -        #include <include/static/static-route-distance.xml.i> -        <leafNode name="tag"> -          <properties> -            <help>Tag value for this route</help> -            <valueHelp> -              <format>u32:1-4294967295</format> -              <description>Tag value for this route</description> -            </valueHelp> -            <constraint> -              <validator name="numeric" argument="--range 1-4294967295"/> -            </constraint> -          </properties> -        </leafNode> -      </children> -    </node> +    #include <include/static/static-route-blackhole.xml.i>      <tagNode name="interface">        <properties>          <help>IPv6 gateway interface name</help>  | 
