You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/07/30 19:59:26 UTC
git commit: updated refs/heads/master to 680d420
Repository: cloudstack
Updated Branches:
refs/heads/master 89017a7d7 -> 680d4202d
CLOUDSTACK-7204:
fixed build for simulator
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/680d4202
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/680d4202
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/680d4202
Branch: refs/heads/master
Commit: 680d4202de77803633291de8c6988bb4e664c2cc
Parents: 89017a7
Author: Anthony Xu <an...@citrix.com>
Authored: Wed Jul 30 10:58:33 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed Jul 30 10:59:00 2014 -0700
----------------------------------------------------------------------
.../cloud/agent/manager/MockVmManagerImpl.java | 5 +--
.../src/com/cloud/ha/SimulatorInvestigator.java | 4 +--
.../cloud/resource/AgentRoutingResource.java | 38 +++++++++-----------
3 files changed, 22 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/680d4202/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
index ab583e2..7650afa 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
@@ -91,6 +91,7 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.VirtualMachine.PowerState;
@Component
@Local(value = {MockVmManager.class})
@@ -354,7 +355,7 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
}
txn.commit();
- return new CheckVirtualMachineAnswer(cmd, vm.getState(), vm.getVncPort());
+ return new CheckVirtualMachineAnswer(cmd, vm.getState()==State.Running? PowerState.PowerOn: PowerState.PowerOff, vm.getVncPort());
} catch (Exception ex) {
txn.rollback();
throw new CloudRuntimeException("unable to fetch vm state " + cmd.getVmName(), ex);
@@ -504,7 +505,7 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
return new RevertToVMSnapshotAnswer(cmd, false, "No VM by name " + cmd.getVmName());
}
s_logger.debug("Reverted to snapshot " + snapshot + " of VM " + vm);
- return new RevertToVMSnapshotAnswer(cmd, cmd.getVolumeTOs(), vmVo.getState());
+ return new RevertToVMSnapshotAnswer(cmd, cmd.getVolumeTOs(), vmVo.getState()== State.Running? PowerState.PowerOn: PowerState.PowerOff);
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/680d4202/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java b/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java
index 448d7ed..7191ae3 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java
@@ -39,7 +39,7 @@ import com.cloud.resource.ResourceManager;
import com.cloud.simulator.dao.MockConfigurationDao;
import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.VirtualMachine.PowerState;
@Local(value=Investigator.class)
public class SimulatorInvestigator extends AdapterBase implements Investigator {
@@ -90,7 +90,7 @@ public class SimulatorInvestigator extends AdapterBase implements Investigator {
}
CheckVirtualMachineAnswer cvmAnswer = (CheckVirtualMachineAnswer)answer;
s_logger.debug("Agent responded with state " + cvmAnswer.getState().toString());
- return cvmAnswer.getState() == State.Running;
+ return cvmAnswer.getState() == PowerState.PowerOn;
} catch (AgentUnavailableException e) {
s_logger.debug("Unable to reach the agent for " + vm.toString() + ": " + e.getMessage());
return null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/680d4202/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java
index d99c742..2fe938f 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java
@@ -227,17 +227,15 @@ public class AgentRoutingResource extends AgentStorageResource {
if (this.totalCpu < (vmSpec.getCpus() * vmSpec.getMaxSpeed() + this.usedCpu) || this.totalMem < (vmSpec.getMaxRam() + this.usedMem)) {
return new StartAnswer(cmd, "Not enough resource to start the vm");
}
- try {
- Answer result = _simMgr.simulate(cmd, hostGuid);
- if (!result.getResult()) {
- return new StartAnswer(cmd, result.getDetails());
- }
+ Answer result = _simMgr.simulate(cmd, hostGuid);
+ if (!result.getResult()) {
+ return new StartAnswer(cmd, result.getDetails());
+ }
- this.usedCpu += vmSpec.getCpus() * vmSpec.getMaxSpeed();
- this.usedMem += vmSpec.getMaxRam();
- _runningVms.put(vmName, new Pair<Long, Long>(Long.valueOf(vmSpec.getCpus() * vmSpec.getMaxSpeed()), vmSpec.getMaxRam()));
+ this.usedCpu += vmSpec.getCpus() * vmSpec.getMaxSpeed();
+ this.usedMem += vmSpec.getMaxRam();
+ _runningVms.put(vmName, new Pair<Long, Long>(Long.valueOf(vmSpec.getCpus() * vmSpec.getMaxSpeed()), vmSpec.getMaxRam()));
- }
return new StartAnswer(cmd);
@@ -248,21 +246,19 @@ public class AgentRoutingResource extends AgentStorageResource {
StopAnswer answer = null;
String vmName = cmd.getVmName();
- try {
- Answer result = _simMgr.simulate(cmd, hostGuid);
+ Answer result = _simMgr.simulate(cmd, hostGuid);
- if (!result.getResult()) {
- return new StopAnswer(cmd, result.getDetails(), false);
- }
+ if (!result.getResult()) {
+ return new StopAnswer(cmd, result.getDetails(), false);
+ }
- answer = new StopAnswer(cmd, null, true);
- Pair<Long, Long> data = _runningVms.get(vmName);
- if (data != null) {
- this.usedCpu -= data.first();
- this.usedMem -= data.second();
- }
+ answer = new StopAnswer(cmd, null, true);
+ Pair<Long, Long> data = _runningVms.get(vmName);
+ if (data != null) {
+ this.usedCpu -= data.first();
+ this.usedMem -= data.second();
+ }
- }
return answer;
}