cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject git commit: updated refs/heads/vmsync to e440bc7
Date Wed, 12 Jun 2013 21:15:08 GMT
Updated Branches:
  refs/heads/vmsync 35ea8e149 -> e440bc742


More changes


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e440bc74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e440bc74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e440bc74

Branch: refs/heads/vmsync
Commit: e440bc7423f3e093bf10078261de8ccd0b05513f
Parents: 35ea8e1
Author: Alex Huang <alex.huang@gmail.com>
Authored: Wed Jun 12 13:59:19 2013 -0700
Committer: Alex Huang <alex.huang@gmail.com>
Committed: Wed Jun 12 13:59:29 2013 -0700

----------------------------------------------------------------------
 api/src/com/cloud/vm/VirtualMachine.java               | 9 ---------
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 8 --------
 2 files changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e440bc74/api/src/com/cloud/vm/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/com/cloud/vm/VirtualMachine.java
index 04d7ad6..58ecdc1 100755
--- a/api/src/com/cloud/vm/VirtualMachine.java
+++ b/api/src/com/cloud/vm/VirtualMachine.java
@@ -77,34 +77,29 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity,
I
 
             s_fsm.addTransition(State.Stopped, VirtualMachine.Event.OperationFailed, State.Stopped);
             s_fsm.addTransition(State.Stopped, VirtualMachine.Event.ExpungeOperation, State.Expunging);
-            s_fsm.addTransition(State.Stopped, VirtualMachine.Event.AgentReportShutdowned,
State.Stopped);
             s_fsm.addTransition(State.Stopped, VirtualMachine.Event.StorageMigrationRequested,
State.Migrating);
             s_fsm.addTransition(State.Starting, VirtualMachine.Event.OperationRetry, State.Starting);
             s_fsm.addTransition(State.Starting, VirtualMachine.Event.OperationSucceeded,
State.Running);
             s_fsm.addTransition(State.Starting, VirtualMachine.Event.OperationFailed, State.Stopped);
             s_fsm.addTransition(State.Starting, VirtualMachine.Event.AgentReportRunning,
State.Running);
             s_fsm.addTransition(State.Starting, VirtualMachine.Event.AgentReportStopped,
State.Stopped);
-            s_fsm.addTransition(State.Starting, VirtualMachine.Event.AgentReportShutdowned,
State.Stopped);
             s_fsm.addTransition(State.Destroyed, VirtualMachine.Event.RecoveryRequested,
State.Stopped);
             s_fsm.addTransition(State.Destroyed, VirtualMachine.Event.ExpungeOperation, State.Expunging);
             s_fsm.addTransition(State.Running, VirtualMachine.Event.MigrationRequested, State.Migrating);
             s_fsm.addTransition(State.Running, VirtualMachine.Event.AgentReportRunning, State.Running);
             s_fsm.addTransition(State.Running, VirtualMachine.Event.AgentReportStopped, State.Stopped);
             s_fsm.addTransition(State.Running, VirtualMachine.Event.StopRequested, State.Stopping);
-            s_fsm.addTransition(State.Running, VirtualMachine.Event.AgentReportShutdowned,
State.Stopped);
             s_fsm.addTransition(State.Running, VirtualMachine.Event.AgentReportMigrated,
State.Running);
             s_fsm.addTransition(State.Migrating, VirtualMachine.Event.MigrationRequested,
State.Migrating);
             s_fsm.addTransition(State.Migrating, VirtualMachine.Event.OperationSucceeded,
State.Running);
             s_fsm.addTransition(State.Migrating, VirtualMachine.Event.OperationFailed, State.Running);
             s_fsm.addTransition(State.Migrating, VirtualMachine.Event.AgentReportRunning,
State.Running);
             s_fsm.addTransition(State.Migrating, VirtualMachine.Event.AgentReportStopped,
State.Stopped);
-            s_fsm.addTransition(State.Migrating, VirtualMachine.Event.AgentReportShutdowned,
State.Stopped);
             s_fsm.addTransition(State.Stopping, VirtualMachine.Event.OperationSucceeded,
State.Stopped);
             s_fsm.addTransition(State.Stopping, VirtualMachine.Event.OperationFailed, State.Running);
             s_fsm.addTransition(State.Stopping, VirtualMachine.Event.AgentReportRunning,
State.Running);
             s_fsm.addTransition(State.Stopping, VirtualMachine.Event.AgentReportStopped,
State.Stopped);
             s_fsm.addTransition(State.Stopping, VirtualMachine.Event.StopRequested, State.Stopping);
-            s_fsm.addTransition(State.Stopping, VirtualMachine.Event.AgentReportShutdowned,
State.Stopped);
             s_fsm.addTransition(State.Expunging, VirtualMachine.Event.OperationFailed, State.Expunging);
             s_fsm.addTransition(State.Expunging, VirtualMachine.Event.ExpungeOperation, State.Expunging);
             s_fsm.addTransition(State.Error, VirtualMachine.Event.DestroyRequested, State.Expunging);
@@ -157,7 +152,6 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity,
I
     }
 
     public enum Event {
-        CreateRequested,
         StartRequested,
         StopRequested,
         DestroyRequested,
@@ -171,10 +165,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity,
Identity, I
         OperationFailed,
         OperationFailedToError,
         OperationRetry,
-        AgentReportShutdowned,
         AgentReportMigrated,
-        RevertRequested,
-        SnapshotRequested,
     };
 
     public enum Type {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e440bc74/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index f04a589..931f1bf 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -215,14 +215,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
 
     protected List<DeploymentPlanner> _planners;
 
-    public List<DeploymentPlanner> getPlanners() {
-        return _planners;
-    }
-
-    public void setPlanners(List<DeploymentPlanner> planners) {
-        _planners = planners;
-    }
-
     protected List<HostAllocator> _hostAllocators;
 
     public List<HostAllocator> getHostAllocators() {


Mime
View raw message