the hypervisor-guru made migrate aware implemented for vmware

Author: Daan Hoogland

api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.cloud.storage.StoragePool;
 import org.apache.cloudstack.framework.config.ConfigKey;
 
 import com.cloud.agent.api.Command;
@@ -84,4 +85,12 @@ public interface HypervisorGuru extends Adapter {
     List<Command> finalizeExpungeVolumes(VirtualMachine vm);
 
     Map<String, String> getClusterSettings(long vmId);
+
+    /**
+     * will migrate a vm to a pool. For now this will ony work for stopped VMs on Vmware.
+     * @param vm the stopped vm to migrate
+     * @param destination the primary storage pool to migrate to
+     * @return all data pertaining to the 'new' vm
+     */
+    List<Command> migrate(VirtualMachine vm, StoragePool destination);
 }

core/src/main/java/com/cloud/agent/api/MigrateToPoolAnswer.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;
+
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+
+import java.util.List;
+
+public class MigrateToPoolAnswer extends Answer {
+
+    List<VolumeObjectTO> volumeTos;
+
+    public MigrateToPoolAnswer(MigrateToPoolCommand cmd, Exception ex) {
+        super(cmd, ex);
+        volumeTos = null;
+    }
+
+    public MigrateToPoolAnswer(MigrateToPoolCommand cmd, List<VolumeObjectTO> volumeTos) {
+        super(cmd, true, null);
+        this.volumeTos = volumeTos;
+    }
+
+    public List<VolumeObjectTO> getVolumeTos() {
+        return volumeTos;
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.cloud.agent.api;
+
+/**
+ * used to tell the agent to migrate a vm to a different primare storage pool.
+ * It is for now only mplemented on Vmware and is supposed to work irrespective of whether the VM is started or not.
+ *
+ */
+public class MigrateToPoolCommand extends Command {
+    String vmName;
+    String destPool;
+    boolean executeInSequence = false;
+
+    protected MigrateToPoolCommand() {
+    }
+
+    /**
+     *
+     * @param vmName the name of the VM to migrate
+     * @param destPool the primare storage pool to migrate the VM to
+     * @param executeInSequence
+     */
+    public MigrateToPoolCommand(String vmName, String destPool, boolean executeInSequence) {
+        this.vmName = vmName;
+        this.destPool = destPool;
+        this.executeInSequence = executeInSequence;
+    }
+
+    public String getDestinationPool() {
+        return destPool;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return executeInSequence;
+    }
+
+}

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

@@ -22,14 +22,19 @@
 public class UnregisterVMCommand extends Command {
     String vmName;
     boolean cleanupVmFiles = false;
+    boolean executeInSequence = false;
 
     public UnregisterVMCommand(String vmName) {
+        this(vmName, false);
+    }
+    public UnregisterVMCommand(String vmName, boolean executeInSequence) {
         this.vmName = vmName;
+        this.executeInSequence = executeInSequence;
     }
 
     @Override
     public boolean executeInSequence() {
-        return false;
+        return executeInSequence;
     }
 
     public String getVmName() {

engine/components-api/src/main/java/com/cloud/storage/StorageManager.java

@@ -106,7 +106,14 @@ public interface StorageManager extends StorageService {
      * @param poolId
      * @return comma separated list of tags
      */
-    public String getStoragePoolTags(long poolId);
+    String getStoragePoolTags(long poolId);
+
+    /**
+     * Returns a list of Strings with tags for the specified storage pool
+     * @param poolId
+     * @return comma separated list of tags
+     */
+    List<String> getStoragePoolTagList(long poolId);
 
     Answer sendToPool(long poolId, Command cmd) throws StorageUnavailableException;