summaryrefslogtreecommitdiff
path: root/interface-definitions/include
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-12-01 13:10:08 +0100
committerGitHub <noreply@github.com>2023-12-01 13:10:08 +0100
commit5b7f7944eb06f2461e5bc95c8171160b8767291d (patch)
tree093a622d3840b186ac279437732300a735761ff9 /interface-definitions/include
parent12e03feaed0b0f847fceec73597c608703228c44 (diff)
parent3e7575594016c28084cc6c89b0c483f78e5a7b4a (diff)
downloadvyos-1x-5b7f7944eb06f2461e5bc95c8171160b8767291d.tar.gz
vyos-1x-5b7f7944eb06f2461e5bc95c8171160b8767291d.zip
Merge pull request #2557 from vyos/mergify/bp/sagitta/pr-2467
T5727: Use native URL validator instead of regex-based validator (backport #2467)
Diffstat (limited to 'interface-definitions/include')
-rw-r--r--interface-definitions/include/url-http-https.xml.i15
-rw-r--r--interface-definitions/include/url.xml.i15
2 files changed, 15 insertions, 15 deletions
diff --git a/interface-definitions/include/url-http-https.xml.i b/interface-definitions/include/url-http-https.xml.i
new file mode 100644
index 000000000..f763c2bb2
--- /dev/null
+++ b/interface-definitions/include/url-http-https.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from url-http-https.xml.i -->
+<leafNode name="url">
+ <properties>
+ <help>Remote URL</help>
+ <valueHelp>
+ <format>url</format>
+ <description>Remote HTTP(S) URL</description>
+ </valueHelp>
+ <constraint>
+ <validator name="url" argument="--scheme http --scheme https"/>
+ </constraint>
+ <constraintErrorMessage>Invalid HTTP(S) URL format</constraintErrorMessage>
+ </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/url.xml.i b/interface-definitions/include/url.xml.i
deleted file mode 100644
index caa6f67bd..000000000
--- a/interface-definitions/include/url.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from url.xml.i -->
-<leafNode name="url">
- <properties>
- <help>Remote URL</help>
- <valueHelp>
- <format>url</format>
- <description>Remote URL</description>
- </valueHelp>
- <constraint>
- <regex>^https?:\/\/?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\:[0-9]+)*(\/.*)?</regex>
- </constraint>
- <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
- </properties>
-</leafNode>
-<!-- include end -->