feat: Add native linux endpoint client to prep removing OVS

go.mod

@@ -104,7 +104,8 @@ require (
 	github.com/subosito/gotenv v1.3.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.1 // indirect
-	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
+	github.com/vishvananda/netlink v1.2.1-beta.2
+	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
 	go.opencensus.io v0.23.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect

go.sum

@@ -830,13 +830,14 @@ github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
-github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 h1:cPXZWzzG0NllBLdjWoD1nDfaqu98YMv+OneaKc8sPOA=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
+github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs=
+github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
 github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA=
-github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
+github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=

netns/netns.go

@@ -0,0 +1,38 @@
+//go:build linux
+// +build linux
+
+package netns
+
+import (
+	"github.com/pkg/errors"
+	"github.com/vishvananda/netns"
+)
+
+type Netns struct{}
+
+func New() *Netns {
+	return &Netns{}
+}
+
+func (f *Netns) Get() (int, error) {
+	nsHandle, err := netns.Get()
+	return int(nsHandle), errors.Wrap(err, "netns impl")
+}
+
+func (f *Netns) GetFromName(name string) (int, error) {
+	nsHandle, err := netns.GetFromName(name)
+	return int(nsHandle), errors.Wrap(err, "netns impl")
+}
+
+func (f *Netns) Set(fileDescriptor int) error {
+	return errors.Wrap(netns.Set(netns.NsHandle(fileDescriptor)), "netns impl")
+}
+
+func (f *Netns) NewNamed(name string) (int, error) {
+	nsHandle, err := netns.NewNamed(name)
+	return int(nsHandle), errors.Wrap(err, "netns impl")
+}
+
+func (f *Netns) DeleteNamed(name string) error {
+	return errors.Wrap(netns.DeleteNamed(name), "netns impl")
+}

network/endpoint_linux.go

@@ -13,6 +13,7 @@ import (
 	"github.com/Azure/azure-container-networking/log"
 	"github.com/Azure/azure-container-networking/netio"
 	"github.com/Azure/azure-container-networking/netlink"
+	"github.com/Azure/azure-container-networking/netns"
 	"github.com/Azure/azure-container-networking/network/networkutils"
 	"github.com/Azure/azure-container-networking/ovsctl"
 	"github.com/Azure/azure-container-networking/platform"
@@ -89,21 +90,42 @@ func (nw *network) newEndpointImpl(_ apipaClient, nl netlink.NetlinkInterface, p
 	}
 
 	if vlanid != 0 {
-		log.Printf("OVS client")
-		if _, ok := epInfo.Data[SnatBridgeIPKey]; ok {
-			nw.SnatBridgeIP = epInfo.Data[SnatBridgeIPKey].(string)
-		}
+		if nw.Mode == opModeNative {
+			log.Printf("Native client")
+			vlanVethName := fmt.Sprintf("%s.%d", nw.extIf.Name, vlanid)
+			vnetNSName := fmt.Sprintf("az_ns_%d", vlanid)
+
+			epClient = &NativeEndpointClient{
+				primaryHostIfName: nw.extIf.Name,
+				vlanIfName:        vlanVethName,
+				vnetVethName:      hostIfName,
+				containerVethName: contIfName,
+				vnetNSName:        vnetNSName,
+				nw:                nw,
+				vlanID:            vlanid,
+				netnsClient:       netns.New(),
+				netlink:           nl,
+				netioshim:         &netio.NetIO{},
+				plClient:          plc,
+				netUtilsClient:    networkutils.NewNetworkUtils(nl, plc),
+			}
+		} else {
+			log.Printf("OVS client")
+			if _, ok := epInfo.Data[SnatBridgeIPKey]; ok {
+				nw.SnatBridgeIP = epInfo.Data[SnatBridgeIPKey].(string)
+			}
 
-		epClient = NewOVSEndpointClient(
-			nw,
-			epInfo,
-			hostIfName,
-			contIfName,
-			vlanid,
-			localIP,
-			nl,
-			ovsctl.NewOvsctl(),
-			plc)
+			epClient = NewOVSEndpointClient(
+				nw,
+				epInfo,
+				hostIfName,
+				contIfName,
+				vlanid,
+				localIP,
+				nl,
+				ovsctl.NewOvsctl(),
+				plc)
+		}
 	} else if nw.Mode != opModeTransparent {
 		log.Printf("Bridge client")
 		epClient = NewLinuxBridgeEndpointClient(nw.extIf, hostIfName, contIfName, nw.Mode, nl, plc)
@@ -239,7 +261,28 @@ func (nw *network) deleteEndpointImpl(nl netlink.NetlinkInterface, plc platform.
 	// entering the container netns and hence works both for CNI and CNM.
 	if ep.VlanID != 0 {
 		epInfo := ep.getInfo()
-		epClient = NewOVSEndpointClient(nw, epInfo, ep.HostIfName, "", ep.VlanID, ep.LocalIP, nl, ovsctl.NewOvsctl(), plc)
+		if nw.Mode == opModeNative {
+			log.Printf("Native client")
+			vlanVethName := fmt.Sprintf("%s.%d", nw.extIf.Name, ep.VlanID)
+			vnetNSName := fmt.Sprintf("az_ns_%d", ep.VlanID)
+
+			epClient = &NativeEndpointClient{
+				primaryHostIfName: nw.extIf.Name,
+				vlanIfName:        vlanVethName,
+				vnetVethName:      ep.HostIfName,
+				containerVethName: "",
+				vnetNSName:        vnetNSName,
+				nw:                nw,
+				vlanID:            ep.VlanID,
+				netnsClient:       netns.New(),
+				netlink:           nl,
+				netioshim:         &netio.NetIO{},
+				plClient:          plc,
+				netUtilsClient:    networkutils.NewNetworkUtils(nl, plc),
+			}
+		} else {
+			epClient = NewOVSEndpointClient(nw, epInfo, ep.HostIfName, "", ep.VlanID, ep.LocalIP, nl, ovsctl.NewOvsctl(), plc)
+		}
 	} else if nw.Mode != opModeTransparent {
 		epClient = NewLinuxBridgeEndpointClient(nw.extIf, ep.HostIfName, "", nw.Mode, nl, plc)
 	} else {

network/hnswrapper/hnsv1wrapper.go

@@ -1,5 +1,5 @@
 //go:build windows
-//+build windows
+// +build windows
 
 package hnswrapper
 

network/hnswrapper/hnsv1wrapperinterface.go

@@ -19,5 +19,5 @@ type HnsV1WrapperInterface interface {
 	GetHNSEndpointByID(endpointID string) (*hcsshim.HNSEndpoint, error)
 	HotAttachEndpoint(containerID string, endpointID string) error
 	IsAttached(hnsep *hcsshim.HNSEndpoint, containerID string) (bool, error)
-	GetHNSGlobals()  (*hcsshim.HNSGlobals, error)
+	GetHNSGlobals() (*hcsshim.HNSGlobals, error)
 }

network/hnswrapper/hnsv2wrapperfake.go

@@ -42,7 +42,7 @@ func NewHnsv2wrapperFake() *Hnsv2wrapperFake {
 	}
 }
 
-func delayHnsCall(delay time.Duration){
+func delayHnsCall(delay time.Duration) {
 	time.Sleep(delay)
 }