KVM live storage migration intra cluster from NFS source and destination

Missing new line and revert schema changes

Author: nvazquez

api/src/main/java/com/cloud/storage/MigrationOptions.java

@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.cloud.storage;
+
+import java.io.Serializable;
+
+public class MigrationOptions implements Serializable {
+
+    private String srcPoolUuid;
+    private Storage.StoragePoolType srcPoolType;
+    private Type type;
+    private String srcBackingFilePath;
+    private boolean copySrcTemplate;
+    private String snapshotName;
+    private String srcVolumeUuid;
+    private int timeout;
+
+    public enum Type {
+        LinkedClone, FullClone
+    }
+
+    public MigrationOptions() {
+    }
+
+    public MigrationOptions(String srcPoolUuid, Storage.StoragePoolType srcPoolType, String srcBackingFilePath, boolean copySrcTemplate) {
+        this.srcPoolUuid = srcPoolUuid;
+        this.srcPoolType = srcPoolType;
+        this.type = Type.LinkedClone;
+        this.srcBackingFilePath = srcBackingFilePath;
+        this.copySrcTemplate = copySrcTemplate;
+    }
+
+    public MigrationOptions(String srcPoolUuid, Storage.StoragePoolType srcPoolType, String snapshotName, String srcVolumeUuid) {
+        this.srcPoolUuid = srcPoolUuid;
+        this.srcPoolType = srcPoolType;
+        this.type = Type.FullClone;
+        this.snapshotName = snapshotName;
+        this.srcVolumeUuid = srcVolumeUuid;
+    }
+
+    public String getSrcPoolUuid() {
+        return srcPoolUuid;
+    }
+
+    public Storage.StoragePoolType getSrcPoolType() {
+        return srcPoolType;
+    }
+
+    public String getSrcBackingFilePath() {
+        return srcBackingFilePath;
+    }
+
+    public boolean isCopySrcTemplate() {
+        return copySrcTemplate;
+    }
+
+    public String getSnapshotName() {
+        return snapshotName;
+    }
+
+    public String getSrcVolumeUuid() {
+        return srcVolumeUuid;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public int getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(int timeout) {
+        this.timeout = timeout;
+    }
+}

core/src/main/java/com/cloud/agent/api/CreateVMSnapshotCommand.java

@@ -32,6 +32,10 @@ public CreateVMSnapshotCommand(String vmName, String vmUuid, VMSnapshotTO snapsh
         this.vmUuid = vmUuid;
     }
 
+    public CreateVMSnapshotCommand(String vmName, VMSnapshotTO snapshot) {
+        super(vmName, snapshot, null, null);
+    }
+
     public String getVmUuid() {
         return vmUuid;
     }

core/src/main/java/com/cloud/agent/api/DeleteVMSnapshotCommand.java

@@ -27,4 +27,8 @@ public class DeleteVMSnapshotCommand extends VMSnapshotBaseCommand {
     public DeleteVMSnapshotCommand(String vmName, VMSnapshotTO snapshot, List<VolumeObjectTO> volumeTOs, String guestOSType) {
         super(vmName, snapshot, volumeTOs, guestOSType);
     }
+
+    public DeleteVMSnapshotCommand(String vmName, VMSnapshotTO snapshot) {
+        super(vmName, snapshot, null, null);
+    }
 }

core/src/main/java/com/cloud/agent/api/MigrateCommand.java

@@ -28,6 +28,7 @@ public class MigrateCommand extends Command {
     private String vmName;
     private String destIp;
     private Map<String, MigrateDiskInfo> migrateStorage;
+    private boolean migrateStorageManaged;
     private boolean autoConvergence;
     private String hostGuid;
     private boolean isWindows;
@@ -53,6 +54,14 @@ public Map<String, MigrateDiskInfo> getMigrateStorage() {
         return migrateStorage != null ? new HashMap<>(migrateStorage) : new HashMap<String, MigrateDiskInfo>();
     }
 
+    public boolean isMigrateStorageManaged() {
+        return migrateStorageManaged;
+    }
+
+    public void setMigrateStorageManaged(boolean migrateStorageManaged) {
+        this.migrateStorageManaged = migrateStorageManaged;
+    }
+
     public void setAutoConvergence(boolean autoConvergence) {
         this.autoConvergence = autoConvergence;
     }

core/src/main/java/com/cloud/agent/api/storage/CheckStorageAvailabilityCommand.java

@@ -0,0 +1,43 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api.storage;
+
+import com.cloud.agent.api.Command;
+import com.cloud.storage.Storage;
+
+import java.util.Map;
+
+public class CheckStorageAvailabilityCommand extends Command {
+
+    private Map<String, Storage.StoragePoolType> poolsMap;
+
+    public CheckStorageAvailabilityCommand(Map<String, Storage.StoragePoolType> poolsMap) {
+        this.poolsMap = poolsMap;
+    }
+
+    public Map<String, Storage.StoragePoolType> getPoolsMap() {
+        return poolsMap;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}

core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java

@@ -19,6 +19,7 @@
 
 package org.apache.cloudstack.storage.to;
 
+import com.cloud.storage.MigrationOptions;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 
 import com.cloud.agent.api.to.DataObjectType;
@@ -51,6 +52,7 @@ public class VolumeObjectTO implements DataTO {
     private Long iopsWriteRate;
     private DiskCacheMode cacheMode;
     private Hypervisor.HypervisorType hypervisorType;
+    private MigrationOptions migrationOptions;
 
     public VolumeObjectTO() {
 
@@ -81,6 +83,7 @@ public VolumeObjectTO(VolumeInfo volume) {
         cacheMode = volume.getCacheMode();
         hypervisorType = volume.getHypervisorType();
         setDeviceId(volume.getDeviceId());
+        this.migrationOptions = volume.getMigrationOptions();
     }
 
     public String getUuid() {
@@ -252,4 +255,8 @@ public void setCacheMode(DiskCacheMode cacheMode) {
     public DiskCacheMode getCacheMode() {
         return cacheMode;
     }
+
+    public MigrationOptions getMigrationOptions() {
+        return migrationOptions;
+    }
 }

engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java

@@ -21,6 +21,7 @@
 import com.cloud.agent.api.Answer;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.offering.DiskOffering.DiskCacheMode;
+import com.cloud.storage.MigrationOptions;
 import com.cloud.storage.Volume;
 import com.cloud.vm.VirtualMachine;
 
@@ -55,4 +56,11 @@ public interface VolumeInfo extends DataObject, Volume {
     Long getIopsWriteRate();
 
     DiskCacheMode getCacheMode();
+
+    /**
+     * Currently available for KVM volumes
+     */
+    MigrationOptions getMigrationOptions();
+
+    void setMigrationOptions(MigrationOptions migrationOptions);
 }