Merge remote-tracking branch 'origin/master' into FEATURE-CENIK123-v1.1

Author: Karl Harris

api/src/com/cloud/agent/api/to/DiskTO.java

@@ -34,6 +34,7 @@ public class DiskTO {
     public static final String VOLUME_SIZE = "volumeSize";
     public static final String MOUNT_POINT = "mountpoint";
     public static final String PROTOCOL_TYPE = "protocoltype";
+    public static final String PATH = "path";
 
     private DataTO data;
     private Long diskSeq;

api/src/com/cloud/host/Status.java

@@ -123,7 +123,7 @@ public static String[] toStrings(Status... states) {
         s_fsm.addTransition(Status.Connecting, Event.Ready, Status.Up);
         s_fsm.addTransition(Status.Connecting, Event.PingTimeout, Status.Alert);
         s_fsm.addTransition(Status.Connecting, Event.ShutdownRequested, Status.Disconnected);
-        s_fsm.addTransition(Status.Connecting, Event.HostDown, Status.Alert);
+        s_fsm.addTransition(Status.Connecting, Event.HostDown, Status.Down);
         s_fsm.addTransition(Status.Connecting, Event.Ping, Status.Connecting);
         s_fsm.addTransition(Status.Connecting, Event.ManagementServerDown, Status.Disconnected);
         s_fsm.addTransition(Status.Connecting, Event.AgentDisconnected, Status.Alert);

api/src/com/cloud/storage/Volume.java

@@ -38,7 +38,6 @@ enum State {
         Ready("The volume is ready to be used."),
         Migrating("The volume is migrating to other storage pool"),
         Snapshotting("There is a snapshot created on this volume, not backed up to secondary storage yet"),
-        Reverting("Replace the existing volume on a storage system with a snapshot of it"),
         Resizing("The volume is being resized"),
         Expunging("The volume is being expunging"),
         Expunged("The volume is being expunging"),
@@ -86,11 +85,8 @@ public String getDescription() {
             s_fsm.addTransition(Expunging, Event.OperationSucceeded, Expunged);
             s_fsm.addTransition(Expunging, Event.OperationFailed, Destroy);
             s_fsm.addTransition(Ready, Event.SnapshotRequested, Snapshotting);
-            s_fsm.addTransition(Ready, Event.RevertRequested, Reverting);
             s_fsm.addTransition(Snapshotting, Event.OperationSucceeded, Ready);
             s_fsm.addTransition(Snapshotting, Event.OperationFailed, Ready);
-            s_fsm.addTransition(Reverting, Event.OperationSucceeded, Ready);
-            s_fsm.addTransition(Reverting, Event.OperationFailed, Ready);
             s_fsm.addTransition(Ready, Event.MigrationRequested, Migrating);
             s_fsm.addTransition(Migrating, Event.OperationSucceeded, Ready);
             s_fsm.addTransition(Migrating, Event.OperationFailed, Ready);
@@ -115,7 +111,6 @@ enum Event {
         UploadRequested,
         MigrationRequested,
         SnapshotRequested,
-        RevertRequested,
         DestroyRequested,
         ExpungingRequested,
         ResizeRequested;

core/src/com/cloud/storage/resource/StorageProcessor.java

@@ -26,6 +26,7 @@
 import org.apache.cloudstack.storage.command.DettachCommand;
 import org.apache.cloudstack.storage.command.ForgetObjectCmd;
 import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
+import org.apache.cloudstack.storage.command.SnapshotAndCopyCommand;
 
 import com.cloud.agent.api.Answer;
 
@@ -62,7 +63,9 @@ public interface StorageProcessor {
 
     public Answer deleteSnapshot(DeleteCommand cmd);
 
-    Answer introduceObject(IntroduceObjectCmd cmd);
+    public Answer introduceObject(IntroduceObjectCmd cmd);
 
-    Answer forgetObject(ForgetObjectCmd cmd);
+    public Answer forgetObject(ForgetObjectCmd cmd);
+
+    public Answer snapshotAndCopy(SnapshotAndCopyCommand cmd);
 }

core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java

@@ -28,6 +28,7 @@
 import org.apache.cloudstack.storage.command.DeleteCommand;
 import org.apache.cloudstack.storage.command.DettachCommand;
 import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
+import org.apache.cloudstack.storage.command.SnapshotAndCopyCommand;
 import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
 
 import com.cloud.agent.api.Answer;
@@ -61,7 +62,10 @@ public Answer handleStorageCommands(StorageSubSystemCommand command) {
             return execute((DettachCommand)command);
         } else if (command instanceof IntroduceObjectCmd) {
             return processor.introduceObject((IntroduceObjectCmd)command);
+        } else if (command instanceof SnapshotAndCopyCommand) {
+            return processor.snapshotAndCopy((SnapshotAndCopyCommand)command);
         }
+
         return new Answer((Command)command, false, "not implemented yet");
     }
 

core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java

@@ -0,0 +1,41 @@
+//
+// 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 org.apache.cloudstack.storage.command;
+
+import com.cloud.agent.api.Answer;
+
+public class SnapshotAndCopyAnswer extends Answer {
+    private String _path;
+
+    public SnapshotAndCopyAnswer() {
+    }
+
+    public SnapshotAndCopyAnswer(String errMsg) {
+        super(null, false, errMsg);
+    }
+
+    public void setPath(String path) {
+        _path = path;
+    }
+
+    public String getPath() {
+        return _path;
+    }
+}

core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java

@@ -0,0 +1,60 @@
+//
+// 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 org.apache.cloudstack.storage.command;
+
+import com.cloud.agent.api.Command;
+
+import java.util.Map;
+
+public final class SnapshotAndCopyCommand extends Command implements StorageSubSystemCommand {
+    private String _uuidOfSourceVdi;
+    private Map<String, String> _sourceDetails;
+    private Map<String, String> _destDetails;
+
+    private boolean _executeInSequence = true;
+
+    public SnapshotAndCopyCommand(String uuidOfSourceVdi, Map<String, String> sourceDetails, Map<String, String> destDetails) {
+        _uuidOfSourceVdi = uuidOfSourceVdi;
+        _sourceDetails = sourceDetails;
+        _destDetails = destDetails;
+    }
+
+    public String getUuidOfSourceVdi() {
+        return _uuidOfSourceVdi;
+    }
+
+    public Map<String, String> getSourceDetails() {
+        return _sourceDetails;
+    }
+
+    public Map<String, String> getDestDetails() {
+        return _destDetails;
+    }
+
+    @Override
+    public void setExecuteInSequence(boolean executeInSequence) {
+        _executeInSequence = executeInSequence;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return _executeInSequence;
+    }
+}

engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java

@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 
@@ -95,9 +96,9 @@ VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId,
 
     void cleanupVolumes(long vmId) throws ConcurrentOperationException;
 
-    void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
+    void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
 
-    void disconnectVolumesFromHost(long vmId, long hostId);
+    void revokeAccess(long vmId, long hostId);
 
     void migrateVolumes(VirtualMachine vm, VirtualMachineTO vmTo, Host srcHost, Host destHost, Map<Volume, StoragePool> volumeToPool);
 

engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java

@@ -28,9 +28,9 @@
 public interface PrimaryDataStoreDriver extends DataStoreDriver {
     public ChapInfo getChapInfo(VolumeInfo volumeInfo);
 
-    public boolean connectVolumeToHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
+    public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore);
 
-    public void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
+    public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
 
     // intended for managed storage (cloud.storage_pool.managed = true)
     // if not managed, return volume.getSize()

engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java

@@ -44,9 +44,9 @@ public VolumeInfo getVolume() {
 
     ChapInfo getChapInfo(VolumeInfo volumeInfo, DataStore dataStore);
 
-    boolean connectVolumeToHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
+    boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore);
 
-    void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore);
+    void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
 
     /**
      * Creates the volume based on the given criteria