From 02b59d57e0c08231645120077f651151f5bb2bab Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 24 Nov 2013 23:37:56 +0100 Subject: networkd: add bridge support A bridge is specified in a .netdev file with a section [Bridge] and at least the entry Name=. A link may be joined to a bridge if the .network applied to it has a Bridge= entry giving the name of the bridge in its [Network] section. We eagerly create all bridges on startup, and links are added to bridges as soon as they both appear. --- src/network/test-network.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/network/test-network.c') diff --git a/src/network/test-network.c b/src/network/test-network.c index 822a334607..5e279974cb 100644 --- a/src/network/test-network.c +++ b/src/network/test-network.c @@ -31,15 +31,15 @@ static void test_link(struct udev_device *loopback) { assert(link); } -static void test_network_load(Manager *manager) { +static void test_load_config(Manager *manager) { /* TODO: should_reload, is false if the config dirs do not exist, so * so we can't do this test here, move it to a test for paths_check_timestamps * directly * * assert(network_should_reload(manager) == true); */ - assert(network_load(manager) >= 0); - assert(network_should_reload(manager) == false); + assert(manager_load_config(manager) >= 0); + assert(manager_should_reload(manager) == false); } static void test_network_get(Manager *manager, struct udev_device *loopback) { @@ -58,7 +58,7 @@ int main(void) { assert(manager_new(&manager) >= 0); - test_network_load(manager); + test_load_config(manager); udev = udev_new(); assert(udev); -- cgit v1.2.3-54-g00ecf