Merge pull request #321 from stgraber/ovn

stgraber · web-flow · commit 7527f273d927 · 2023-12-20T23:15:35.000-05:00
incusd/network/ovs: Fix empty OVNBridgeMappings
diff --git a/internal/server/network/ovs/ovs_actions.go b/internal/server/network/ovs/ovs_actions.go
@@ -214,6 +214,10 @@ func (o *VSwitch) OVNBridgeMappings(bridgeName string) ([]string, error) {
 	}
 
 	val := vSwitch.ExternalIDs["ovn-bridge-mappings"]
+	if val == "" {
+		return []string{}, nil
+	}
+
 	return strings.SplitN(val, ",", -1), nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,10 @@ func (o *VSwitch) OVNBridgeMappings(bridgeName string) ([]string, error) {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`val := vSwitch.ExternalIDs["ovn-bridge-mappings"]`
	`217`	`+ if val == "" {`
	`218`	`+ return []string{}, nil`
	`219`	`+ }`
	`220`	`+`
`217`	`221`	`return strings.SplitN(val, ",", -1), nil`
`218`	`222`	`}`
`219`	`223`