colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: add bonding option "lacp_rate" to NMSettingBond

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-08-23 00:48:50 +02:00
parent 53b9504544
commit 47555449fa
5 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libnm-core/nm-setting-bond.c
View File

@@ -111,6 +111,8 @@ static const BondDefault defaults[] = {
{ NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY, "0", TYPE_BOTH, 0, 2, { NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY, "0", TYPE_BOTH, 0, 2,
{ "layer2", "layer3+4", "layer2+3", NULL } }, { "layer2", "layer3+4", "layer2+3", NULL } },
{ NM_SETTING_BOND_OPTION_RESEND_IGMP, "1", TYPE_INT, 0, 255 }, { NM_SETTING_BOND_OPTION_RESEND_IGMP, "1", TYPE_INT, 0, 255 },
{ NM_SETTING_BOND_OPTION_LACP_RATE, "0", TYPE_BOTH, 0, 1,
{ "slow", "fast", NULL } },
}; };
/** /**
@@ -462,6 +464,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NULL }; NULL };
int miimon = 0, arp_interval = 0; int miimon = 0, arp_interval = 0;
const char *arp_ip_target = NULL; const char *arp_ip_target = NULL;
const char *lacp_rate;
const char *primary; const char *primary;
g_hash_table_iter_init (&iter, priv->options); g_hash_table_iter_init (&iter, priv->options);
@@ -643,6 +646,19 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
} }
} }
lacp_rate = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_LACP_RATE);
if ( lacp_rate
&& (g_strcmp0 (value, "802.3ad") != 0 && g_strcmp0 (value, "4") != 0)
&& (strcmp (lacp_rate, "slow") != 0 && strcmp (lacp_rate, "0") != 0)) {
g_set_error (error,
NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' option is only valid with mode '%s'"),
NM_SETTING_BOND_OPTION_LACP_RATE, "802.3ad");
g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS);
return FALSE;
}
return _nm_setting_verify_required_virtual_interface_name (all_settings, error); return _nm_setting_verify_required_virtual_interface_name (all_settings, error);
} }

1
libnm-core/nm-setting-bond.h
View File

@@ -74,6 +74,7 @@ GQuark nm_setting_bond_error_quark (void);
#define NM_SETTING_BOND_OPTION_AD_SELECT "ad_select" #define NM_SETTING_BOND_OPTION_AD_SELECT "ad_select"
#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy" #define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
#define NM_SETTING_BOND_OPTION_RESEND_IGMP "resend_igmp" #define NM_SETTING_BOND_OPTION_RESEND_IGMP "resend_igmp"
#define NM_SETTING_BOND_OPTION_LACP_RATE "lacp_rate"
typedef struct { typedef struct {
NMSetting parent; NMSetting parent;

16
libnm-util/nm-setting-bond.c
View File

@@ -120,6 +120,8 @@ static const BondDefault defaults[] = {
{ NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY, "0", TYPE_BOTH, 0, 2, { NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY, "0", TYPE_BOTH, 0, 2,
{ "layer2", "layer3+4", "layer2+3", NULL } }, { "layer2", "layer3+4", "layer2+3", NULL } },
{ NM_SETTING_BOND_OPTION_RESEND_IGMP, "1", TYPE_INT, 0, 255 }, { NM_SETTING_BOND_OPTION_RESEND_IGMP, "1", TYPE_INT, 0, 255 },
{ NM_SETTING_BOND_OPTION_LACP_RATE, "0", TYPE_BOTH, 0, 1,
{ "slow", "fast", NULL } },
}; };
/** /**
@@ -487,6 +489,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NULL }; NULL };
int miimon = 0, arp_interval = 0; int miimon = 0, arp_interval = 0;
const char *arp_ip_target = NULL; const char *arp_ip_target = NULL;
const char *lacp_rate;
const char *primary; const char *primary;
g_hash_table_iter_init (&iter, priv->options); g_hash_table_iter_init (&iter, priv->options);
@@ -668,6 +671,19 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
} }
} }
lacp_rate = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_LACP_RATE);
if ( lacp_rate
&& (g_strcmp0 (value, "802.3ad") != 0 && g_strcmp0 (value, "4") != 0)
&& (strcmp (lacp_rate, "slow") != 0 && strcmp (lacp_rate, "0") != 0)) {
g_set_error (error,
NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' option is only valid with mode '%s'"),
NM_SETTING_BOND_OPTION_LACP_RATE, "802.3ad");
g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS);
return FALSE;
}
return _nm_setting_verify_deprecated_virtual_iface_name ( return _nm_setting_verify_deprecated_virtual_iface_name (
priv->interface_name, FALSE, priv->interface_name, FALSE,
NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_INTERFACE_NAME, NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_INTERFACE_NAME,

1
libnm-util/nm-setting-bond.h
View File

@@ -71,6 +71,7 @@ GQuark nm_setting_bond_error_quark (void);
#define NM_SETTING_BOND_OPTION_AD_SELECT "ad_select" #define NM_SETTING_BOND_OPTION_AD_SELECT "ad_select"
#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy" #define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
#define NM_SETTING_BOND_OPTION_RESEND_IGMP "resend_igmp" #define NM_SETTING_BOND_OPTION_RESEND_IGMP "resend_igmp"
#define NM_SETTING_BOND_OPTION_LACP_RATE "lacp_rate"
typedef struct { typedef struct {
NMSetting parent; NMSetting parent;

1
src/devices/nm-device-bond.c
View File

@@ -360,6 +360,7 @@ apply_bonding_config (NMDevice *device)
set_simple_option (device, "ad_select", s_bond, NM_SETTING_BOND_OPTION_AD_SELECT); set_simple_option (device, "ad_select", s_bond, NM_SETTING_BOND_OPTION_AD_SELECT);
set_simple_option (device, "xmit_hash_policy", s_bond, NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY); set_simple_option (device, "xmit_hash_policy", s_bond, NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY);
set_simple_option (device, "resend_igmp", s_bond, NM_SETTING_BOND_OPTION_RESEND_IGMP); set_simple_option (device, "resend_igmp", s_bond, NM_SETTING_BOND_OPTION_RESEND_IGMP);
set_simple_option (device, "lacp_rate", s_bond, NM_SETTING_BOND_OPTION_LACP_RATE);
return NM_ACT_STAGE_RETURN_SUCCESS; return NM_ACT_STAGE_RETURN_SUCCESS;
} }