From d1bbe29c6ab8edcc6eb5964f501c80c8a47f078d Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Thu, 11 Oct 2018 08:19:32 +0200
Subject: [PATCH] fix contraint msg and indents

---
 .../OPNsense/TrafficShaper/TrafficShaper.xml  | 148 +++++++++---------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index 3e78e012a..7f4ee6790 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -55,67 +55,67 @@
                     <ValidationMessage>bucket size should be between 1...65535</ValidationMessage>
                 </buckets>
                 <scheduler type="OptionField">
-                  <Required>N</Required>
-                  <default></default>
-                  <BlankDesc>Weighted Fair Queueing</BlankDesc>
-                  <OptionValues>
-                      <fifo>FIFO</fifo>
-                      <rr>Deficit Round Robin</rr>
-                      <qfq>QFQ</qfq>
-                      <fq_codel>FlowQueue-CoDel</fq_codel>
-                      <fq_pie>FlowQueue-PIE</fq_pie>
-                  </OptionValues>
+                    <Required>N</Required>
+                    <default></default>
+                    <BlankDesc>Weighted Fair Queueing</BlankDesc>
+                    <OptionValues>
+                        <fifo>FIFO</fifo>
+                        <rr>Deficit Round Robin</rr>
+                        <qfq>QFQ</qfq>
+                        <fq_codel>FlowQueue-CoDel</fq_codel>
+                        <fq_pie>FlowQueue-PIE</fq_pie>
+                    </OptionValues>
                 </scheduler>
                 <codel_enable type="BooleanField">
-                  <default>0</default>
-                  <Required>Y</Required>
-                  <Constraints>
-                      <check001>
-                          <ValidationMessage>Only one option could be selected</ValidationMessage>
-                          <type>SingleSelectConstraint</type>
-                          <addFields>
-                              <pie_enable>pie_enable</pie_enable>
-                          </addFields>
-                      </check001>
-                  </Constraints>
+                    <default>0</default>
+                    <Required>Y</Required>
+                    <Constraints>
+                        <check001>
+                            <ValidationMessage>Only one option could be selected</ValidationMessage>
+                            <type>SingleSelectConstraint</type>
+                            <addFields>
+                                <pie_enable>pie_enable</pie_enable>
+                            </addFields>
+                        </check001>
+                    </Constraints>
                 </codel_enable>
                 <codel_target type="IntegerField">
-                  <Required>N</Required>
-                  <MinimumValue>1</MinimumValue>
-                  <MaximumValue>10000</MaximumValue>
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>10000</MaximumValue>
                 </codel_target>
                 <codel_interval type="IntegerField">
-                  <Required>N</Required>
-                  <MinimumValue>1</MinimumValue>
-                  <MaximumValue>10000</MaximumValue>
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>10000</MaximumValue>
                 </codel_interval>
                 <codel_ecn_enable type="BooleanField">
-                  <default>0</default>
-                  <Required>Y</Required>
+                    <default>0</default>
+                    <Required>Y</Required>
                 </codel_ecn_enable>
                 <pie_enable type="BooleanField">
-                  <default>0</default>
-                  <Required>Y</Required>
-                  <Constraints>
-                      <check001>
-                          <reference>codel_enable.check001</reference>
-                      </check001>
-                  </Constraints>
+                    <default>0</default>
+                    <Required>Y</Required>
+                    <Constraints>
+                        <check001>
+                            <reference>codel_enable.check001</reference>
+                        </check001>
+                    </Constraints>
                 </pie_enable>
                 <fqcodel_quantum type="IntegerField">
-                  <Required>N</Required>
-                  <MinimumValue>1</MinimumValue>
-                  <MaximumValue>65535</MaximumValue>
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
                 </fqcodel_quantum>
                 <fqcodel_limit type="IntegerField">
-                  <Required>N</Required>
-                  <MinimumValue>1</MinimumValue>
-                  <MaximumValue>65535</MaximumValue>
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
                 </fqcodel_limit>
                 <fqcodel_flows type="IntegerField">
-                  <Required>N</Required>
-                  <MinimumValue>1</MinimumValue>
-                  <MaximumValue>65535</MaximumValue>
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
                 </fqcodel_flows>
                 <origin type="TextField">
                     <Required>N</Required>
@@ -181,40 +181,40 @@
                     <ValidationMessage>bucket size should be between 1...65535</ValidationMessage>
                 </buckets>
                 <codel_enable type="BooleanField">
-                  <default>0</default>
-                  <Required>Y</Required>
+                    <default>0</default>
+                    <Required>Y</Required>
                     <Constraints>
-                      <check001>
-                          <ValidationMessage>Only one option could be selected</ValidationMessage>
-                          <type>SingleSelectConstraint</type>
-                          <addFields>
-                              <pie_enable>pie_enable</pie_enable>
-                          </addFields>
-                      </check001>
-                  </Constraints>
+                        <check001>
+                            <ValidationMessage>CoDel and PIE can not be combined.</ValidationMessage>
+                            <type>SingleSelectConstraint</type>
+                            <addFields>
+                                <pie_enable>pie_enable</pie_enable>
+                            </addFields>
+                        </check001>
+                    </Constraints>
                 </codel_enable>
                 <codel_target type="IntegerField">
-                  <Required>N</Required>
-                  <MinimumValue>1</MinimumValue>
-                  <MaximumValue>10000</MaximumValue>
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>10000</MaximumValue>
                 </codel_target>
                 <codel_interval type="IntegerField">
-                  <Required>N</Required>
-                  <MinimumValue>1</MinimumValue>
-                  <MaximumValue>10000</MaximumValue>
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>10000</MaximumValue>
                 </codel_interval>
                 <codel_ecn_enable type="BooleanField">
-                  <default>0</default>
-                  <Required>Y</Required>
+                    <default>0</default>
+                    <Required>Y</Required>
                 </codel_ecn_enable>
                 <pie_enable type="BooleanField">
-                  <default>0</default>
-                  <Required>Y</Required>
-                  <Constraints>
-                      <check001>
-                          <reference>codel_enable.check001</reference>
-                      </check001>
-                  </Constraints>
+                    <default>0</default>
+                    <Required>Y</Required>
+                    <Constraints>
+                        <check001>
+                            <reference>codel_enable.check001</reference>
+                        </check001>
+                    </Constraints>
                 </pie_enable>
                 <description type="TextField">
                     <Required>Y</Required>
@@ -230,10 +230,10 @@
         </queues>
         <rules>
             <rule type="ArrayField">
-              <enabled type="BooleanField">
-                  <default>1</default>
-                  <Required>Y</Required>
-              </enabled>
+                <enabled type="BooleanField">
+                    <default>1</default>
+                    <Required>Y</Required>
+                </enabled>
                 <sequence type="IntegerField">
                     <MinimumValue>1</MinimumValue>
                     <MaximumValue>1000000</MaximumValue>