|
 |
c48088 |
From f219090fdd1bc0ed068f95ee03ce12823d6968d3 Mon Sep 17 00:00:00 2001
|
|
|
c48088 |
From: Francesco Giudici <fgiudici@redhat.com>
|
|
|
c48088 |
Date: Fri, 12 Jan 2018 18:33:59 +0100
|
|
|
c48088 |
Subject: [PATCH 1/2] cli: get team defaults from setting header files
|
|
|
c48088 |
|
|
|
c48088 |
this allows centralizing default values definition and allows quicker
|
|
|
c48088 |
and safer update of default values.
|
|
|
c48088 |
|
|
|
c48088 |
(cherry picked from commit c6448f724b1debb39973f4bfbf9ce4f79218b936)
|
|
|
c48088 |
---
|
|
|
c48088 |
clients/common/nm-meta-setting-desc.c | 8 ++++----
|
|
|
c48088 |
libnm-core/nm-utils.c | 4 ++--
|
|
|
c48088 |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
c48088 |
|
|
|
c48088 |
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
|
|
|
c48088 |
index 9d0ac9061..d4f162fb4 100644
|
|
|
c48088 |
--- a/clients/common/nm-meta-setting-desc.c
|
|
|
c48088 |
+++ b/clients/common/nm-meta-setting-desc.c
|
|
|
c48088 |
@@ -6625,7 +6625,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
|
|
|
c48088 |
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
|
|
|
c48088 |
.value_infos = INT_VALUE_INFOS (
|
|
|
c48088 |
{
|
|
|
c48088 |
- .value = 50,
|
|
|
c48088 |
+ .value = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT,
|
|
|
c48088 |
.nick = "default",
|
|
|
c48088 |
}
|
|
|
c48088 |
),
|
|
|
c48088 |
@@ -6642,7 +6642,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
|
|
|
c48088 |
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
|
|
|
c48088 |
.value_infos = INT_VALUE_INFOS (
|
|
|
c48088 |
{
|
|
|
c48088 |
- .value = 255,
|
|
|
c48088 |
+ .value = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT,
|
|
|
c48088 |
.nick = "default",
|
|
|
c48088 |
}
|
|
|
c48088 |
),
|
|
|
c48088 |
@@ -6698,7 +6698,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
|
|
|
c48088 |
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
|
|
|
c48088 |
.value_infos = INT_VALUE_INFOS (
|
|
|
c48088 |
{
|
|
|
c48088 |
- .value = -1,
|
|
|
c48088 |
+ .value = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT,
|
|
|
c48088 |
.nick = "default",
|
|
|
c48088 |
}
|
|
|
c48088 |
),
|
|
|
c48088 |
@@ -6723,7 +6723,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
|
|
|
c48088 |
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
|
|
|
c48088 |
.value_infos = INT_VALUE_INFOS (
|
|
|
c48088 |
{
|
|
|
c48088 |
- .value = 255,
|
|
|
c48088 |
+ .value = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT,
|
|
|
c48088 |
.nick = "default",
|
|
|
c48088 |
}
|
|
|
c48088 |
),
|
|
|
c48088 |
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
|
|
|
c48088 |
index df58409bf..ce3536c84 100644
|
|
|
c48088 |
--- a/libnm-core/nm-utils.c
|
|
|
c48088 |
+++ b/libnm-core/nm-utils.c
|
|
|
c48088 |
@@ -5151,9 +5151,9 @@ _json_team_normalize_defaults (json_t *json, gboolean reset)
|
|
|
c48088 |
_json_delete_object_on_string_match (json, "runner", "hwaddr_policy", NULL,
|
|
|
c48088 |
NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_DEFAULT);
|
|
|
c48088 |
} else if (nm_streq (runner, NM_SETTING_TEAM_RUNNER_LACP)) {
|
|
|
c48088 |
- runner_tx_balancer_interval = 50;
|
|
|
c48088 |
+ runner_tx_balancer_interval = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT;
|
|
|
c48088 |
runner_active = TRUE;
|
|
|
c48088 |
- runner_sys_prio = 255;
|
|
|
c48088 |
+ runner_sys_prio = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT;
|
|
|
c48088 |
runner_min_ports = 0;
|
|
|
c48088 |
_json_delete_object_on_string_match (json, "runner", "agg_select_policy", NULL,
|
|
|
c48088 |
NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_DEFAULT);
|
|
|
c48088 |
--
|
|
|
c48088 |
2.14.3
|
|
|
c48088 |
|
|
|
c48088 |
|
|
|
c48088 |
From c34cd5e09a50b015c59491aa4506b64e30f217bc Mon Sep 17 00:00:00 2001
|
|
|
c48088 |
From: Francesco Giudici <fgiudici@redhat.com>
|
|
|
c48088 |
Date: Fri, 12 Jan 2018 18:32:47 +0100
|
|
|
c48088 |
Subject: [PATCH 2/2] libnm-core: team: fix runner sys_prio default value
|
|
|
c48088 |
|
|
|
c48088 |
(cherry picked from commit 2c99eba42fdd69c7e5719f19d24aa944dfaaf666)
|
|
|
c48088 |
---
|
|
|
c48088 |
libnm-core/nm-setting-team.h | 2 +-
|
|
|
c48088 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
c48088 |
|
|
|
c48088 |
diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h
|
|
|
c48088 |
index 452078363..d423901f6 100644
|
|
|
c48088 |
--- a/libnm-core/nm-setting-team.h
|
|
|
c48088 |
+++ b/libnm-core/nm-setting-team.h
|
|
|
c48088 |
@@ -150,7 +150,7 @@ NMTeamLinkWatcherArpPingFlags nm_team_link_watcher_get_flags (NMTeamLinkWatcher
|
|
|
c48088 |
#define NM_SETTING_TEAM_RUNNER_DEFAULT NM_SETTING_TEAM_RUNNER_ROUNDROBIN
|
|
|
c48088 |
#define NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_DEFAULT NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_SAME_ALL
|
|
|
c48088 |
#define NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT 50
|
|
|
c48088 |
-#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT 255
|
|
|
c48088 |
+#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT 65535
|
|
|
c48088 |
#define NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_DEFAULT NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO
|
|
|
c48088 |
|
|
|
c48088 |
|
|
|
c48088 |
--
|
|
|
c48088 |
2.14.3
|
|
|
c48088 |
|