[pve-devel] [PATCH 0/2] Allow four-octet MAC perfixes

[pve-devel] [PATCH 0/2] Allow four-octet MAC perfixes

[Moayad Almalat]

This patch series enables support for four-octet MAC prefixes in Web UI
Changes are made in both forntend `proxmox-widget-toolkit` and backend `pve-cluster`

Thank you @Shannon for your hint in my first attempt :)


Signed-off-by: Moayad Almalat <m.almalat@proxmox.com>
---
 src/PVE/DataCenterConfig.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PVE/DataCenterConfig.pm b/src/PVE/DataCenterConfig.pm
index abd0bbf..98e5599 100644
--- a/src/PVE/DataCenterConfig.pm
+++ b/src/PVE/DataCenterConfig.pm
@@ -199,7 +199,7 @@ PVE::JSONSchema::register_format('mac-prefix', \&pve_verify_mac_prefix);
 sub pve_verify_mac_prefix {
     my ($mac_prefix, $noerr) = @_;
 
-    if ($mac_prefix !~ m/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}:?$/i) {
+    if ($mac_prefix !~ m/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}(?::[a-f0-9]{0,2})?:?$/i) {
 	return undef if $noerr;
 	die "value is not a valid unicast MAC address prefix\n";
     }
-- 
2.39.5


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH] fix: allow four-octet MAC prefixes in Web UI validation

[Moayad Almalat]

Signed-off-by: Moayad Almalat <m.almalat@proxmox.com>
---
 src/Toolkit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Toolkit.js b/src/Toolkit.js
index 8a0138d..2006dc8 100644
--- a/src/Toolkit.js
+++ b/src/Toolkit.js
@@ -70,7 +70,7 @@ Ext.apply(Ext.form.field.VTypes, {
     MacAddressText: gettext('Example') + ': 01:23:45:67:89:ab',
 
     MacPrefix: function(v) {
-	return (/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}:?$/i).test(v);
+	return (/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}(?::[a-f0-9]{0,2})?:?$/i).test(v);
     },
     MacPrefixMask: /[a-fA-F0-9:]/,
     MacPrefixText: gettext('Example') + ': 02:8f - ' + gettext('only unicast addresses are allowed'),
-- 
2.39.5


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel