Updates for moving ivd

vmware-tanzu · Aug 22, 2021 · 4cb0ae5 · 4cb0ae5
1 parent 7d0e6d9
commit 4cb0ae5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -16,6 +16,8 @@ require (
 	github.com/stretchr/testify v1.4.0
 	github.com/vmware-tanzu/astrolabe v0.4.0
 	github.com/vmware-tanzu/velero v1.5.1
+	github.com/vmware/govmomi v0.22.2-0.20200329013745-f2eef8fc745f
+	github.com/vmware/virtual-disks v0.0.4
 	k8s.io/api v0.18.4
 	k8s.io/apiextensions-apiserver v0.18.4
 	k8s.io/apimachinery v0.18.4

diff --git a/pkg/dataMover/data_mover.go b/pkg/dataMover/data_mover.go
@@ -25,6 +25,7 @@ import (
 	"github.com/vmware-tanzu/astrolabe/pkg/s3repository"
 	backupdriverv1 "github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/apis/backupdriver/v1alpha1"
 	"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/backuprepository"
+	"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/ivd"
 	"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/utils"
 	"sync"
 )

diff --git a/pkg/paravirt/paravirt_protected_entity_type_manager_test.go b/pkg/paravirt/paravirt_protected_entity_type_manager_test.go
@@ -306,7 +306,7 @@ func TestPVCSnapshotOps(t *testing.T) {
 		URLBase: "VOID_URL",
 	})
 
-	pem := server.NewDirectProtectedEntityManagerFromParamMap(configInfo, logger)
+	pem := server.NewDirectProtectedEntityManagerFromParamMap(configInfo, nil, logger)
 
 	// Initialize the External Astrolabe ProtectedEntity Type Manager for paravirtualized entities
 	paravirtParams := make(map[string]interface{})

diff --git a/pkg/snapshotmgr/data_manager_protected_entity_type_manager.go b/pkg/snapshotmgr/data_manager_protected_entity_type_manager.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/ivd"
 )
 
 import "github.com/vmware-tanzu/astrolabe/pkg/astrolabe"

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -23,6 +23,7 @@ import (
 	"github.com/hashicorp/go-version"
 	"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/constants"
 	"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/generated/clientset/versioned/typed/backupdriver/v1alpha1"
+	"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/ivd"
 	"io/ioutil"
 	"k8s.io/client-go/tools/clientcmd"
 	"net"