Replacing hardcoded default MacVlan mode with a constant.

dockerstack · Dec 5, 2014 · 96327ec · 96327ec
1 parent 9359665
commit 96327ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/macvlan_linux.go b/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,
@@ -63,7 +68,7 @@ func NewMacVlanLink(masterDev string) (MacVlaner, error) {
 		return nil, fmt.Errorf("Master MAC VLAN device %s does not exist on the host", masterDev)
 	}
 
-	if err := netlink.NetworkLinkAddMacVlan(masterDev, macVlanDev, "bridge"); err != nil {
+	if err := netlink.NetworkLinkAddMacVlan(masterDev, macVlanDev, default_mode); err != nil {
 		return nil, err
 	}
 
@@ -82,7 +87,7 @@ func NewMacVlanLink(masterDev string) (MacVlaner, error) {
 			ifc: macVlanIfc,
 		},
 		masterIfc: masterIfc,
-		mode:      "bridge",
+		mode:      default_mode,
 	}, nil
 }
 
@@ -171,7 +176,7 @@ func validateMacVlanOptions(opts *MacVlanOptions) error {
 			return fmt.Errorf("Unsupported MacVlan mode specified: %s", opts.Mode)
 		}
 	} else {
-		opts.Mode = "bridge"
+		opts.Mode = default_mode
 	}
 
 	if opts.MacAddr != "" {

diff --git a/macvtap_linux.go b/macvtap_linux.go
@@ -36,7 +36,7 @@ func NewMacVtapLink(masterDev string) (MacVtaper, error) {
 		return nil, fmt.Errorf("Master MAC VTAP device %s does not exist on the host", masterDev)
 	}
 
-	if err := netlink.NetworkLinkAddMacVtap(masterDev, macVtapDev, "bridge"); err != nil {
+	if err := netlink.NetworkLinkAddMacVtap(masterDev, macVtapDev, default_mode); err != nil {
 		return nil, err
 	}
 
@@ -56,7 +56,7 @@ func NewMacVtapLink(masterDev string) (MacVtaper, error) {
 				ifc: macVtapIfc,
 			},
 			masterIfc: masterIfc,
-			mode:      "bridge",
+			mode:      default_mode,
 		},
 	}, nil
 }