Support bridge STP configuration option

Author: WillFantom

ovs/vswitch.go

@@ -18,6 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"strconv"
 	"strings"
 )
 
@@ -204,8 +205,12 @@ 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 specifies the MAC address to be assigned to the bridge.
 	HWAddr string
+
+	// 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
 }
 
 // slice creates a string slice containing any non-zero option values from the
@@ -221,6 +226,10 @@ func (o BridgeOptions) slice() []string {
 		s = append(s, fmt.Sprintf("other-config:hwaddr=%s", hw.String()))
 	}
 
+	if o.STP != nil {
+		s = append(s, fmt.Sprintf("stp_enable=%s", strconv.FormatBool(*o.STP)))
+	}
+
 	return s
 }
 

ovs/vswitch_test.go

@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
+	"strconv"
 	"strings"
 	"testing"
 )
@@ -472,6 +473,7 @@ func TestClientVSwitchSetBridgeOptionsOK(t *testing.T) {
 		ProtocolOpenFlow15,
 	}
 	hwaddr := "55:84:a3:2f:d3:20"
+	stp := true
 
 	c := testClient([]OptionFunc{Timeout(1)}, func(cmd string, args ...string) ([]byte, error) {
 		if want, got := "ovs-vsctl", cmd; want != got {
@@ -486,6 +488,7 @@ func TestClientVSwitchSetBridgeOptionsOK(t *testing.T) {
 			bridge,
 			fmt.Sprintf("protocols=%s", strings.Join(protocols, ",")),
 			fmt.Sprintf("other-config:hwaddr=%s", hwaddr),
+			fmt.Sprintf("stp_enable=%s", strconv.FormatBool(stp)),
 		}
 		if want, got := wantArgs, args; !reflect.DeepEqual(want, got) {
 			t.Fatalf("incorrect arguments\n- want: %v\n-  got: %v",
@@ -498,6 +501,7 @@ func TestClientVSwitchSetBridgeOptionsOK(t *testing.T) {
 	err := c.VSwitch.Set.Bridge(bridge, BridgeOptions{
 		Protocols: protocols,
 		HWAddr:    hwaddr,
+		STP:       &stp,
 	})
 	if err != nil {
 		t.Fatalf("unexpected error for Client.VSwitch.Set.Bridge: %v", err)