[pve-devel] [PATCH manager 1/2] qemu: parse vlan trunks

Wolfgang Bumiller w.bumiller at proxmox.com
Mon Apr 11 11:44:29 CEST 2016


Fixes an error when trying to edit a network with assigned
trunks.
---
 www/manager6/Parser.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js
index d442a75..e26c608 100644
--- a/www/manager6/Parser.js
+++ b/www/manager6/Parser.js
@@ -47,6 +47,8 @@ Ext.define('PVE.Parser', { statics: {
                 res.disconnect = match_res[1];
 	    } else if ((match_res = p.match(/^queues=(\d+)$/)) !== null) {
                 res.queues = match_res[1];
+	    } else if ((match_res = p.match(/^trunks=(\d+(?:-\d+)?(?:;\d+(?:-\d+)?)*)$/)) !== null) {
+		res.trunks = match_res[1];
 	    } else {
 		errors = true;
 		return false; // break
@@ -84,6 +86,9 @@ Ext.define('PVE.Parser', { statics: {
 	if (net.disconnect) {
 	    netstr += ",link_down=" + net.disconnect;
 	}
+	if (net.trunks) {
+	    netstr += ",trunks=" + net.trunks;
+	}
 	return netstr;
     },
 
-- 
2.1.4




More information about the pve-devel mailing list