diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2019-06-11 17:25:37 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-06-14 12:10:20 +0200 |
commit | bd119981a148bd74a16e65dd359f9e50b43b1dce (patch) | |
tree | fe9ec996721f2f0932ddbb0f62dda475092239b2 | |
parent | ae4152120a0df717992a77b0700abc1a4a2e31a3 (diff) | |
download | NetworkManager-bd119981a148bd74a16e65dd359f9e50b43b1dce.tar.gz |
clients: add ovs-dpdk interface supportlr/ovs-dpdk
-rw-r--r-- | clients/cli/connections.c | 3 | ||||
-rw-r--r-- | clients/common/nm-meta-setting-desc.c | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 1ca84ba575..25622c7d5d 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -826,7 +826,8 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO NM_SETTING_PROXY_SETTING_NAME"," \ NM_SETTING_TC_CONFIG_SETTING_NAME"," \ NM_SETTING_SRIOV_SETTING_NAME"," \ - NM_SETTING_ETHTOOL_SETTING_NAME + NM_SETTING_ETHTOOL_SETTING_NAME"," \ + NM_SETTING_OVS_DPDK_SETTING_NAME \ // NM_SETTING_DUMMY_SETTING_NAME // NM_SETTING_WIMAX_SETTING_NAME diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 817e080ece..e963290edd 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -6117,6 +6117,15 @@ static const NMMetaPropertyInfo *const property_infos_OVS_BRIDGE[] = { }; #undef _CURRENT_NM_META_SETTING_TYPE +#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_DPDK +static const NMMetaPropertyInfo *const property_infos_OVS_DPDK[] = { + PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_DPDK_DEVARGS, + .property_type = &_pt_gobject_string, + ), + 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, @@ -7608,6 +7617,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN) #define SETTING_PRETTY_NAME_MATCH N_("Match") #define SETTING_PRETTY_NAME_OLPC_MESH N_("OLPC Mesh connection") #define SETTING_PRETTY_NAME_OVS_BRIDGE N_("Open vSwitch bridge settings") +#define SETTING_PRETTY_NAME_OVS_DPDK N_("Open vSwitch DPDK interface settings") #define SETTING_PRETTY_NAME_OVS_INTERFACE N_("Open vSwitch interface settings") #define SETTING_PRETTY_NAME_OVS_PATCH N_("Open vSwitch patch interface settings") #define SETTING_PRETTY_NAME_OVS_PORT N_("Open vSwitch port settings") @@ -7788,10 +7798,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = { NM_META_SETTING_VALID_PART_ITEM (OVS_BRIDGE, TRUE), ), ), + SETTING_INFO (OVS_DPDK), SETTING_INFO (OVS_INTERFACE, .valid_parts = NM_META_SETTING_VALID_PARTS ( NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE), NM_META_SETTING_VALID_PART_ITEM (OVS_INTERFACE, TRUE), + NM_META_SETTING_VALID_PART_ITEM (OVS_DPDK, FALSE), NM_META_SETTING_VALID_PART_ITEM (OVS_PATCH, FALSE), NM_META_SETTING_VALID_PART_ITEM (IP4_CONFIG, FALSE), NM_META_SETTING_VALID_PART_ITEM (IP6_CONFIG, FALSE), |