Signed-off-by: Daniel Bowder <[email protected]>
---
The fourth patch adds a javascript type for CPUSet. This type can use a regex
match to (mostly) ensure the user types a correct cpuset. There are some fringe
cases where the CPUSet can pass the CPUSet_match, but then fail the checks in
patch three. (e.g. 0,5-4 will pass, but is invalid). This is not a problem,
because the user cannot save this invalid CPUSet per the checks in patch three.
src/Toolkit.js | 5 +++++
src/Utils.js | 2 ++
2 files changed, 7 insertions(+)
diff --git a/src/Toolkit.js b/src/Toolkit.js
index a1d291e..41673a6 100644
--- a/src/Toolkit.js
+++ b/src/Toolkit.js
@@ -121,6 +121,11 @@ Ext.apply(Ext.form.field.VTypes, {
},
HttpProxyText: gettext('Example') + ":
http://username:password@host:port/";,
+ CPUSet: function(v) {
+ return Proxmox.Utils.CPUSet_match.test(v);
+ },
+ CPUSetText: gettext('This is not a valid CPU Set. (e.g. 0,2-6,8)'),
+
DnsName: function(v) {
return Proxmox.Utils.DnsName_match.test(v);
},
diff --git a/src/Utils.js b/src/Utils.js
index 6a03057..8f1c839 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -1315,6 +1315,8 @@ utilities: {
me.DnsName_match = new RegExp("^" + DnsName_REGEXP + "$");
me.DnsName_or_Wildcard_match = new RegExp("^(?:\\*\\.)?" +
DnsName_REGEXP + "$");
+ me.CPUSet_match =
/^(?:(?:[0-9]+,)|(?:[0-9]+-[0-9]+,))*(?:(?:[0-9]+)$|(?:[0-9]+-[0-9]+)$)/;
+
me.HostPort_match = new RegExp("^(" + IPV4_REGEXP + "|" +
DnsName_REGEXP + ")(?::(\\d+))?$");
me.HostPortBrackets_match = new RegExp("^\\[(" + IPV6_REGEXP + "|" +
IPV4_REGEXP + "|" + DnsName_REGEXP + ")\\](?::(\\d+))?$");
me.IP6_dotnotation_match = new RegExp("^(" + IPV6_REGEXP +
")(?:\\.(\\d+))?$");
--
2.30.2
_______________________________________________
pve-devel mailing list
[email protected]
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
