[SCD] Do not require key for accepted op intents of down USSes (#972)

interuss · Nov 14, 2023 · d0a6b32 · d0a6b32
1 parent e712cac
commit d0a6b32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/scd/models/operational_intents.go b/pkg/scd/models/operational_intents.go
@@ -138,3 +138,9 @@ func (o *OperationalIntent) SetCells(cids []int64) {
 	}
 	o.Cells = cells
 }
+
+// RequiresKey indicates whether this OperationalIntent requires its OVN to be included in the provided keys when
+// another intersecting OperationalIntent is being created or updated.
+func (o *OperationalIntent) RequiresKey() bool {
+	return !(o.UssAvailability == UssAvailabilityStateDown && o.State == OperationalIntentStateAccepted)
+}
diff --git a/pkg/scd/operational_intents_handler.go b/pkg/scd/operational_intents_handler.go
@@ -551,7 +551,8 @@ func (a *Server) PutOperationalIntentReference(ctx context.Context, manager stri
 				return stacktrace.Propagate(err, "Unable to SearchOperations")
 			}
 			for _, relevantOp := range relevantOps {
-				if _, ok := key[relevantOp.OVN]; !ok {
+				_, ok := key[relevantOp.OVN]
+				if !ok && relevantOp.RequiresKey() {
 					if relevantOp.Manager != dssmodels.Manager(manager) {
 						relevantOp.OVN = scdmodels.NoOvnPhrase
 					}