diff options
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/isis/protocol-common-config.xml.i | 4 | ||||
| -rw-r--r-- | interface-definitions/include/monitoring/url.xml.i | 15 | ||||
| -rw-r--r-- | interface-definitions/include/ospf/protocol-common-config.xml.i | 4 | ||||
| -rw-r--r-- | interface-definitions/include/segment-routing-label-value.xml.i (renamed from interface-definitions/include/isis/high-low-label-value.xml.i) | 4 | ||||
| -rw-r--r-- | interface-definitions/service-monitoring-telegraf.xml.in | 6 | ||||
| -rw-r--r-- | interface-definitions/system-login.xml.in | 64 | 
6 files changed, 72 insertions, 25 deletions
| diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i index 57ee19300..42bda7a80 100644 --- a/interface-definitions/include/isis/protocol-common-config.xml.i +++ b/interface-definitions/include/isis/protocol-common-config.xml.i @@ -238,7 +238,7 @@          <help>Segment Routing Global Block label range</help>        </properties>        <children> -        #include <include/isis/high-low-label-value.xml.i> +        #include <include/segment-routing-label-value.xml.i>        </children>      </node>      <node name="local-block"> @@ -246,7 +246,7 @@          <help>Segment Routing Local Block label range</help>        </properties>        <children> -        #include <include/isis/high-low-label-value.xml.i> +        #include <include/segment-routing-label-value.xml.i>        </children>      </node>      <leafNode name="maximum-label-depth"> diff --git a/interface-definitions/include/monitoring/url.xml.i b/interface-definitions/include/monitoring/url.xml.i deleted file mode 100644 index fd61c38ea..000000000 --- a/interface-definitions/include/monitoring/url.xml.i +++ /dev/null @@ -1,15 +0,0 @@ -<!-- include start from monitoring/url.xml.i --> -<leafNode name="url"> -  <properties> -    <help>Remote URL</help> -    <valueHelp> -      <format>url</format> -      <description>Remote URL</description> -    </valueHelp> -    <constraint> -      <regex>(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}?(\/.*)?</regex> -    </constraint> -    <constraintErrorMessage>Incorrect URL format</constraintErrorMessage> -  </properties> -</leafNode> -<!-- include end --> diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i index 28e3b473b..0615063af 100644 --- a/interface-definitions/include/ospf/protocol-common-config.xml.i +++ b/interface-definitions/include/ospf/protocol-common-config.xml.i @@ -631,7 +631,7 @@          <help>Segment Routing Global Block label range</help>        </properties>        <children> -        #include <include/isis/high-low-label-value.xml.i> +        #include <include/segment-routing-label-value.xml.i>        </children>      </node>      <node name="local-block"> @@ -639,7 +639,7 @@          <help>Segment Routing Local Block label range</help>        </properties>        <children> -        #include <include/isis/high-low-label-value.xml.i> +        #include <include/segment-routing-label-value.xml.i>        </children>      </node>      <leafNode name="maximum-label-depth"> diff --git a/interface-definitions/include/isis/high-low-label-value.xml.i b/interface-definitions/include/segment-routing-label-value.xml.i index f30b5af3a..05e1edd78 100644 --- a/interface-definitions/include/isis/high-low-label-value.xml.i +++ b/interface-definitions/include/segment-routing-label-value.xml.i @@ -1,10 +1,10 @@ -<!-- include start from isis/high-low-label-value.xml.i --> +<!-- include start from segment-routing-label-value.xml.i -->  <leafNode name="low-label-value">    <properties>      <help>MPLS label lower bound</help>      <valueHelp>        <format>u32:16-1048575</format> -      <description>Label value (recommended minimum value: 100)</description> +      <description>Label value (recommended minimum value: 300)</description>      </valueHelp>      <constraint>        <validator name="numeric" argument="--range 16-1048575"/> diff --git a/interface-definitions/service-monitoring-telegraf.xml.in b/interface-definitions/service-monitoring-telegraf.xml.in index 47f943d83..f50e5e334 100644 --- a/interface-definitions/service-monitoring-telegraf.xml.in +++ b/interface-definitions/service-monitoring-telegraf.xml.in @@ -53,7 +53,7 @@                      </properties>                      <defaultValue>main</defaultValue>                    </leafNode> -                  #include <include/monitoring/url.xml.i> +                  #include <include/url.xml.i>                    #include <include/port-number.xml.i>                    <leafNode name="port">                      <defaultValue>8086</defaultValue> @@ -145,7 +145,7 @@                        <constraintErrorMessage>Table is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>                      </properties>                    </leafNode> -                  #include <include/monitoring/url.xml.i> +                  #include <include/url.xml.i>                  </children>                </node>                <leafNode name="source"> @@ -271,7 +271,7 @@                        </leafNode>                      </children>                    </node> -                  #include <include/monitoring/url.xml.i> +                  #include <include/url.xml.i>                  </children>                </node>                #include <include/interface/vrf.xml.i> diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in index d189be3f8..def42544a 100644 --- a/interface-definitions/system-login.xml.in +++ b/interface-definitions/system-login.xml.in @@ -19,7 +19,7 @@              <children>                <node name="authentication">                  <properties> -                  <help>Password authentication</help> +                  <help>Authentication settings</help>                  </properties>                  <children>                    <leafNode name="encrypted-password"> @@ -36,6 +36,68 @@                      </properties>                      <defaultValue>!</defaultValue>                    </leafNode> +                  <node name="otp"> +                    <properties> +                      <help>One-Time-Pad (two-factor) authentication parameters</help> +                    </properties> +                    <children> +                      <leafNode name="rate-limit"> +                        <properties> +                          <help>Limit number of logins (rate-limit) per rate-time</help> +                          <valueHelp> +                            <format>u32:1-10</format> +                            <description>Number of attempts</description> +                          </valueHelp> +                          <constraint> +                            <validator name="numeric" argument="--range 1-10"/> +                          </constraint> +                          <constraintErrorMessage>Number of login attempts must me between 1 and 10</constraintErrorMessage> +                        </properties> +                        <defaultValue>3</defaultValue> +                      </leafNode> +                      <leafNode name="rate-time"> +                        <properties> +                          <help>Limit number of logins (rate-limit) per rate-time</help> +                          <valueHelp> +                            <format>u32:15-600</format> +                            <description>Time interval</description> +                          </valueHelp> +                          <constraint> +                            <validator name="numeric" argument="--range 15-600"/> +                          </constraint> +                          <constraintErrorMessage>Rate limit time interval must be between 15 and 600 seconds</constraintErrorMessage> +                        </properties> +                        <defaultValue>30</defaultValue> +                      </leafNode> +                      <leafNode name="window-size"> +                        <properties> +                          <help>Set window of concurrently valid codes</help> +                          <valueHelp> +                            <format>u32:1-21</format> +                            <description>Window size</description> +                          </valueHelp> +                          <constraint> +                            <validator name="numeric" argument="--range 1-21"/> +                          </constraint> +                          <constraintErrorMessage>Window of concurrently valid codes must be between 1 and 21</constraintErrorMessage> +                        </properties> +                        <defaultValue>3</defaultValue> +                      </leafNode> +                      <leafNode name="key"> +                        <properties> +                          <help>Key/secret the token algorithm (see RFC4226)</help> +                          <valueHelp> +                            <format>txt</format> +                            <description>Base32 encoded key/token</description> +                          </valueHelp> +                          <constraint> +                            <regex>[a-zA-Z2-7]{26,10000}</regex> +                          </constraint> +                          <constraintErrorMessage>Key must only include base32 characters and be at least 26 characters long</constraintErrorMessage> +                        </properties> +                      </leafNode> +                    </children> +                  </node>                    <leafNode name="plaintext-password">                      <properties>                        <help>Plaintext password used for encryption</help> | 
