explicitDelete calculation

Author: steiler

pkg/tree/leaf_variants.go

@@ -76,10 +76,16 @@ func (lv *LeafVariants) canDelete() bool {
 		return false
 	}
 
+	// check if highest is explicit delete
+	highest := lv.GetHighestPrecedence(false, false)
+	if highest != nil && highest.IsExplicitDelete && lv.GetRunning() != nil {
+		return true
+	}
+
 	// go through all variants
 	for _, l := range lv.les {
 		// if the LeafVariant is not owned by running or default
-		if l.Update.Owner() != RunningIntentName && l.Update.Owner() != DefaultsIntentName {
+		if l.Update.Owner() != RunningIntentName && l.Update.Owner() != DefaultsIntentName && !l.IsExplicitDelete {
 			// then we need to check that it remains, so not Delete Flag set or DeleteOnylIntended Flags set [which results in not doing a delete towards the device]
 			if l.GetDeleteOnlyIntendedFlag() || !l.GetDeleteFlag() {
 				// then this entry should not be deleted
@@ -101,11 +107,17 @@ func (lv *LeafVariants) shouldDelete() bool {
 		return false
 	}
 
+	// check if highest is explicit delete
+	highest := lv.GetHighestPrecedence(false, false)
+	if highest != nil && highest.IsExplicitDelete && lv.GetRunning() != nil {
+		return true
+	}
+
 	foundOtherThenRunningAndDefault := false
 	// go through all variants
 	for _, l := range lv.les {
 		// if an entry exists that is not owned by running or default,
-		if l.Update.Owner() == RunningIntentName || l.Update.Owner() == DefaultsIntentName {
+		if l.Update.Owner() == RunningIntentName || l.Update.Owner() == DefaultsIntentName || l.IsExplicitDelete {
 			continue
 		}
 		foundOtherThenRunningAndDefault = true

pkg/tree/visitor_explicit_delete_test.go

@@ -85,6 +85,11 @@ func TestExplicitDeleteVisitor_Visit(t *testing.T) {
 					t.Error(err)
 				}
 
+				err = testhelper.LoadYgotStructIntoTreeRoot(ctx, config1(), root, RunningIntentName, RunningValuesPrio, flagsNew)
+				if err != nil {
+					t.Error(err)
+				}
+
 				return root
 			},
 			explicitDeletes: sdcpb.NewPathSet().
@@ -126,6 +131,11 @@ func TestExplicitDeleteVisitor_Visit(t *testing.T) {
 					t.Error(err)
 				}
 
+				err = testhelper.LoadYgotStructIntoTreeRoot(ctx, config1(), root, RunningIntentName, RunningValuesPrio, flagsNew)
+				if err != nil {
+					t.Error(err)
+				}
+
 				testhelper.LoadYgotStructIntoTreeRoot(ctx, &sdcio_schema.Device{Interface: map[string]*sdcio_schema.SdcioModel_Interface{
 					"ethernet-1/1": {
 						Name:        ygot.String("ethernet-1/1"),
@@ -179,6 +189,15 @@ func TestExplicitDeleteVisitor_Visit(t *testing.T) {
 					return
 				}
 			}
+
+			//
+			dels, err := root.GetDeletes(true)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			t.Logf("Deletes:\n%s", dels.PathSlices().StringSlice())
+			t.Errorf("foo")
 		})
 	}
 }