sdn: move mac option from vnet to evpn zone plugin

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/www/manager6/sdn/VnetEdit.js b/www/manager6/sdn/VnetEdit.js
index 1ed2099427722b9cb70a6d956c62f2521f116b7b..191b73c9e709719fa49a8d6f855abb2a6be5efb9 100644 (file)
--- a/www/manager6/sdn/VnetEdit.js
+++ b/www/manager6/sdn/VnetEdit.js
@@ -13,10 +13,6 @@ Ext.define('PVE.sdn.VnetInputPanel', {
            delete values.vlanaware;
        }
 
-       if (!values.mac) {
-           delete values.mac;
-       }
-
        return values;
     },
 
@@ -60,17 +56,7 @@ Ext.define('PVE.sdn.VnetInputPanel', {
            checked: false,
            fieldLabel: gettext('VLAN Aware'),
        }
-    ],
-    advancedItems: [
-       {
-           xtype: 'textfield',
-           name: 'mac',
-           fieldLabel: gettext('MAC address'),
-           vtype: 'MacAddress',
-           allowBlank: true,
-           emptyText: 'auto'
-       },
-    ],
+    ]
 });
 
 Ext.define('PVE.sdn.VnetEdit', {

diff --git a/www/manager6/sdn/zones/EvpnEdit.js b/www/manager6/sdn/zones/EvpnEdit.js
index 657771909a5f38e384f60c888bace38674233c7e..834843ec6c10c15ae43ebd46844bc4e053d0f319 100644 (file)
--- a/www/manager6/sdn/zones/EvpnEdit.js
+++ b/www/manager6/sdn/zones/EvpnEdit.js
@@ -12,6 +12,10 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', {
            delete values.zone;
        }
 
+        if (!values.mac) {
+            delete values.mac;
+        }
+
        return values;
     },
 
@@ -35,6 +39,14 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', {
                fieldLabel: 'VRF-VXLAN Tag',
                allowBlank: false,
            },
+           {
+               xtype: 'textfield',
+               name: 'mac',
+               fieldLabel: gettext('Vnet MAC address'),
+               vtype: 'MacAddress',
+               allowBlank: true,
+               emptyText: 'auto'
+           },
            {
                xtype: 'pveNodeSelector',
                name: 'exitnodes',