Merge pull request #1762 from stgraber/ovn

incusd/network/ovn: Skip existing static routes

Author: hallyn

internal/server/network/ovn/ovn_nb_actions.go

@@ -509,6 +509,7 @@ func (o *NB) CreateLogicalRouterRoute(ctx context.Context, routerName OVNRouter,
 	operations := []ovsdb.Operation{}
 	for i, route := range routes {
 		// Check if already present.
+		exists := false
 		for _, existing := range existingRoutes {
 			if existing.IPPrefix != route.Prefix.String() {
 				continue
@@ -531,12 +532,18 @@ func (o *NB) CreateLogicalRouterRoute(ctx context.Context, routerName OVNRouter,
 			}
 
 			if mayExist {
-				continue
+				exists = true
+				break
 			}
 
 			return ErrExists
 		}
 
+		// Don't add duplicate entries.
+		if exists {
+			continue
+		}
+
 		// Create the new record.
 		staticRoute := ovnNB.LogicalRouterStaticRoute{
 			UUID:     fmt.Sprintf("route_%d", i),