Skip to content

Commit

Permalink
Contrail vrouter plugin
Browse files Browse the repository at this point in the history
With RHEL 8 the systemd network service will go away.
We use it today for creating the vhost0 interface.
Replacement will be NetworkManager.
RedHat asked us to collaboratively integrate vhost0 mgmt into NM.
This will also benefit recent problems we had with OpenShift which also uses NM.

Closes-Jira-Bug: CEM-3697
  • Loading branch information
Dmitry_Eremeev committed Sep 27, 2019
1 parent 2979c89 commit a3e36a4
Show file tree
Hide file tree
Showing 47 changed files with 1,427 additions and 241 deletions.
69 changes: 63 additions & 6 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@ introspection_sources = \
introspection/org.freedesktop.NetworkManager.Device.Bridge.h \
introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \
introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \
introspection/org.freedesktop.NetworkManager.Device.ContrailVrouter.c \
introspection/org.freedesktop.NetworkManager.Device.ContrailVrouter.h \
introspection/org.freedesktop.NetworkManager.Device.Dummy.c \
introspection/org.freedesktop.NetworkManager.Device.Dummy.h \
introspection/org.freedesktop.NetworkManager.Device.Wired.c \
Expand Down Expand Up @@ -348,7 +350,8 @@ DBUS_INTERFACE_DOCS = \
docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml
docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.ContrailVrouter.xml

introspection/%.c: introspection/%.xml
@$(MKDIR_P) introspection/
Expand Down Expand Up @@ -413,7 +416,8 @@ dbusinterfaces_DATA = \
introspection/org.freedesktop.NetworkManager.Settings.xml \
introspection/org.freedesktop.NetworkManager.VPN.Connection.xml \
introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml \
introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml \
introspection/org.freedesktop.NetworkManager.Device.ContrailVrouter.xml

CLEANFILES += $(introspection_sources)
CLEANFILES += $(DBUS_INTERFACE_DOCS)
Expand Down Expand Up @@ -490,7 +494,8 @@ libnm_core_lib_h_pub_real = \
libnm-core/nm-version.h \
libnm-core/nm-vpn-dbus-interface.h \
libnm-core/nm-vpn-editor-plugin.h \
libnm-core/nm-vpn-plugin-info.h
libnm-core/nm-vpn-plugin-info.h \
libnm-core/nm-setting-contrail-vrouter.h
libnm_core_lib_h_pub_mkenums = \
libnm-core/nm-core-enum-types.h
libnm_core_lib_h_priv = \
Expand Down Expand Up @@ -560,7 +565,8 @@ libnm_core_lib_c_settings_real = \
libnm-core/nm-setting-wired.c \
libnm-core/nm-setting-wireless-security.c \
libnm-core/nm-setting-wireless.c \
libnm-core/nm-setting-wpan.c
libnm-core/nm-setting-wpan.c \
libnm-core/nm-setting-contrail-vrouter.c
libnm_core_lib_c_real = \
$(libnm_core_lib_c_settings_real) \
shared/nm-utils/c-list-util.c \
Expand Down Expand Up @@ -892,7 +898,8 @@ libnm_lib_h_pub_real = \
libnm/nm-vpn-editor.h \
libnm/nm-vpn-plugin-old.h \
libnm/nm-vpn-service-plugin.h \
libnm/nm-wimax-nsp.h
libnm/nm-wimax-nsp.h \
libnm/nm-device-contrail-vrouter.h
libnm_lib_h_pub_mkenums = \
libnm/nm-enum-types.h
libnm_lib_h_priv = \
Expand Down Expand Up @@ -957,7 +964,8 @@ libnm_lib_c_real = \
libnm/nm-vpn-plugin-old.c \
libnm/nm-vpn-editor.c \
libnm/nm-vpn-service-plugin.c \
libnm/nm-wimax-nsp.c
libnm/nm-wimax-nsp.c \
libnm/nm-device-contrail-vrouter.c
libnm_lib_c_mkenums = \
libnm/nm-enum-types.c

Expand Down Expand Up @@ -2902,6 +2910,48 @@ EXTRA_DIST += \
data/NetworkManager-ovs.conf \
src/devices/ovs/meson.build

###############################################################################
# src/devices/contrail
###############################################################################

if WITH_CONTRAIL

if HAVE_SYSTEMD

systemdnmunitdir = $(systemdsystemunitdir)/NetworkManager.service.d
systemdnmunit_DATA = \
data/NetworkManager-contrail.conf

endif

core_plugins += src/devices/contrail/libnm-device-plugin-contrail.la

src_devices_contrail_libnm_device_plugin_contrail_la_SOURCES = \
src/devices/contrail/nm-contrail-factory.c \
src/devices/contrail/nm-device-contrail-vrouter.c \
src/devices/contrail/nm-device-contrail-vrouter.h

src_devices_contrail_libnm_device_plugin_contrail_la_CPPFLAGS = \
$(src_cppflags_device_plugin) \
$(NULL)

src_devices_contrail_libnm_device_plugin_contrail_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(srcdir)/linker-script-devices.ver"

src_devices_contrail_libnm_device_plugin_contrail_la_LIBADD = \
$(GLIB_LIBS)

check-local-devices-contrail: src/devices/contrail/libnm-device-plugin-contrail.la
$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/contrail/.libs/libnm-device-plugin-contrail.so "$(srcdir)/linker-script-devices.ver"
$(call check_so_symbols,$(builddir)/src/devices/contrail/.libs/libnm-device-plugin-contrail.so)

endif

EXTRA_DIST += \
data/NetworkManager-contrail.conf \
src/devices/contrail/meson.build

###############################################################################
# src/dnsmasq/tests
###############################################################################
Expand Down Expand Up @@ -4600,6 +4650,13 @@ EXTRA_DIST += man/nm-openvswitch.7
dist_dependencies += man/nm-openvswitch.7
endif

if WITH_CONTRAIL
man_pages += man/nm-contrail.7
else
EXTRA_DIST += man/nm-contrail.7
dist_dependencies += man/nm-contrail.7
endif

if CONFIG_PLUGIN_IFCFG_RH
man_pages_autogen += man/nm-settings-ifcfg-rh.5
else
Expand Down
148 changes: 64 additions & 84 deletions README
Original file line number Diff line number Diff line change
@@ -1,85 +1,65 @@

******************
2008-12-11: NetworkManager core daemon has moved to git.freedesktop.org!

git clone git://git.freedesktop.org/git/NetworkManager/NetworkManager.git
******************


Networking that Just Works
--------------------------

NetworkManager attempts to keep an active network connection available at all
times. The point of NetworkManager is to make networking configuration and
setup as painless and automatic as possible. NetworkManager is intended to
replace default route, replace other routes, set IP addresses, and in general
configure networking as NM sees fit (with the possibility of manual override as
necessary). In effect, the goal of NetworkManager is to make networking Just
Work with a minimum of user hassle, but still allow customization and a high
level of manual network control. If you have special needs, we'd like to hear
about them, but understand that NetworkManager is not intended for every
use-case.

NetworkManager will attempt to keep every network device in the system up and
active, as long as the device is available for use (has a cable plugged in,
the killswitch isn't turned on, etc). Network connections can be set to
'autoconnect', meaning that NetworkManager will make that connection active
whenever it and the hardware is available.

"Settings services" store lists of user- or administrator-defined "connections",
which contain all the settings and parameters required to connect to a specific
network. NetworkManager will _never_ activate a connection that is not in this
list, or that the user has not directed NetworkManager to connect to.


How it works:

The NetworkManager daemon runs as a privileged service (since it must access
and control hardware), but provides a D-Bus interface on the system bus to
allow for fine-grained control of networking. NetworkManager does not store
connections or settings, it is only the mechanism by which those connections
are selected and activated.

To store pre-defined network connections, two separate services, the "system
settings service" and the "user settings service" store connection information
and provide these to NetworkManager, also via D-Bus. Each settings service
can determine how and where it persistently stores the connection information;
for example, the GNOME applet stores its configuration in GConf, and the system
settings service stores its config in distro-specific formats, or in a distro-
agnostic format, depending on user/administrator preference.

A variety of other system services are used by NetworkManager to provide
network functionality: wpa_supplicant for wireless connections and 802.1x
wired connections, pppd for PPP and mobile broadband connections, DHCP clients
for dynamic IP addressing, dnsmasq for proxy nameserver and DHCP server
functionality for internet connection sharing, and avahi-autoipd for IPv4
link-local addresses. Most communication with these daemons occurs, again,
via D-Bus.


Why doesn't my network Just Work?

Driver problems are the #1 cause of why NetworkManager sometimes fails to
connect to wireless networks. Often, the driver simply doesn't behave in a
consistent manner, or is just plain buggy. NetworkManager supports _only_
those drivers that are shipped with the upstream Linux kernel, because only
those drivers can be easily fixed and debugged. ndiswrapper, vendor binary
drivers, or other out-of-tree drivers may or may not work well with
NetworkManager, precisely because they have not been vetted and improved by the
open-source community, and because problems in these drivers usually cannot
be fixed.

Sometimes, command-line tools like 'iwconfig' will work, but NetworkManager will
fail. This is again often due to buggy drivers, because these drivers simply
aren't expecting the dynamic requests that NetworkManager and wpa_supplicant
make. Driver bugs should be filed in the bug tracker of the distribution being
run, since often distributions customize their kernel and drivers.

Sometimes, it really is NetworkManager's fault. If you think that's the case,
please file a bug at http://bugzilla.gnome.org and choose the NetworkManager
component. Attaching the output of /var/log/messages or /var/log/daemon.log
(wherever your distribution directs syslog's 'daemon' facility output) is often
very helpful, and (if you can get) a working wpa_supplicant config file helps
enormously.

Environment
--------------
RHEL 8.0
NetworkManager 1.14.0
installed vrouter.ko for running kernel version (unloaded)
installed vif utility (contrail-vrouter-utils)

How to build RPMs
------------------
git clone --single-branch --branch contrail-vrouter https://github.com/progmaticlab/NetworkManager.git
export PYTHON=python3
export NM_RPMBUILD_ARGS="--without=adsl --without=bluetooth --without=wwan --without=team --without=wifi --without=ovs"
NetworkManager/contrib/fedora/REQUIRED_PACKAGES
NetworkManager/contrib/fedora/rpm/build.sh

How to apply Contrail vrouter plugin
------------------
dnf remove -y NetworkManager-libnm*
rpm -iv NetworkManager/contrib/fedora/rpm/latest/RPMS/x86_64/NetworkManager-libnm
rpm -iv NetworkManager/contrib/fedora/rpm/latest/RPMS/x86_64/NetworkManager-1.14.0*
rpm -iv NetworkManager/contrib/fedora/rpm/latest/RPMS/x86_64/NetworkManager-contrail-1.14*
systemctl daemon-reload
systemctl restart NetworkManager

Usage
-------
nmcli c add type contrail-vrouter physdev enp0s3 conn.interface vhost0 autoconnect no
nmcli c up contrail-vrouter-vhost0
nmcli c down contrail-vrouter-vhost0

Troubleshooting
----------------
To set maximum log level:
nmcli general logging level TRACE domains ALL

To get all system logs regarding the component "NetworkManager" for last hour and get new logs in real time (tail -f):
journalctl -f --no-tail --since "1 hour ago" -u NetworkManager

To get all system logs regarding the component "NetworkManager" with keyword "CONTRAILl" for last hour and get new logs in real time (tail -f):
journalctl -f --no-tail -g "CONTRAIL" --since "1 hour ago" -u NetworkManager

To load vrouter module or get error message if it's already loaded:
modprobe -v --first-time vrouter

To unload vrouter module or get error message if it's already unloaded:
modprobe -rv --first-time vrouter

To get log level for core component of NetworkManager:
nmcli general logging

To get list of network devices (network interfaces):
nmcli device

To set debug log level for core component of NetworkManager:
nmcli g log level DEBUG

To notify NetworkManager about changes after connection profile was manually changed (/etc/NetworkManager/system-connections/), not by nmcli means
nmcli connection reload

To delete all connection profiles with keyword "vhost" in their names (by means of nmcli):
for i in `nmcli -f NAME c show | grep "vhost"`; do nmcli c del $i; done

To delete all connection profiles with keyword "contrail" in their names (manual deleting, not by nmcli means):
rm -rf /etc/NetworkManager/system-connections/contrail*

3 changes: 2 additions & 1 deletion clients/cli/connections.c
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,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_CONTRAIL_VROUTER_SETTING_NAME
// NM_SETTING_DUMMY_SETTING_NAME
// NM_SETTING_WIMAX_SETTING_NAME

Expand Down
1 change: 1 addition & 0 deletions clients/common/nm-client-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_reason_to_string, NMDeviceStateReason,
NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE, N_("A duplicate IP address was detected")),
NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED, N_("The selected IP method is not supported")),
NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SRIOV_CONFIGURATION_FAILED, N_("Failed to configure SR-IOV parameters")),
NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_CONTRAIL_VROUTER_FAILED, N_("Contrail vrouter kernel module failed")),
)

NM_UTILS_LOOKUP_STR_DEFINE (nm_active_connection_state_reason_to_string, NMActiveConnectionStateReason,
Expand Down
25 changes: 25 additions & 0 deletions clients/common/nm-meta-setting-desc.c
Original file line number Diff line number Diff line change
Expand Up @@ -5849,6 +5849,19 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
NULL
};

#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_CONTRAIL_VROUTER
static const NMMetaPropertyInfo *const property_infos_CONTRAIL_VROUTER[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONTRAIL_VROUTER_PHYSDEV,
.is_cli_option = TRUE,
.property_alias = "physdev",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = N_("Physical device name"),
.property_type = &_pt_gobject_string,
),
NULL
};

#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_DCB
static const NMMetaPropertyInfo *const property_infos_DCB[] = {
Expand Down Expand Up @@ -7979,6 +7992,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
#define SETTING_PRETTY_NAME_BRIDGE_PORT N_("Bridge port")
#define SETTING_PRETTY_NAME_CDMA N_("CDMA mobile broadband connection")
#define SETTING_PRETTY_NAME_CONNECTION N_("General settings")
#define SETTING_PRETTY_NAME_CONTRAIL_VROUTER N_("Contrail vrouter settings")
#define SETTING_PRETTY_NAME_DCB N_("DCB settings")
#define SETTING_PRETTY_NAME_DUMMY N_("Dummy settings")
#define SETTING_PRETTY_NAME_ETHTOOL N_("Ethtool settings")
Expand Down Expand Up @@ -8102,6 +8116,17 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
NM_META_SETTING_VALID_PART_ITEM (ETHTOOL, FALSE),
),
),
SETTING_INFO (CONTRAIL_VROUTER,
.alias = "contrail-vrouter",
.valid_parts = NM_META_SETTING_VALID_PARTS (
NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
NM_META_SETTING_VALID_PART_ITEM (CONTRAIL_VROUTER, TRUE),
NM_META_SETTING_VALID_PART_ITEM (IP4_CONFIG, TRUE),
NM_META_SETTING_VALID_PART_ITEM (IP6_CONFIG, TRUE),
NM_META_SETTING_VALID_PART_ITEM (WIRED, TRUE),
NM_META_SETTING_VALID_PART_ITEM (ETHTOOL, TRUE),
),
),
SETTING_INFO_EMPTY (GENERIC,
.valid_parts = NM_META_SETTING_VALID_PARTS (
NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
Expand Down
1 change: 1 addition & 0 deletions clients/common/settings-docs.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -362,3 +362,4 @@
#define DESCRIBE_DOC_NM_SETTING_WPAN_MAC_ADDRESS N_("If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.")
#define DESCRIBE_DOC_NM_SETTING_WPAN_PAN_ID N_("IEEE 802.15.4 Personal Area Network (PAN) identifier.")
#define DESCRIBE_DOC_NM_SETTING_WPAN_SHORT_ADDRESS N_("Short IEEE 802.15.4 address to be used within a restricted environment.")
#define DESCRIBE_DOC_NM_SETTING_CONTRAIL_VROUTER_PHYSDEV N_("Physical device name.")
10 changes: 10 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,13 @@ if test "${enable_ovs}" != "no"; then
fi
AM_CONDITIONAL(WITH_OPENVSWITCH, test "${enable_ovs}" = "yes")

# Contrail vrouter integration
AC_ARG_ENABLE(contrail, AS_HELP_STRING([--enable-contrail], [enable Contrail vrouter support]))
if test "${enable_contrail}" != "no"; then
enable_contrail='yes'
fi
AM_CONDITIONAL(WITH_CONTRAIL, test "${enable_contrail}" = "yes")

# DHCP client support
AC_ARG_WITH([dhclient],
AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient support]))
Expand Down Expand Up @@ -1234,6 +1241,8 @@ if test "$build_docs" != "yes" -a \
\
-f "$srcdir"/man/nm-openvswitch.7 -a \
\
-f "$srcdir"/man/nm-contrail.7 -a \
\
-f "$srcdir"/man/nm-settings-ifcfg-rh.5 -a \
-f "$srcdir"/man/nm-settings-keyfile.5 -a \
-f "$srcdir"/man/nm-settings.5 -a \
Expand Down Expand Up @@ -1312,6 +1321,7 @@ echo " ofono: $with_ofono"
echo " concheck: $enable_concheck"
echo " libteamdctl: $enable_teamdctl"
echo " ovs: $enable_ovs"
echo " contrail: $enable_contrail"
echo " libnm-glib: $with_libnm_glib"
echo " nmcli: $build_nmcli"
echo " nmtui: $build_nmtui"
Expand Down
Loading

0 comments on commit a3e36a4

Please sign in to comment.