From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v12 pve-manager 2/4] sdn: move mac option from vnet to evpn zone plugin
Date: Wed, 21 Apr 2021 23:53:37 +0200 [thread overview]
Message-ID: <20210421215339.1801755-3-aderumier@odiso.com> (raw)
In-Reply-To: <20210421215339.1801755-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
www/manager6/sdn/VnetEdit.js | 16 +---------------
www/manager6/sdn/zones/EvpnEdit.js | 12 ++++++++++++
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/www/manager6/sdn/VnetEdit.js b/www/manager6/sdn/VnetEdit.js
index 1ed20994..191b73c9 100644
--- 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 65777190..834843ec 100644
--- 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',
--
2.20.1
next prev parent reply other threads:[~2021-04-21 21:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 21:53 [pve-devel] [PATCH v12 pve-manager 0/4] sdn: add subnet/ipam/sdn management Alexandre Derumier
2021-04-21 21:53 ` [pve-devel] [PATCH v12 pve-manager 1/4] " Alexandre Derumier
2021-04-21 21:53 ` Alexandre Derumier [this message]
2021-04-21 21:53 ` [pve-devel] [PATCH v12 pve-manager 3/4] sdn: controller: bgp: add ebgp-multihop option Alexandre Derumier
2021-04-21 21:53 ` [pve-devel] [PATCH v12 pve-manager 4/4] sdn: controllers: bgp: use node as controllerid Alexandre Derumier
2021-04-26 18:08 ` [pve-devel] applied: [PATCH v12 pve-manager 0/4] sdn: add subnet/ipam/sdn management Thomas Lamprecht
2021-04-28 2:36 ` alexandre derumier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210421215339.1801755-3-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox