qos: T6035: QoS policy shaper queue-type random-detect requires limit avpkt

Added params for configuration red on the shaper policy

5 files changed, 75 insertions, 55 deletions

diff --git a/interface-definitions/include/qos/queue-average-packet.xml.i b/interface-definitions/include/qos/queue-average-packet.xml.i
new file mode 100644
index 000000000..2f8bfe266
--- /dev/null
+++ b/interface-definitions/include/qos/queue-average-packet.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/queue-average-packet.xml.i -->
+<leafNode name="average-packet">
+  <properties>
+    <help>Average packet size (bytes)</help>
+    <valueHelp>
+      <format>u32:16-10240</format>
+      <description>Average packet size in bytes</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 16-10240"/>
+    </constraint>
+    <constraintErrorMessage>Average packet size must be between 16 and 10240</constraintErrorMessage>
+  </properties>
+  <defaultValue>1024</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/queue-mark-probability.xml.i b/interface-definitions/include/qos/queue-mark-probability.xml.i
new file mode 100644
index 000000000..1a2862845
--- /dev/null
+++ b/interface-definitions/include/qos/queue-mark-probability.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/queue-mark-probability.xml.i -->
+<leafNode name="mark-probability">
+  <properties>
+    <help>Mark probability for random detection</help>
+    <valueHelp>
+      <format>u32</format>
+      <description>Numeric value (1/N)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--positive"/>
+    </constraint>
+    <constraintErrorMessage>Mark probability must be greater than 0</constraintErrorMessage>
+  </properties>
+  <defaultValue>10</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/queue-maximum-threshold.xml.i b/interface-definitions/include/qos/queue-maximum-threshold.xml.i
new file mode 100644
index 000000000..66d17ccc4
--- /dev/null
+++ b/interface-definitions/include/qos/queue-maximum-threshold.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/queue-maximum-threshold.xml.i -->
+<leafNode name="maximum-threshold">
+  <properties>
+    <help>Maximum threshold for random detection</help>
+    <valueHelp>
+      <format>u32:0-4096</format>
+      <description>Maximum threshold in packets</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4096"/>
+    </constraint>
+    <constraintErrorMessage>Threshold must be between 0 and 4096</constraintErrorMessage>
+  </properties>
+  <defaultValue>18</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/queue-minimum-threshold.xml.i b/interface-definitions/include/qos/queue-minimum-threshold.xml.i
new file mode 100644
index 000000000..81e12d6e2
--- /dev/null
+++ b/interface-definitions/include/qos/queue-minimum-threshold.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from qos/queue-minimum-threshold.xml.i -->
+<leafNode name="minimum-threshold">
+  <properties>
+    <help>Minimum threshold for random detection</help>
+    <valueHelp>
+      <format>u32:0-4096</format>
+      <description>Minimum threshold in packets</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4096"/>
+    </constraint>
+    <constraintErrorMessage>Threshold must be between 0 and 4096</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
index 7618c3027..8f9ae3fa6 100644
--- a/interface-definitions/qos.xml.in
+++ b/interface-definitions/qos.xml.in
@@ -470,61 +470,10 @@
                 </properties>
                 <children>
                   #include <include/qos/queue-limit-1-4294967295.xml.i>
-                  <leafNode name="average-packet">
-                    <properties>
-                      <help>Average packet size (bytes)</help>
-                      <valueHelp>
-                        <format>u32:16-10240</format>
-                        <description>Average packet size in bytes</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-100"/>
-                      </constraint>
-                      <constraintErrorMessage>Average packet size must be between 16 and 10240</constraintErrorMessage>
-                    </properties>
-                    <defaultValue>1024</defaultValue>
-                  </leafNode>
-                  <leafNode name="mark-probability">
-                    <properties>
-                      <help>Mark probability for this precedence</help>
-                      <valueHelp>
-                        <format>&lt;number&gt;</format>
-                        <description>Numeric value (1/N)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--positive"/>
-                      </constraint>
-                      <constraintErrorMessage>Mark probability must be greater than 0</constraintErrorMessage>
-                    </properties>
-                    <defaultValue>10</defaultValue>
-                  </leafNode>
-                  <leafNode name="maximum-threshold">
-                    <properties>
-                      <help>Maximum threshold for random detection</help>
-                      <valueHelp>
-                        <format>u32:0-4096</format>
-                        <description>Maximum Threshold in packets</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-4096"/>
-                      </constraint>
-                      <constraintErrorMessage>Threshold must be between 0 and 4096</constraintErrorMessage>
-                    </properties>
-                    <defaultValue>18</defaultValue>
-                  </leafNode>
-                  <leafNode name="minimum-threshold">
-                    <properties>
-                      <help>Minimum  threshold for random detection</help>
-                      <valueHelp>
-                        <format>u32:0-4096</format>
-                        <description>Maximum Threshold in packets</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-4096"/>
-                      </constraint>
-                      <constraintErrorMessage>Threshold must be between 0 and 4096</constraintErrorMessage>
-                    </properties>
-                  </leafNode>
+                  #include <include/qos/queue-average-packet.xml.i>
+                  #include <include/qos/queue-maximum-threshold.xml.i>
+                  #include <include/qos/queue-minimum-threshold.xml.i>
+                  #include <include/qos/queue-mark-probability.xml.i>
                 </children>
               </tagNode>
             </children>
@@ -697,6 +646,10 @@
                   #include <include/qos/interval.xml.i>
                   #include <include/qos/class-match.xml.i>
                   #include <include/qos/class-priority.xml.i>
+                  #include <include/qos/queue-average-packet.xml.i>
+                  #include <include/qos/queue-maximum-threshold.xml.i>
+                  #include <include/qos/queue-minimum-threshold.xml.i>
+                  #include <include/qos/queue-mark-probability.xml.i>
                   #include <include/qos/queue-limit-1-4294967295.xml.i>
                   #include <include/qos/queue-type.xml.i>
                   <leafNode name="queue-type">
@@ -759,6 +712,10 @@
                     </properties>
                     <defaultValue>20</defaultValue>
                   </leafNode>
+                  #include <include/qos/queue-average-packet.xml.i>
+                  #include <include/qos/queue-maximum-threshold.xml.i>
+                  #include <include/qos/queue-minimum-threshold.xml.i>
+                  #include <include/qos/queue-mark-probability.xml.i>
                   #include <include/qos/queue-limit-1-4294967295.xml.i>
                   #include <include/qos/queue-type.xml.i>
                   <leafNode name="queue-type">