vcsim: Allow updating custom fields

Closes: #2687
Signed-off-by: Nils Elde <[email protected]>

Author: Nils Elde

simulator/custom_fields_manager.go

@@ -188,8 +188,30 @@ func (c *CustomFieldsManager) SetField(ctx *Context, req *types.SetField) soap.H
 		Value:            req.Value,
 	}
 
+	removeIndex := func(s []types.BaseCustomFieldValue, i int) []types.BaseCustomFieldValue {
+		new := make([]types.BaseCustomFieldValue, 0)
+		new = append(new, s[:i]...)
+		return append(new, s[i+1:]...)
+	}
+
+	removeExistingValues := func(s []types.BaseCustomFieldValue) []types.BaseCustomFieldValue {
+		for i := 0; i < len(s); {
+			if s[i].GetCustomFieldValue().Key == newValue.GetCustomFieldValue().Key {
+				s = removeIndex(s, i)
+			}
+			i++
+		}
+		return s
+	}
+
 	entity := ctx.Map.Get(req.Entity).(mo.Entity).Entity()
+
 	ctx.WithLock(entity, func() {
+		// Check if custom value and value are already set. If so, remove them.
+		entity.CustomValue = removeExistingValues(entity.CustomValue)
+		entity.Value = removeExistingValues(entity.Value)
+
+		// Add the new value
 		entity.CustomValue = append(entity.CustomValue, newValue)
 		entity.Value = append(entity.Value, newValue)
 	})

simulator/object_test.go

@@ -54,6 +54,7 @@ func TestObjectCustomFields(t *testing.T) {
 
 	fieldName := "testField"
 	fieldValue := "12345"
+	updatedFieldValue := "67890"
 
 	// Test that field is not created
 	err = vmm.SetCustomValue(ctx, fieldName, fieldValue)
@@ -113,37 +114,47 @@ func TestObjectCustomFields(t *testing.T) {
 		t.Fatalf("len(vm.AvailableField) expected 2, got %d", len(vm.AvailableField))
 	}
 
-	// Set field
-	err = vmm.SetCustomValue(ctx, fieldName, fieldValue)
-	if err != nil {
-		t.Fatal(err)
-	}
+	testFieldValues := func(want string) {
+		if len(vm.CustomValue) != 1 {
+			t.Fatalf("len(vm.CustomValue) expected 1, got %d", len(vm.CustomValue))
+		}
 
-	if len(vm.CustomValue) != 1 {
-		t.Fatalf("len(vm.CustomValue) expected 1, got %d", len(vm.CustomValue))
-	}
+		if len(vm.Value) != 1 {
+			t.Fatalf("len(vm.Value) expected 1, got %d", len(vm.Value))
+		}
 
-	if len(vm.Value) != 1 {
-		t.Fatalf("len(vm.Value) expected 1, got %d", len(vm.Value))
-	}
+		if vm.CustomValue[0].(*types.CustomFieldStringValue).Key != field.Key {
+			t.Fatalf("vm.CustomValue[0].Key expected %d, got %d",
+				field.Key, vm.CustomValue[0].(*types.CustomFieldStringValue).Key)
+		}
+		if vm.CustomValue[0].(*types.CustomFieldStringValue).Value != want {
+			t.Fatalf("vm.CustomValue[0].Value expected %s, got %s",
+				want, vm.CustomValue[0].(*types.CustomFieldStringValue).Value)
+		}
 
-	if vm.CustomValue[0].(*types.CustomFieldStringValue).Key != field.Key {
-		t.Fatalf("vm.CustomValue[0].Key expected %d, got %d",
-			field.Key, vm.CustomValue[0].(*types.CustomFieldStringValue).Key)
-	}
-	if vm.CustomValue[0].(*types.CustomFieldStringValue).Value != fieldValue {
-		t.Fatalf("vm.CustomValue[0].Value expected %s, got %s",
-			fieldValue, vm.CustomValue[0].(*types.CustomFieldStringValue).Value)
+		if vm.Value[0].(*types.CustomFieldStringValue).Key != field.Key {
+			t.Fatalf("vm.Value[0].Key expected %d, got %d",
+				field.Key, vm.Value[0].(*types.CustomFieldStringValue).Key)
+		}
+		if vm.Value[0].(*types.CustomFieldStringValue).Value != want {
+			t.Fatalf("vm.Value[0].Value expected %s, got %s",
+				want, vm.Value[0].(*types.CustomFieldStringValue).Value)
+		}
 	}
 
-	if vm.Value[0].(*types.CustomFieldStringValue).Key != field.Key {
-		t.Fatalf("vm.Value[0].Key expected %d, got %d",
-			field.Key, vm.Value[0].(*types.CustomFieldStringValue).Key)
+	// Set field
+	err = vmm.SetCustomValue(ctx, fieldName, fieldValue)
+	if err != nil {
+		t.Fatal(err)
 	}
-	if vm.Value[0].(*types.CustomFieldStringValue).Value != fieldValue {
-		t.Fatalf("vm.Value[0].Value expected %s, got %s",
-			fieldValue, vm.Value[0].(*types.CustomFieldStringValue).Value)
+	testFieldValues(fieldValue)
+
+	// Update field
+	err = vmm.SetCustomValue(ctx, fieldName, updatedFieldValue)
+	if err != nil {
+		t.Fatal(err)
 	}
+	testFieldValues(updatedFieldValue)
 
 	// Rename field
 	newName := field.Name + "_renamed"