You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 16:04:57 UTC
[45/50] git commit: updated refs/heads/4.4 to d5220a8
Some minor fixes in simulator code
(cherry picked from commit a0486aedca24dfa7ea58bc72caa882d6dc57611d)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d14d0d7c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d14d0d7c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d14d0d7c
Branch: refs/heads/4.4
Commit: d14d0d7c92c0cabb6610e289df9c15c8b2040722
Parents: 3d62fbc
Author: Koushik Das <ko...@apache.org>
Authored: Wed Jul 9 12:27:47 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 16:02:51 2014 +0200
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/MockStorageManagerImpl.java | 6 +++---
.../simulator/src/com/cloud/resource/SimulatorDiscoverer.java | 5 -----
.../src/com/cloud/resource/SimulatorSecondaryDiscoverer.java | 3 ---
3 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d14d0d7c/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
index 8e1aaed..89b7950 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
@@ -289,11 +289,11 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa
vm = _mockVMDao.findByVmName(vmName);
txn.commit();
if (vm == null) {
- return new Answer(cmd, false, "can't vm :" + vmName);
+ return new Answer(cmd, false, "can't find vm :" + vmName);
}
} catch (Exception ex) {
txn.rollback();
- throw new CloudRuntimeException("Error when attaching iso to vm " + vm.getName(), ex);
+ throw new CloudRuntimeException("Error when attaching iso to vm " + vmName, ex);
} finally {
txn.close();
txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
@@ -514,8 +514,8 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa
if (cmd.getVmName() != null) {
MockVm vm = _mockVMDao.findByVmName(cmd.getVmName());
- vm.setState(State.Expunging);
if (vm != null) {
+ vm.setState(State.Expunging);
MockVMVO vmVo = _mockVMDao.createForUpdate(vm.getId());
_mockVMDao.update(vm.getId(), vmVo);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d14d0d7c/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java
index d1ebfb5..7c31a9a 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java
@@ -41,7 +41,6 @@ import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.agent.manager.MockAgentManager;
import com.cloud.agent.manager.MockStorageManager;
import com.cloud.dc.ClusterVO;
-import com.cloud.dc.dao.ClusterDao;
import com.cloud.exception.ConnectionException;
import com.cloud.exception.DiscoveryException;
import com.cloud.host.Host;
@@ -65,15 +64,11 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
@Inject
VMTemplateZoneDao _vmTemplateZoneDao;
@Inject
- ClusterDao _clusterDao;
- @Inject
AgentManager _agentMgr = null;
@Inject
MockAgentManager _mockAgentMgr = null;
@Inject
MockStorageManager _mockStorageMgr = null;
- @Inject
- ResourceManager _resourceMgr;
/**
* Finds ServerResources of an in-process simulator
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d14d0d7c/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
index 715e9f3..11bf346 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
@@ -31,7 +31,6 @@ import org.apache.cloudstack.storage.resource.SecondaryStorageDiscoverer;
import org.apache.cloudstack.storage.resource.SecondaryStorageResource;
import org.apache.log4j.Logger;
-import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.AgentControlAnswer;
import com.cloud.agent.api.AgentControlCommand;
@@ -52,8 +51,6 @@ public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer imp
@Inject
MockStorageManager _mockStorageMgr = null;
@Inject
- AgentManager _agentMgr;
- @Inject
SnapshotDao _snapshotDao;
@Inject
ImageStoreDao imageStoreDao;