Support arbitrary bridge config options

Author: WillFantom

ovs/vswitch.go

@@ -211,6 +211,10 @@ type BridgeOptions struct {
 	// STP defines if the spanning tree protocol is to be enabled on the bridge. A
 	// nil value here will not change the STP config of the bridge.
 	STP *bool
+
+	// Other defines bridge config options not otherwise present in this package
+	// but available in ovs such as rstp options (e.g. `rstp_enable=false`).
+	Other []string
 }
 
 // slice creates a string slice containing any non-zero option values from the
@@ -230,7 +234,7 @@ func (o BridgeOptions) slice() []string {
 		s = append(s, fmt.Sprintf("stp_enable=%s", strconv.FormatBool(*o.STP)))
 	}
 
-	return s
+	return append(s, o.Other...)
 }
 
 // Interface sets configuration for an interface using the values from an

ovs/vswitch_test.go

@@ -474,6 +474,7 @@ func TestClientVSwitchSetBridgeOptionsOK(t *testing.T) {
 	}
 	hwaddr := "55:84:a3:2f:d3:20"
 	stp := true
+	other := []string{"rstp_enable=false"}
 
 	c := testClient([]OptionFunc{Timeout(1)}, func(cmd string, args ...string) ([]byte, error) {
 		if want, got := "ovs-vsctl", cmd; want != got {
@@ -490,6 +491,7 @@ func TestClientVSwitchSetBridgeOptionsOK(t *testing.T) {
 			fmt.Sprintf("other-config:hwaddr=%s", hwaddr),
 			fmt.Sprintf("stp_enable=%s", strconv.FormatBool(stp)),
 		}
+		wantArgs = append(wantArgs, other...)
 		if want, got := wantArgs, args; !reflect.DeepEqual(want, got) {
 			t.Fatalf("incorrect arguments\n- want: %v\n-  got: %v",
 				want, got)
@@ -502,6 +504,7 @@ func TestClientVSwitchSetBridgeOptionsOK(t *testing.T) {
 		Protocols: protocols,
 		HWAddr:    hwaddr,
 		STP:       &stp,
+		Other:     other,
 	})
 	if err != nil {
 		t.Fatalf("unexpected error for Client.VSwitch.Set.Bridge: %v", err)