ocp: resolve conflicts

Signed-off-by: Benny Zlotnik <[email protected]>
kubev2v · Jul 17, 2023 · f237080 · f237080
1 parent 054b8ce
commit f237080
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pkg/controller/plan/adapter/ocp/builder.go b/pkg/controller/plan/adapter/ocp/builder.go
@@ -524,3 +524,15 @@ func createDataVolumeSpec(size resource.Quantity, storageClassName, url, configM
 func pvcSourceName(namespace, name string) string {
 	return fmt.Sprintf("%s/%s", namespace, name)
 }
+
+// Build LUN PVs.
+func (r *Builder) LunPersistentVolumes(vmRef ref.Ref) (pvs []core.PersistentVolume, err error) {
+	// do nothing
+	return
+}
+
+// Build LUN PVCs.
+func (r *Builder) LunPersistentVolumeClaims(vmRef ref.Ref) (pvcs []core.PersistentVolumeClaim, err error) {
+	// do nothing
+	return
+}
diff --git a/pkg/controller/plan/adapter/ocp/client.go b/pkg/controller/plan/adapter/ocp/client.go
@@ -126,3 +126,8 @@ func (Client) RemoveSnapshots(vmRef ref.Ref, precopies []planapi.Precopy) error
 func (Client) SetCheckpoints(vmRef ref.Ref, precopies []planapi.Precopy, datavolumes []cdi.DataVolume, final bool) (err error) {
 	return nil
 }
+
+func (r Client) DetachDisks(vmRef ref.Ref) (err error) {
+	// no-op
+	return
+}