diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-11-02 14:55:27 +0200 | 
|---|---|---|
| committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-11-02 12:59:57 +0000 | 
| commit | 46eda54c88ae96ed1f4aaa9ce56c505ed837f3d7 (patch) | |
| tree | 852b802c592919fec3fe66c14dd2f4aaaf8fd7ed /interface-definitions/include | |
| parent | 738641a6c66d22c09b8c028ee3d8a90527d9701f (diff) | |
| parent | f2ec92a78c4ee2a35e7d071387460fc6ce360740 (diff) | |
| download | vyos-1x-46eda54c88ae96ed1f4aaa9ce56c505ed837f3d7.tar.gz vyos-1x-46eda54c88ae96ed1f4aaa9ce56c505ed837f3d7.zip | |
T4758: Fix conflicts op-mode-standardized
Diffstat (limited to 'interface-definitions/include')
4 files changed, 19 insertions, 1 deletions
| diff --git a/interface-definitions/include/radius-timeout.xml.i b/interface-definitions/include/radius-timeout.xml.i new file mode 100644 index 000000000..22bb6d312 --- /dev/null +++ b/interface-definitions/include/radius-timeout.xml.i @@ -0,0 +1,16 @@ +<!-- include start from radius-timeout.xml.i --> +<leafNode name="timeout"> +  <properties> +    <help>Session timeout</help> +    <valueHelp> +      <format>u32:1-240</format> +      <description>Session timeout in seconds (default: 2)</description> +    </valueHelp> +    <constraint> +      <validator name="numeric" argument="--range 1-240"/> +    </constraint> +    <constraintErrorMessage>Timeout must be between 1 and 240 seconds</constraintErrorMessage> +  </properties> +  <defaultValue>2</defaultValue> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i index 2de5dc58f..04ee999c7 100644 --- a/interface-definitions/include/static/static-route.xml.i +++ b/interface-definitions/include/static/static-route.xml.i @@ -14,6 +14,7 @@      #include <include/static/static-route-blackhole.xml.i>      #include <include/static/static-route-reject.xml.i>      #include <include/dhcp-interface.xml.i> +    #include <include/generic-description.xml.i>      <tagNode name="interface">        <properties>          <help>Next-hop IPv4 router interface</help> diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i index 35feef41c..6131ac7fe 100644 --- a/interface-definitions/include/static/static-route6.xml.i +++ b/interface-definitions/include/static/static-route6.xml.i @@ -13,6 +13,7 @@    <children>      #include <include/static/static-route-blackhole.xml.i>      #include <include/static/static-route-reject.xml.i> +    #include <include/generic-description.xml.i>      <tagNode name="interface">        <properties>          <help>IPv6 gateway interface name</help> diff --git a/interface-definitions/include/version/https-version.xml.i b/interface-definitions/include/version/https-version.xml.i index 586083649..111076974 100644 --- a/interface-definitions/include/version/https-version.xml.i +++ b/interface-definitions/include/version/https-version.xml.i @@ -1,3 +1,3 @@  <!-- include start from include/version/https-version.xml.i --> -<syntaxVersion component='https' version='3'></syntaxVersion> +<syntaxVersion component='https' version='4'></syntaxVersion>  <!-- include end --> | 
