Merge pull request #580 from richardcruise87/fix_issues_from_router_reconciliation_timeout

Fix condition where Octavia Provder Router might be missing port info

Author: openshift-merge-bot[bot]

internal/octavia/lb_mgmt_network.go

@@ -1036,8 +1036,36 @@ func EnsureAmphoraManagementNetwork(
 			log.Error(err, "Unable to create router object")
 			return NetworkProvisioningSummary{}, err
 		}
+	}
+
+	// Add interface to router if not already added
+	if tenantRouterPort != nil {
+		// Check if interface is already added to router
+		listOpts := ports.ListOpts{
+			DeviceID: router.ID,
+		}
+		allPages, err := ports.List(client, listOpts).AllPages(ctx)
+		if err != nil {
+			log.Error(err, fmt.Sprintf("Unable to list ports for router %s", router.ID))
+			return NetworkProvisioningSummary{}, err
+		}
+
+		allPorts, err := ports.ExtractPorts(allPages)
+		if err != nil {
+			log.Error(err, "Unable to extract port information from list")
+			return NetworkProvisioningSummary{}, err
+		}
+
+		hasInterface := false
+		for _, port := range allPorts {
+			if port.ID == tenantRouterPort.ID {
+				hasInterface = true
+				break
+			}
+		}
 
-		if tenantRouterPort != nil {
+		if !hasInterface {
+			log.Info("Adding interface info to octavia provider router")
 			interfaceOpts := routers.AddInterfaceOpts{
 				PortID: tenantRouterPort.ID,
 			}

test/functional/neutron_api_fixture.go

@@ -435,6 +435,7 @@ func (f *NeutronAPIFixture) getPort(w http.ResponseWriter, r *http.Request) {
 		name := query["name"]
 		tenantID := query["tenant_id"]
 		networkID := query["network_id"]
+		deviceID := query["device_id"]
 		for _, port := range f.Ports {
 			if len(name) > 0 && name[0] != port.Name {
 				continue
@@ -445,6 +446,9 @@ func (f *NeutronAPIFixture) getPort(w http.ResponseWriter, r *http.Request) {
 			if len(networkID) > 0 && networkID[0] != port.NetworkID {
 				continue
 			}
+			if len(deviceID) > 0 && deviceID[0] != port.DeviceID {
+				continue
+			}
 			n.Ports = append(n.Ports, port)
 		}
 		bytes, err := json.Marshal(&n)
@@ -612,6 +616,12 @@ func (f *NeutronAPIFixture) putRouter(w http.ResponseWriter, r *http.Request) {
 			PortID:   n.PortID,
 		}
 
+		// Update the port's DeviceID to reflect it's attached to this router
+		if port, ok := f.Ports[n.PortID]; ok {
+			port.DeviceID = routerID
+			f.Ports[n.PortID] = port
+		}
+
 		bytes, err = json.Marshal(&n)
 		if err != nil {
 			f.InternalError(err, "Error during marshalling response", w, r)