Merge pull request #8 from milosgajdos83/macvtap

Author: milosgajdos

examples/tenus_macvlanns_linux.go

@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	macVlanHost, err := tenus.NewMacVlanLinkWithOptions("eth1", tenus.MacVlanOptions{Mode: "bridge", MacVlanDev: "macvlanHostIfc"})
+	macVlanHost, err := tenus.NewMacVlanLinkWithOptions("eth1", tenus.MacVlanOptions{Mode: "bridge", Dev: "macvlanHostIfc"})
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -27,7 +27,7 @@ func main() {
 		fmt.Println(err)
 	}
 
-	macVlanDocker, err := tenus.NewMacVlanLinkWithOptions("eth1", tenus.MacVlanOptions{Mode: "bridge", MacVlanDev: "macvlanDckrIfc"})
+	macVlanDocker, err := tenus.NewMacVlanLinkWithOptions("eth1", tenus.MacVlanOptions{Mode: "bridge", Dev: "macvlanDckrIfc"})
 	if err != nil {
 		log.Fatal(err)
 	}

examples/tenus_macvtapns_linux.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"net"
+
+	"github.com/milosgajdos83/tenus"
+)
+
+func main() {
+	macVlanHost, err := tenus.NewMacVlanLinkWithOptions("eth1", tenus.MacVlanOptions{Mode: "bridge", Dev: "macvlnHost"})
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	macVlanHostIp, macVlanHostIpNet, err := net.ParseCIDR("10.0.41.2/16")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if err := macVlanHost.SetLinkIp(macVlanHostIp, macVlanHostIpNet); err != nil {
+		fmt.Println(err)
+	}
+
+	if err = macVlanHost.SetLinkUp(); err != nil {
+		fmt.Println(err)
+	}
+
+	macVtapDocker, err := tenus.NewMacVtapLinkWithOptions("eth1", tenus.MacVlanOptions{Mode: "bridge", Dev: "mvtDckrIfc"})
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	pid, err := tenus.DockerPidByName("mvtapdckr", "/var/run/docker.sock")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if err := macVtapDocker.SetLinkNetNsPid(pid); err != nil {
+		log.Fatal(err)
+	}
+
+	macVtapDckrIp, macVtapDckrIpNet, err := net.ParseCIDR("10.0.41.3/16")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if err := macVtapDocker.SetLinkNetInNs(pid, macVtapDckrIp, macVtapDckrIpNet, nil); err != nil {
+		log.Fatal(err)
+	}
+}

macvlan_linux.go

@@ -7,6 +7,11 @@ import (
 	"github.com/docker/libcontainer/netlink"
 )
 
+// Default MacVlan mode
+const (
+	default_mode = "bridge"
+)
+
 // Supported macvlan modes by tenus package
 var MacVlanModes = map[string]bool{
 	"private": true,
@@ -17,7 +22,7 @@ var MacVlanModes = map[string]bool{
 // MacVlanOptions allows you to specify some options for macvlan link.
 type MacVlanOptions struct {
 	// macvlan device name
-	MacVlanDev string
+	Dev string
 	// macvlan mode
 	Mode string
 	// MAC address
@@ -47,13 +52,12 @@ type MacVlanLink struct {
 // NewMacVlanLink creates macvlan network link
 //
 // It is equivalent of running:
-//		ip link add name mc${RANDOM STRING} link ${master interface} type macvlan mode ${mode}
+//		ip link add name mc${RANDOM STRING} link ${master interface} type macvlan
 // NewMacVlanLink returns MacVlaner which is initialized to a pointer of type MacVlanLink if the
 // macvlan link was created successfully on the Linux host. Newly created link is assigned
-// a random name starting with "mc". It sets the macvlan mode the parameter passed as argument.
-// If incorrect network mode is passed as a paramter, it sets the macvlan mode to "bridge".
+// a random name starting with "mc". It sets the macvlan mode to "bridge" mode which is a default.
 // It returns error if the link could not be created.
-func NewMacVlanLink(masterDev string, mode string) (MacVlaner, error) {
+func NewMacVlanLink(masterDev string) (MacVlaner, error) {
 	macVlanDev := makeNetInterfaceName("mc")
 
 	if ok, err := NetInterfaceNameValid(masterDev); !ok {
@@ -64,15 +68,7 @@ func NewMacVlanLink(masterDev string, mode string) (MacVlaner, error) {
 		return nil, fmt.Errorf("Master MAC VLAN device %s does not exist on the host", masterDev)
 	}
 
-	if mode != "" {
-		if _, ok := MacVlanModes[mode]; !ok {
-			return nil, fmt.Errorf("Unsupported MacVlan mode specified: %s", mode)
-		}
-	} else {
-		mode = "bridge"
-	}
-
-	if err := netlink.NetworkLinkAddMacVlan(masterDev, macVlanDev, mode); err != nil {
+	if err := netlink.NetworkLinkAddMacVlan(masterDev, macVlanDev, default_mode); err != nil {
 		return nil, err
 	}
 
@@ -91,7 +87,7 @@ func NewMacVlanLink(masterDev string, mode string) (MacVlaner, error) {
 			ifc: macVlanIfc,
 		},
 		masterIfc: masterIfc,
-		mode:      mode,
+		mode:      default_mode,
 	}, nil
 }
 
@@ -101,12 +97,9 @@ func NewMacVlanLink(masterDev string, mode string) (MacVlaner, error) {
 // It is equivalent of running:
 // 		ip link add name ${macvlan name} link ${master interface} address ${macaddress} type macvlan mode ${mode}
 // NewMacVlanLinkWithOptions returns MacVlaner which is initialized to a pointer of type MacVlanLink if the
-// macvlan link was created successfully on the Linux host. It returns error if the macvlan link could not be created.
+// macvlan link was created successfully on the Linux host. If particular option is empty, it sets default value if possible.
+// It returns error if the macvlan link could not be created or if incorrect options have been passed.
 func NewMacVlanLinkWithOptions(masterDev string, opts MacVlanOptions) (MacVlaner, error) {
-	macVlanDev := opts.MacVlanDev
-	mode := opts.Mode
-	macaddr := opts.MacAddr
-
 	if ok, err := NetInterfaceNameValid(masterDev); !ok {
 		return nil, err
 	}
@@ -115,42 +108,23 @@ func NewMacVlanLinkWithOptions(masterDev string, opts MacVlanOptions) (MacVlaner
 		return nil, fmt.Errorf("Master MAC VLAN device %s does not exist on the host", masterDev)
 	}
 
-	if macVlanDev != "" {
-		if ok, err := NetInterfaceNameValid(macVlanDev); !ok {
-			return nil, err
-		}
-
-		if _, err := net.InterfaceByName(macVlanDev); err == nil {
-			return nil, fmt.Errorf("MAC VLAN device %s already assigned on the host", macVlanDev)
-		}
-	} else {
-		macVlanDev = makeNetInterfaceName("mc")
-	}
-
-	if mode != "" {
-		if _, ok := MacVlanModes[mode]; !ok {
-			return nil, fmt.Errorf("Unsupported MacVlan mode specified: %s", mode)
-		}
-	} else {
-		mode = "bridge"
+	if err := validateMacVlanOptions(&opts); err != nil {
+		return nil, err
 	}
 
-	if err := netlink.NetworkLinkAddMacVlan(masterDev, macVlanDev, opts.Mode); err != nil {
+	if err := netlink.NetworkLinkAddMacVlan(masterDev, opts.Dev, opts.Mode); err != nil {
 		return nil, err
 	}
 
-	macVlanIfc, err := net.InterfaceByName(macVlanDev)
+	macVlanIfc, err := net.InterfaceByName(opts.Dev)
 	if err != nil {
 		return nil, fmt.Errorf("Could not find the new interface: %s", err)
 	}
 
-	if macaddr != "" {
-		if _, err = net.ParseMAC(macaddr); err == nil {
-			if err := netlink.NetworkSetMacAddress(macVlanIfc, macaddr); err != nil {
-				if errDel := DeleteLink(macVlanIfc.Name); err != nil {
-					return nil, fmt.Errorf("Incorrect options specified. Attempt to delete the link failed: %s",
-						errDel)
-				}
+	if opts.MacAddr != "" {
+		if err := netlink.NetworkSetMacAddress(macVlanIfc, opts.MacAddr); err != nil {
+			if errDel := DeleteLink(macVlanIfc.Name); errDel != nil {
+				return nil, fmt.Errorf("Incorrect options specified. Attempt to delete the link failed: %s", errDel)
 			}
 		}
 	}
@@ -165,7 +139,7 @@ func NewMacVlanLinkWithOptions(masterDev string, opts MacVlanOptions) (MacVlaner
 			ifc: macVlanIfc,
 		},
 		masterIfc: masterIfc,
-		mode:      mode,
+		mode:      opts.Mode,
 	}, nil
 }
 
@@ -183,3 +157,33 @@ func (macvln *MacVlanLink) MasterNetInterface() *net.Interface {
 func (macvln *MacVlanLink) Mode() string {
 	return macvln.mode
 }
+
+func validateMacVlanOptions(opts *MacVlanOptions) error {
+	if opts.Dev != "" {
+		if ok, err := NetInterfaceNameValid(opts.Dev); !ok {
+			return err
+		}
+
+		if _, err := net.InterfaceByName(opts.Dev); err == nil {
+			return fmt.Errorf("MAC VLAN device %s already assigned on the host", opts.Dev)
+		}
+	} else {
+		opts.Dev = makeNetInterfaceName("mc")
+	}
+
+	if opts.Mode != "" {
+		if _, ok := MacVlanModes[opts.Mode]; !ok {
+			return fmt.Errorf("Unsupported MacVlan mode specified: %s", opts.Mode)
+		}
+	} else {
+		opts.Mode = default_mode
+	}
+
+	if opts.MacAddr != "" {
+		if _, err := net.ParseMAC(opts.MacAddr); err == nil {
+			return fmt.Errorf("Incorrect MAC ADDRESS specified: %s", opts.MacAddr)
+		}
+	}
+
+	return nil
+}

macvlan_linux_test.go

@@ -7,13 +7,11 @@ import (
 )
 
 type macvlnTest struct {
-	masterDev   string
-	macvlanMode string
+	masterDev string
 }
 
 var macvlnTests = []macvlnTest{
-	{"master01", "bridge"},
-	{"master02", "private"},
+	{"master01"},
 }
 
 func Test_NewMacVlanLink(t *testing.T) {
@@ -30,9 +28,9 @@ func Test_NewMacVlanLink(t *testing.T) {
 			time.Sleep(10 * time.Millisecond)
 		}
 
-		mvln, err := NewMacVlanLink(tt.masterDev, tt.macvlanMode)
+		mvln, err := NewMacVlanLink(tt.masterDev)
 		if err != nil {
-			t.Fatalf("NewMacVlanLink(%s, %s) failed to run: %s", tt.masterDev, tt.macvlanMode, err)
+			t.Fatalf("NewMacVlanLink(%s) failed to run: %s", tt.masterDev, err)
 		}
 
 		mvlnName := mvln.NetInterface().Name
@@ -49,14 +47,14 @@ func Test_NewMacVlanLink(t *testing.T) {
 
 		if testRes.linkType != "macvlan" {
 			tl.teardown()
-			t.Fatalf("NewMacVlanLink(%s, %s) failed: expected macvlan, returned %s",
-				tt.masterDev, tt.macvlanMode, testRes.linkType)
+			t.Fatalf("NewMacVlanLink(%s) failed: expected macvlan, returned %s",
+				tt.masterDev, testRes.linkType)
 		}
 
-		if testRes.linkData != tt.macvlanMode {
+		if testRes.linkData != "bridge" {
 			tl.teardown()
-			t.Fatalf("NewMacVlanLink(%s, %s) failed: expected %s, returned %s",
-				tt.masterDev, tt.macvlanMode, tt.macvlanMode, testRes.linkData)
+			t.Fatalf("NewMacVlanLink(%s) failed: expected bridge, returned %s",
+				tt.masterDev, testRes.linkData)
 		}
 
 		if err := tl.teardown(); err != nil {