use new ovs bond modes (changed in pve-common)

diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm
index fe1a0f0bf3a079d0796298add6fea8b728fadae6..68452e62d5a0ce3537ec391ccd567721cdfb421a 100644 (file)
--- a/PVE/API2/Network.pm
+++ b/PVE/API2/Network.pm
@@ -20,14 +20,15 @@ my $iflockfn = "/etc/network/.pve-interfaces.lock";
 
 my $bond_mode_enum = [
     'balance-rr',
-    'active-backup',
+    'active-backup', # OVS and Linux
     'balance-xor',
     'broadcast',
     '802.3ad',
     'balance-tlb',
     'balance-alb',
-    'balance-slb', # OVS only
-    'balance-tcp', # OVS only
+    'balance-slb', # OVS 
+    'lacp-balance-slb', # OVS
+    'lacp-balance-tcp', # OVS
     ];
 
 my $network_type_enum = ['bridge', 'bond', 'eth', 'alias', 

diff --git a/www/manager/form/BondModeSelector.js b/www/manager/form/BondModeSelector.js
index 4396655ada2cacba7d095a631ec33fd74577c9e1..4dc6564db5a15940f5e76b9c4d1203e2e5546427 100644 (file)
--- a/www/manager/form/BondModeSelector.js
+++ b/www/manager/form/BondModeSelector.js
@@ -9,9 +9,10 @@ Ext.define('PVE.form.BondModeSelector', {
 
        if (me.openvswitch) {
            me.data = [ 
-              ['balance-tcp', 'balance-tcp'],
+              ['active-backup', 'active-backup'],
               ['balance-slb', 'balance-slb'],
-              ['active-backup', 'active-backup'] 
+              ['lacp-balance-slb', 'LACP (balance-slb)'],
+              ['lacp-balance-tcp', 'LACP (balance-tcp)']
           ];
        } else {
             me.data = [ 
@@ -19,7 +20,7 @@ Ext.define('PVE.form.BondModeSelector', {
                ['active-backup', 'active-backup'], 
                ['balance-xor', 'balance-xor'], 
                ['broadcast', 'broadcast'], 
-               ['802.3ad', '802.3ad'], 
+               ['802.3ad', 'LACP (layer2)'], 
                ['balance-tlb', 'balance-tlb'], 
                ['balance-alb', 'balance-alb']
            ];