diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-08-01 20:28:05 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-10-30 17:40:09 +0100 |
| commit | aec8d36b3e02adcb4cd8740e8e779b21846dd395 (patch) | |
| tree | cf410171de10e788880d6076d2b0f41ea71c2f6a /clients | |
| parent | 6f73b4608af089cde3b7e5f51b018713f3e48421 (diff) | |
| download | NetworkManager-aec8d36b3e02adcb4cd8740e8e779b21846dd395.tar.gz | |
clients: add support for ovs-bridge setting
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/cli/connections.c | 1 | ||||
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 8e00433ed7..73c1de2644 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -136,6 +136,7 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[] = { NM_SETTING_BRIDGE_PORT_SETTING_NAME","\ NM_SETTING_TEAM_SETTING_NAME","\ NM_SETTING_TEAM_PORT_SETTING_NAME"," \ + NM_SETTING_OVS_BRIDGE_SETTING_NAME","\ NM_SETTING_OVS_INTERFACE_SETTING_NAME","\ NM_SETTING_OVS_PATCH_SETTING_NAME","\ NM_SETTING_OVS_PORT_SETTING_NAME","\ diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index d6b939af44..0231fe06ce 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -5009,6 +5009,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA ( .values_static = VALUES_STATIC (NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BRIDGE_SETTING_NAME, + NM_SETTING_OVS_BRIDGE_SETTING_NAME, NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_TEAM_SETTING_NAME), ), @@ -5805,6 +5806,27 @@ static const NMMetaPropertyInfo *const property_infos_PPPOE[] = { }; #undef _CURRENT_NM_META_SETTING_TYPE +#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_BRIDGE +static const NMMetaPropertyInfo *const property_infos_OVS_BRIDGE[] = { + PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_FAIL_MODE, + .property_type = &_pt_gobject_string, + .property_typ_data = DEFINE_PROPERTY_TYP_DATA ( + .values_static = VALUES_STATIC ("secure", "standalone"), + ), + ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE, + .property_type = &_pt_gobject_bool, + ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_RSTP_ENABLE, + .property_type = &_pt_gobject_bool, + ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_STP_ENABLE, + .property_type = &_pt_gobject_bool, + ), + NULL +}; + +#undef _CURRENT_NM_META_SETTING_TYPE #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_INTERFACE static const NMMetaPropertyInfo *const property_infos_OVS_INTERFACE[] = { PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_INTERFACE_TYPE, @@ -6777,6 +6799,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN) #define SETTING_PRETTY_NAME_MACSEC N_("MACsec connection") #define SETTING_PRETTY_NAME_MACVLAN N_("macvlan connection") #define SETTING_PRETTY_NAME_OLPC_MESH N_("OLPC Mesh connection") +#define SETTING_PRETTY_NAME_OVS_BRIDGE N_("OpenVSwitch bridge settings") #define SETTING_PRETTY_NAME_OVS_INTERFACE N_("OpenVSwitch interface settings") #define SETTING_PRETTY_NAME_OVS_PATCH N_("OpenVSwitch patch interface settings") #define SETTING_PRETTY_NAME_OVS_PORT N_("OpenVSwitch port settings") @@ -6929,6 +6952,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = { ), .setting_init_fcn = _setting_init_fcn_olpc_mesh, ), + SETTING_INFO (OVS_BRIDGE, + .valid_parts = NM_META_SETTING_VALID_PARTS ( + NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE), + NM_META_SETTING_VALID_PART_ITEM (OVS_BRIDGE, TRUE), + ), + ), SETTING_INFO (OVS_INTERFACE, .valid_parts = NM_META_SETTING_VALID_PARTS ( NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE), @@ -7052,6 +7081,11 @@ static const NMMetaSettingValidPartItem *const valid_settings_slave_bridge[] = { NULL, }; +static const NMMetaSettingValidPartItem *const valid_settings_slave_ovs_bridge[] = { + NM_META_SETTING_VALID_PART_ITEM (OVS_PORT, FALSE), + NULL, +}; + static const NMMetaSettingValidPartItem *const valid_settings_slave_ovs_port[] = { NM_META_SETTING_VALID_PART_ITEM (OVS_INTERFACE, FALSE), NULL, @@ -7077,6 +7111,10 @@ nm_meta_setting_info_valid_parts_for_slave_type (const char *slave_type, const c NM_SET_OUT (out_slave_name, "bridge-slave"); return valid_settings_slave_bridge; } + if (nm_streq (slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { + NM_SET_OUT (out_slave_name, "ovs-slave"); + return valid_settings_slave_ovs_bridge; + } if (nm_streq (slave_type, NM_SETTING_OVS_PORT_SETTING_NAME)) { NM_SET_OUT (out_slave_name, "ovs-slave"); return valid_settings_slave_ovs_port; |