workaround for not always getting LOCAL port status.

IQTLabs · Jul 15, 2022 · 97bb204 · 97bb204
1 parent f884501
commit 97bb204
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ovs/driver.go b/ovs/driver.go
@@ -606,7 +606,8 @@ func mustHandleCreateNetwork(d *Driver, opMsg DovesnapOp) {
 	mode := opMsg.Mode
 	if mode == "nat" || mode == "routed" {
 		netAcl := getStrForNetwork(ns.NATAcl, ns.NetworkName)
-		add_interfaces += d.faucetconfrpcer.vlanInterfaceYaml(ofPortLocal, "OVS Port default gateway", ns.BridgeVLAN, netAcl)
+		// TODO: consider the bridge port to be always up - determine why OVS doesn't always update us with port status.
+		add_interfaces += d.faucetconfrpcer.localVlanInterfaceYaml(ofPortLocal, "OVS Port default gateway", ns.BridgeVLAN, netAcl)
 		ns.DynamicNetworkStates.ExternalPorts[inspectNs.BridgeName] = getExternalPortState(inspectNs.BridgeName, ofPortLocal)
 	}
 	if usingMirrorBridge(d) {

diff --git a/ovs/ovs_faucetconfrpc.go b/ovs/ovs_faucetconfrpc.go
@@ -188,6 +188,10 @@ func (c *faucetconfrpcer) vlanInterfaceYaml(ofport OFPortType, description strin
 	return fmt.Sprintf("%d: {description: %s, native_vlan: %d, acls_in: [%s]},", ofport, description, vlan, acls_in)
 }
 
+func (c *faucetconfrpcer) localVlanInterfaceYaml(ofport OFPortType, description string, vlan uint, acls_in string) string {
+	return fmt.Sprintf("%d: {opstatus_reconf: False, description: %s, native_vlan: %d, acls_in: [%s]},", ofport, description, vlan, acls_in)
+}
+
 func (c *faucetconfrpcer) stackInterfaceYaml(ofport OFPortType, remoteDpName string, remoteOfport OFPortType) string {
 	return fmt.Sprintf("%d: {description: stack link to %s, stack: {dp: %s, port: %d}},", ofport, remoteDpName, remoteDpName, remoteOfport)
 }