Create and use bridge #2078

ricab · 2021-04-29T12:10:38Z

Creates bridges if needed, uses existing otherwise.

codecov · 2021-04-29T15:36:24Z

Codecov Report

Merging #2078 (a21957d) into main (68cfac3) will increase coverage by 1.43%.
The diff coverage is 72.72%.

@@            Coverage Diff             @@
##             main    #2078      +/-   ##
==========================================
+ Coverage   80.09%   81.52%   +1.43%     
==========================================
  Files         179      184       +5     
  Lines        9148     9392     +244     
==========================================
+ Hits         7327     7657     +330     
+ Misses       1821     1735      -86

Impacted Files	Coverage Δ
include/multipass/network_interface_info.h	`0.00% <0.00%> (ø)`
include/multipass/virtual_machine_factory.h	`100.00% <ø> (ø)`
src/daemon/daemon.cpp	`54.17% <ø> (+5.32%)`	⬆️
...latform/backends/lxd/lxd_virtual_machine_factory.h	`100.00% <ø> (ø)`
...tform/backends/lxd/lxd_virtual_machine_factory.cpp	`87.83% <18.18%> (-12.17%)`	⬇️
...orm/backends/shared/base_virtual_machine_factory.h	`100.00% <100.00%> (ø)`
...c/platform/backends/shared/linux/backend_utils.cpp	`88.81% <100.00%> (+0.14%)`	⬆️
src/platform/platform_linux.cpp	`89.07% <100.00%> (+1.69%)`	⬆️
include/multipass/platform.h	`100.00% <0.00%> (ø)`
src/client/cli/cmd/animated_spinner.cpp	`100.00% <0.00%> (ø)`
... and 20 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 68cfac3...a21957d. Read the comment docs.

Relying on a shallow bridge setup for now.

To avoid impression that bridging with wifi is supported.

ricab · 2021-05-04T15:23:04Z

Done, apart from tests.

src/platform/backends/shared/base_virtual_machine_factory.h

src/platform/platform_linux.cpp

Exclude unknown networks entirely, rather than returning empty types and descriptions. Adapt tests accordingly.

src/platform/platform_linux.cpp

Since we're filtering things.

Saviq · 2021-05-06T10:30:08Z

w00t.

bors merge

2078: Create and use bridge r=Saviq a=ricab Creates bridges if needed, uses existing otherwise. Co-authored-by: Ricardo Abreu <ricab@ricabhome.org>

ricab · 2021-05-06T10:34:49Z

bors cancel

bors · 2021-05-06T10:34:50Z

Canceled.

Add comment explaining the reason for the empty implementation of `BaseVirtualMachineFactory::prepare_networking`

ricab · 2021-05-06T10:40:14Z

Let's see if this works after cancel.

bors retry

ricab · 2021-05-06T10:41:45Z

Doesn't look like it.

bors r=Saviq

2078: Create and use bridge r=Saviq a=ricab Creates bridges if needed, uses existing otherwise. Co-authored-by: Ricardo Abreu <ricab@ricabhome.org>

ricab · 2021-05-06T10:50:26Z

bors cancel

bors · 2021-05-06T10:50:27Z

Canceled.

ricab · 2021-05-06T12:35:42Z

alright, lets go again

bors r=Saviq

bors · 2021-05-06T14:07:15Z

Build succeeded:

[backend] Add an empty prepare_networking step

6d86dc4

ricab force-pushed the create-use-bridge branch from 5ade844 to 6699815 Compare April 29, 2021 15:23

ricab added 9 commits April 30, 2021 19:55

[daemon] Call new networking preparation

a8055ed

[lxd] Add abstract network preparing logic

217e659

Relying on a shallow bridge setup for now.

[lxd] Use bridge with target net if there is one

c00ba93

[linux] Return name of newly created bridge

6e00ee7

[test] Check returned name of created bridges

a7547ec

[test] Replace "wlan" in fake interface name

999aae2

To avoid impression that bridging with wifi is supported.

[lxd] Create bridges with ethernet devices

409ab9f

[linux] Record bridge members

722d212

[lxd] Move link finding to net info struct

cfaac36

ricab force-pushed the create-use-bridge branch from 6699815 to cfaac36 Compare April 30, 2021 19:09

Saviq requested changes May 5, 2021

View reviewed changes

src/platform/backends/shared/base_virtual_machine_factory.h Outdated Show resolved Hide resolved

src/platform/platform_linux.cpp Show resolved Hide resolved

ricab added 9 commits May 5, 2021 11:30

[backend] Comment out unused parameter

50d543a

[linux] Stop returning empty network structs

2306e37

Exclude unknown networks entirely, rather than returning empty types and descriptions. Adapt tests accordingly.

[linux] Filter unrecognized nets from bridge links

294b76c

[linux] Describe bridges after filtering links

233189f

[test] Account for filtering in bridge member test

425a394

[test] Improve var naming in test

2492aea

[test] Fix buggy param in test instantiation

77658bc

[test] Cover link filtering in bridge member tests

cece802

[linux] Outline lambda, for readability

d430924

Saviq reviewed May 6, 2021

View reviewed changes

src/platform/platform_linux.cpp Outdated Show resolved Hide resolved

ricab added 2 commits May 6, 2021 10:55

[linux] Produce bridge descriptions in a single go

8446c21

[linux] Stop describing bridges as empty

6b5f691

Since we're filtering things.

bors bot added a commit that referenced this pull request May 6, 2021

Merge #2078

a643991

2078: Create and use bridge r=Saviq a=ricab Creates bridges if needed, uses existing otherwise. Co-authored-by: Ricardo Abreu <ricab@ricabhome.org>

[backends] Explain empty base factory impl

a21957d

Add comment explaining the reason for the empty implementation of `BaseVirtualMachineFactory::prepare_networking`

bors bot added a commit that referenced this pull request May 6, 2021

Merge #2078

278b791

2078: Create and use bridge r=Saviq a=ricab Creates bridges if needed, uses existing otherwise. Co-authored-by: Ricardo Abreu <ricab@ricabhome.org>

bors bot merged commit ec69b13 into main May 6, 2021

bors bot deleted the create-use-bridge branch May 6, 2021 14:07

Saviq added this to the v1.7.0 milestone Jun 23, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create and use bridge #2078

Create and use bridge #2078

ricab commented Apr 29, 2021

codecov bot commented Apr 29, 2021 •

edited

Loading

ricab commented May 4, 2021

Saviq commented May 6, 2021

ricab commented May 6, 2021

bors bot commented May 6, 2021

ricab commented May 6, 2021

ricab commented May 6, 2021

ricab commented May 6, 2021

bors bot commented May 6, 2021

ricab commented May 6, 2021

bors bot commented May 6, 2021

Create and use bridge #2078

Create and use bridge #2078

Conversation

ricab commented Apr 29, 2021

codecov bot commented Apr 29, 2021 • edited Loading

Codecov Report

ricab commented May 4, 2021

Saviq commented May 6, 2021

ricab commented May 6, 2021

bors bot commented May 6, 2021

ricab commented May 6, 2021

ricab commented May 6, 2021

ricab commented May 6, 2021

bors bot commented May 6, 2021

ricab commented May 6, 2021

bors bot commented May 6, 2021

codecov bot commented Apr 29, 2021 •

edited

Loading