node network: refactor bond mode array generation

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/Utils.js b/Utils.js
index 7a78fda7a9d472d483ca6321cac1f240a3fcf533..929de6ee47980c1cb168323a1e4e8532fe63a301 100644 (file)
--- a/Utils.js
+++ b/Utils.js
@@ -99,6 +99,29 @@ Ext.define('Proxmox.Utils', { utilities: {
        return data;
     },
 
+    bond_mode_gettext_map: {
+       '802.3ad': 'LACP (802.3ad)',
+       'lacp-balance-slb': 'LACP (balance-slb)',
+       'lacp-balance-tcp': 'LACP (balance-tcp)',
+    },
+
+    render_bond_mode: function(value) {
+       var val = Proxmox.Utils.bond_mode_gettext_map[value];
+       if (!val) {
+           val = value || '';
+       }
+       return val;
+    },
+
+    bond_mode_array: function(modes) {
+       var arr = [];
+       var i;
+       for (i = 0; i < modes.length; i++) {
+           arr.push([modes[i], Proxmox.Utils.render_bond_mode(modes[i])]);
+       }
+       return arr;
+    },
+
     getNoSubKeyHtml: function(url) {
        // url http://www.proxmox.com/products/proxmox-ve/subscription-service-plans
        return Ext.String.format('You do not have a valid subscription for this server. Please visit <a target="_blank" href="{0}">www.proxmox.com</a> to get a list of available options.', url || 'https://www.proxmox.com');

diff --git a/form/BondModeSelector.js b/form/BondModeSelector.js
index 8781ebc222b49aba9a3f2308ac61e15217ef677c..26c2747ac405012ec045372cdfd5863c60b203dc 100644 (file)
--- a/form/BondModeSelector.js
+++ b/form/BondModeSelector.js
@@ -8,22 +8,22 @@ Ext.define('Proxmox.form.BondModeSelector', {
        var me = this;
 
        if (me.openvswitch) {
-           me.comboItems = [
-              ['active-backup', 'active-backup'],
-              ['balance-slb', 'balance-slb'],
-              ['lacp-balance-slb', 'LACP (balance-slb)'],
-              ['lacp-balance-tcp', 'LACP (balance-tcp)']
-          ];
+           me.comboItems = Proxmox.Utils.bond_mode_array([
+              'active-backup',
+              'balance-slb',
+              'lacp-balance-slb',
+              'lacp-balance-tcp',
+           ]);
        } else {
-            me.comboItems = [
-               ['balance-rr', 'balance-rr'],
-               ['active-backup', 'active-backup'],
-               ['balance-xor', 'balance-xor'],
-               ['broadcast', 'broadcast'],
-               ['802.3ad', 'LACP (802.3ad)'],
-               ['balance-tlb', 'balance-tlb'],
-               ['balance-alb', 'balance-alb']
-           ];
+           me.comboItems = Proxmox.Utils.bond_mode_array([
+               'balance-rr',
+               'active-backup',
+               'balance-xor',
+               'broadcast',
+               '802.3ad',
+               'balance-tlb',
+               'balance-alb',
+           ]);
        }
 
        me.callParent();