diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-04-13 13:10:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-13 13:10:15 +0200 |
| commit | a6ccf358c7148781be438c4a2f89468ebfe5d48f (patch) | |
| tree | 5b72368e3267106b23fc98a4f87e3c0fad382fe5 /interface-definitions/qos.xml.in | |
| parent | a49772fabb0e6f405ca19c7f9f76927ef96c4f79 (diff) | |
| parent | 31cd75aec6d035b36537046ae0d034c03009a3fc (diff) | |
| download | vyos-1x-a6ccf358c7148781be438c4a2f89468ebfe5d48f.tar.gz vyos-1x-a6ccf358c7148781be438c4a2f89468ebfe5d48f.zip | |
Merge pull request #3297 from HollyGurza/T6035
qos: T6035: QoS policy shaper queue-type random-detect requires limit avpkt
Diffstat (limited to 'interface-definitions/qos.xml.in')
| -rw-r--r-- | interface-definitions/qos.xml.in | 67 |
1 files changed, 12 insertions, 55 deletions
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><number></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"> |