Support hwaddr config option to set bridge MAC

Author: WillFantom

ovs/vswitch.go

@@ -17,6 +17,7 @@ package ovs
 import (
 	"encoding/json"
 	"fmt"
+	"net"
 	"strings"
 )
 
@@ -202,6 +203,9 @@ func (v *VSwitchSetService) Bridge(bridge string, options BridgeOptions) error {
 type BridgeOptions struct {
 	// Protocols specifies the OpenFlow protocols the bridge should use.
 	Protocols []string
+
+	//HWAddr specifies the MAC address to be assigned to the bridge.
+	HWAddr string
 }
 
 // slice creates a string slice containing any non-zero option values from the
@@ -213,6 +217,10 @@ func (o BridgeOptions) slice() []string {
 		s = append(s, fmt.Sprintf("protocols=%s", strings.Join(o.Protocols, ",")))
 	}
 
+	if hw, err := net.ParseMAC(o.HWAddr); err == nil {
+		s = append(s, fmt.Sprintf("other-config:hwaddr=%s", hw.String()))
+	}
+
 	return s
 }
 

ovs/vswitch_test.go

@@ -461,7 +461,7 @@ func TestClientVSwitchGetBridgeProtocolsOK(t *testing.T) {
 	}
 }
 
-func TestClientVSwitchSetBridgeProtocolsOK(t *testing.T) {
+func TestClientVSwitchSetBridgeOptionsOK(t *testing.T) {
 	const bridge = "br0"
 	protocols := []string{
 		ProtocolOpenFlow10,
@@ -471,6 +471,7 @@ func TestClientVSwitchSetBridgeProtocolsOK(t *testing.T) {
 		ProtocolOpenFlow14,
 		ProtocolOpenFlow15,
 	}
+	hwaddr := "55:84:a3:2f:d3:20"
 
 	c := testClient([]OptionFunc{Timeout(1)}, func(cmd string, args ...string) ([]byte, error) {
 		if want, got := "ovs-vsctl", cmd; want != got {
@@ -484,6 +485,7 @@ func TestClientVSwitchSetBridgeProtocolsOK(t *testing.T) {
 			"bridge",
 			bridge,
 			fmt.Sprintf("protocols=%s", strings.Join(protocols, ",")),
+			fmt.Sprintf("other-config:hwaddr=%s", hwaddr),
 		}
 		if want, got := wantArgs, args; !reflect.DeepEqual(want, got) {
 			t.Fatalf("incorrect arguments\n- want: %v\n-  got: %v",
@@ -495,6 +497,7 @@ func TestClientVSwitchSetBridgeProtocolsOK(t *testing.T) {
 
 	err := c.VSwitch.Set.Bridge(bridge, BridgeOptions{
 		Protocols: protocols,
+		HWAddr:    hwaddr,
 	})
 	if err != nil {
 		t.Fatalf("unexpected error for Client.VSwitch.Set.Bridge: %v", err)