Merge pull request #802 from akutz/feature/deploy-ovf-activation-id

🌱 Use VAPI ActivationID with DeployOVF

pkg/providers/vsphere/virtualmachine/publish.go

@@ -5,7 +5,6 @@ package virtualmachine
 
 import (
 	"fmt"
-	"net/http"
 
 	"github.com/vmware/govmomi/vapi/rest"
 	"github.com/vmware/govmomi/vapi/vcenter"
@@ -14,14 +13,12 @@ import (
 
 	vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha3"
 	pkgctx "github.com/vmware-tanzu/vm-operator/pkg/context"
+	pkgutil "github.com/vmware-tanzu/vm-operator/pkg/util"
 )
 
 const (
 	sourceVirtualMachineType = "VirtualMachine"
 
-	// vAPICtxActIDHttpHeader represents the http header in vAPI to pass down the activation ID.
-	vAPICtxActIDHttpHeader = "vapi-ctx-actid"
-
 	itemDescriptionFormat = "virtualmachinepublishrequest.vmoperator.vmware.com: %s\n"
 )
 
@@ -59,6 +56,7 @@ func CreateOVF(
 
 	// Use vmpublish uid as the act id passed down to the content library service, so that we can track
 	// the task status by the act id.
-	ctxHeader := client.WithHeader(vmCtx, http.Header{vAPICtxActIDHttpHeader: []string{actID}})
-	return vcenter.NewManager(client).CreateOVF(ctxHeader, ovf)
+	return vcenter.NewManager(client).CreateOVF(
+		pkgutil.WithVAPIActivationID(vmCtx, client, actID),
+		ovf)
 }

pkg/providers/vsphere/vmlifecycle/create_contentlibrary.go

@@ -59,7 +59,10 @@ func deployOVF(
 
 	vmCtx.Logger.Info("Deploying OVF Library Item", "itemID", item.ID, "itemName", item.Name, "deploy", deploy)
 
-	return vcenter.NewManager(restClient).DeployLibraryItem(vmCtx, item.ID, deploy)
+	return vcenter.NewManager(restClient).DeployLibraryItem(
+		util.WithVAPIActivationID(vmCtx, restClient, vmCtx.VM.Spec.InstanceUUID),
+		item.ID,
+		deploy)
 }
 
 func createVM(

pkg/util/vapi.go

@@ -0,0 +1,29 @@
+// Copyright (c) 2024 VMware, Inc. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package util
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/vmware/govmomi/vapi/rest"
+)
+
+// vapiActivationIDHeader is the HTTP header to pass to a VAPI API in order
+// to influence the activationID of the vim.Task spawned by the VAPI API.
+const vapiActivationIDHeader = "vapi-ctx-actid"
+
+// WithVAPIActivationID adds the specified id to the context to be used as the
+// VAPI REST client's activation ID -- the value assigned to the activationId
+// field to the vim.Task the VAPI API may spawn.
+func WithVAPIActivationID(
+	ctx context.Context,
+	client *rest.Client,
+	id string) context.Context {
+
+	return client.WithHeader(
+		ctx,
+		http.Header{vapiActivationIDHeader: []string{id}},
+	)
+}