feat: Add SNAT bridge to Native, decouple SNAT bridge #1506

QxBytes · 2022-08-03T16:48:46Z

Reason for Change:
Adds SNAT bridge functionality to the native datapath and decouples the OVS-specific SNAT bridge code from the more general SNAT bridge code.

Issue Fixed:
N/A

Requirements:

uses conventional commit messages
includes documentation
adds unit tests

Notes:

The network package was gofumpt so there may be style fixes in the following files not directly related to this feature (See commit "Go fumpt entire network package" for those files).
Some code was moved around/renamed/re-used. In particular, snat_linux.go (and most other files) consists of already-existing code that was re-used.
The idea is that OVS and Native have their own versions of SNAT/snat route, which call a common set of behaviors in endpoint_snatroute_linux.go, which uses the client to call something in snat_linux.go

nw.extIf.Name > eth0 (eth0) eth0.vlanid > eth0.X (eth0.1) %s%s hostIfName > vnet (A1veth0) %s%s-2 contIfName > container (B1veth0)

Moved netnsinterface to consumer package (network). Removed "Netns" from "NewNetns" and "NewMockNetns" as it is unambiguous. Changed uintptr to int and casted the int to uintptr when needed later.

Directly instantiating struct because nothing special happens in NewNativeEndpointClient

Forgot to remove uintptr from mocknetns

Tests ok, Native ok

Tests ok, ping ok, wget ok

OVS & Native: - Ping between two containers same VM, no packets on bridge - Ping between two containers diff VM, no packets on bridge - Ping other container not in vnet, no packets on bridge - Ping snat to container, packets on bridge - Ping container to snat, packets on bridge - Tcpdump confirmed on azSnatBr - Deletion of containers deletes appropriate interfaces

rbtr · 2022-08-03T19:31:25Z

could you pull the gofumpt of the whole package out into a separate PR? happy to merge that one first

eth0.2 makes disable RA look for a folder eth0 and then another sub folder "2". ("eth0/2") However, it should look for a folder named "eth0.2" literally. To solve this, we change the naming scheme to use an underscore instead. (Tests ok)

network/ovs_endpoint_snatroute_linux.go

tamilmani1989

i see you updates ovs snat as well.. did you test snat bridge scenarios work in ovs case?

Confirmed basic functionality on VM with correct mode

cni/azure-windows-multitenancy-transparent-vlan.conflist

network/endpoint_snatroute_linux.go

network/network.go

network/ovs_endpoint_snatroute_linux.go

network/transparent_vlan_endpointclient_linux.go

QxBytes added 30 commits July 5, 2022 17:01

Native Endpoint Client Add Endpoints

8f64c08

AddEndpointRules, ConfigureContainerInterfacesAndRoutes

2b3cb7a

Changed interface names, log statements

a85c365

nw.extIf.Name > eth0 (eth0) eth0.vlanid > eth0.X (eth0.1) %s%s hostIfName > vnet (A1veth0) %s%s-2 contIfName > container (B1veth0)

Renaming, using lib to set ns

f08f0b7

Namespace "path" is /var/run/netns/<NS>

8531563

Loopback set up, Remove auto kernel subnet route

3752a41

Cannot set link to up if it's in another NS

3f6507d

Multiple containers on same VNET NS

d38d06b

Delete Endpoint routes on Delete

1f8d37f

Minimizing netns usage

7f8b802

Moving NS Exec Code

b622049

Further minimized netns.Set usage

c1e60a1

Moved helper methods down, drafted tests

ddd5213

Removed DevName from Route Info, more tests

f4b5fd7

Test existing vnet ns, delete endpoint

4c280c2

NetNS interface for testing

7ac1a95

Separated tests by namespace

32b4d98

Endpoints delete if they cannot be moved into NS

9a488f9

Namespace netns tests

7c8838b

Added Native Client to deleteEndpointImpl

4e4def5

Deletion of Endpoints Impl and Tests

7e593d9

Cleaned code (Tests ok)

be0191a

Moved mock/netns to package (Tests ok)

1f40dd8

Fixing Netns (wip)

0552493

Moved netnsinterface to consumer package (network). Removed "Netns" from "NewNetns" and "NewMockNetns" as it is unambiguous. Changed uintptr to int and casted the int to uintptr when needed later.

Using errors.Wrap for error context (wip)

2c2aac5

Removed sentence case (wip)

248a90c

Removing variable predeclaration

3e8e719

Removed NewNativeEndpointClient

a3b6277

Directly instantiating struct because nothing special happens in NewNativeEndpointClient

Removed generics from ExecuteInNS

536a022

Removed uintptr from mocknetns, tests compile

9193600

Forgot to remove uintptr from mocknetns

QxBytes added 14 commits July 26, 2022 09:45

Moved netns interface to caller, generalized tests

ba901c5

Tests ok, Native ok

Typos

33f4941

Reordered if statement, unwrapped arp

228ba63

Tests ok, ping ok, wget ok

Merge branch 't-allew/develop' into t-allew/snat

ee1eddc

Linted, wrapping errors

5c2a77d

Go fumpt entire network package

c3e781f

Renamed veth, fixed logs

18f9652

Made deleteEndpoints logic clearer, renamed error

7e44c85

Renamed eth0 to primaryHostIfName, vlanEth to vlanIf

1807094

Merge branch 't-allew/develop' into t-allew/snat

9347d07

Deleted debug log

a99cb45

Merge branch 'master' into t-allew/snat

4c30a22

Corrected merge (hardware addr) (Tests ok)

124c409

QxBytes added 2 commits August 3, 2022 15:13

Merge branch 'master' into t-allew/snat

eef4fd6

tamilmani1989 requested changes Aug 4, 2022

View reviewed changes

network/ovs_endpoint_snatroute_linux.go Show resolved Hide resolved

network/ovs_endpoint_snatroute_linux.go Show resolved Hide resolved

tamilmani1989 requested changes Aug 6, 2022

View reviewed changes

QxBytes added 3 commits August 8, 2022 15:22

Renamed Native to TransparentVlan

51879e2

Confirmed basic functionality on VM with correct mode

Make file updated

5b187bc

Create azure-windows-multitenancy-transparent-vlan.conflist

c259490

tamilmani1989 requested changes Aug 9, 2022

View reviewed changes

QxBytes added 5 commits August 9, 2022 15:46

Unified snat err format

21c26a4

Rename to transparent-vlan

1f18c1f

Route table support added to local netlink

dd57afe

Moved SNAT to end of function

b2674dc

Defer deleting vlan interface on failure

6f1c50a

tamilmani1989 approved these changes Aug 10, 2022

View reviewed changes

tamilmani1989 merged commit a19e5fb into Azure:master Aug 10, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Add SNAT bridge to Native, decouple SNAT bridge #1506

feat: Add SNAT bridge to Native, decouple SNAT bridge #1506

Uh oh!

QxBytes commented Aug 3, 2022

Uh oh!

rbtr commented Aug 3, 2022

Uh oh!

Uh oh!

Uh oh!

tamilmani1989 left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

feat: Add SNAT bridge to Native, decouple SNAT bridge #1506

feat: Add SNAT bridge to Native, decouple SNAT bridge #1506

Uh oh!

Conversation

QxBytes commented Aug 3, 2022

Uh oh!

rbtr commented Aug 3, 2022

Uh oh!

Uh oh!

Uh oh!

tamilmani1989 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tamilmani1989 left a comment •

edited

Loading