diff --git a/agent-simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java b/agent-simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
index 5d0e454db4b..e59824f0cdb 100755
--- a/agent-simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
+++ b/agent-simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
@@ -263,12 +263,13 @@ public class MockAgentManagerImpl implements MockAgentManager {
                 AgentStorageResource storageResource = new AgentStorageResource();
                 try {
                     Map<String, Object> params =  new HashMap<String, Object>();
+                    Map<String, String> details = new HashMap<String, String>();
                     params.put("guid", this.guid);
+                    details.put("guid", this.guid);
                     storageResource.configure("secondaryStorage", params);
                     storageResource.start();
-                    StartupCommand[] cmds = storageResource.initialize();
                     //on the simulator the ssvm is as good as a direct agent
-                    _resourceMgr.addHost(mockHost.getDataCenterId(), storageResource, Host.Type.SecondaryStorageVM, null);
+                    _resourceMgr.addHost(mockHost.getDataCenterId(), storageResource, Host.Type.SecondaryStorageVM, details);
                     _resources.put(this.guid, storageResource);
                 } catch (ConfigurationException e) {
                     s_logger.debug("Failed to load secondary storage resource: " + e.toString());
diff --git a/agent-simulator/src/com/cloud/resource/AgentStorageResource.java b/agent-simulator/src/com/cloud/resource/AgentStorageResource.java
index 2e5460adb1d..9bc0f48afdc 100644
--- a/agent-simulator/src/com/cloud/resource/AgentStorageResource.java
+++ b/agent-simulator/src/com/cloud/resource/AgentStorageResource.java
@@ -68,7 +68,7 @@ public class AgentStorageResource extends AgentResourceBase implements Secondary
 
     @Override
     public StartupCommand[] initialize() {
-    	StartupStorageCommand cmd = new StartupStorageCommand();
+    	StartupSecondaryStorageCommand cmd = new StartupSecondaryStorageCommand();
 
         cmd.setPrivateIpAddress(agentHost.getPrivateIpAddress());
         cmd.setPrivateNetmask(agentHost.getPrivateNetMask());
diff --git a/agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java b/agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java
index 3b9b789e4f4..420853def10 100755
--- a/agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java
+++ b/agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java
@@ -307,7 +307,6 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
 	@Override
 	public HostVO createHostVOForConnectedAgent(HostVO host,
 			StartupCommand[] cmd) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
@@ -331,7 +330,6 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
 	@Override
 	public DeleteHostAnswer deleteHost(HostVO host, boolean isForced,
 			boolean isForceDeleteStorage) throws UnableDeleteHostException {
-		// TODO Auto-generated method stub
 		return null;
 	}
 	
diff --git a/agent-simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/agent-simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
index d3b74f29057..6fd0c6e226f 100644
--- a/agent-simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
+++ b/agent-simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
@@ -6,17 +6,34 @@ import java.util.Map;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.Listener;
+import com.cloud.agent.api.AgentControlAnswer;
+import com.cloud.agent.api.AgentControlCommand;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.agent.api.StartupSecondaryStorageCommand;
 import com.cloud.agent.manager.MockStorageManager;
+import com.cloud.exception.ConnectionException;
 import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.storage.SnapshotVO;
+import com.cloud.storage.dao.SnapshotDao;
 import com.cloud.storage.secondary.SecondaryStorageDiscoverer;
 import com.cloud.utils.component.Inject;
+import com.cloud.utils.exception.CloudRuntimeException;
 @Local(value=Discoverer.class)
-public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer {
-    @Inject
-    MockStorageManager _mockStorageMgr = null;
+public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer implements ResourceStateAdapter, Listener {
+    @Inject MockStorageManager _mockStorageMgr = null;
+    @Inject AgentManager _agentMgr;
+    @Inject ResourceManager _resourceMgr;
+    @Inject SnapshotDao _snapshotDao;
     
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+    	_agentMgr.registerForHostEvents(this, true, false, false);
+        _resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
         return super.configure(name, params);
     }
     
@@ -27,4 +44,92 @@ public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer {
             _mockStorageMgr.preinstallTemplates(host.getStorageUrl(), host.getDataCenterId());
         }
     }
+
+	@Override
+	public HostVO createHostVOForConnectedAgent(HostVO host,
+			StartupCommand[] cmd) {
+		return null;
+	}
+
+	@Override
+	public HostVO createHostVOForDirectConnectAgent(HostVO host,
+			StartupCommand[] startup, ServerResource resource,
+			Map<String, String> details, List<String> hostTags) {
+		//for detecting SSVM dispatch
+		StartupCommand firstCmd = startup[0];
+	    if (!(firstCmd instanceof StartupSecondaryStorageCommand)) {
+	    	return null;
+	    }
+	    
+		host.setType(com.cloud.host.Host.Type.SecondaryStorageVM);
+		return host;
+	}
+
+	@Override
+	public DeleteHostAnswer deleteHost(HostVO host, boolean isForced,
+			boolean isForceDeleteStorage) throws UnableDeleteHostException {
+		long hostId = host.getId();
+		List<SnapshotVO> snapshots = _snapshotDao.listByHostId(hostId);
+		if (snapshots != null && !snapshots.isEmpty()) {
+			throw new CloudRuntimeException("Cannot delete this secondary storage because there are still snapshots on it ");
+		}
+		_vmTemplateHostDao.deleteByHost(hostId);
+		host.setGuid(null);
+		_hostDao.update(hostId, host);
+		_hostDao.remove(hostId);
+		return new DeleteHostAnswer(true);
+	}
+
+    @Override
+    public boolean start() {
+        return true;
+    }
+
+    @Override
+    public boolean stop() {
+    	_resourceMgr.unregisterResourceStateAdapter(this.getClass().getSimpleName());
+        return true;
+    }
+
+	@Override
+	public int getTimeout() {
+		return 0;
+	}
+
+	@Override
+	public boolean isRecurring() {
+		return false;
+	}
+
+	@Override
+	public boolean processAnswers(long agentId, long seq, Answer[] answers) {
+		return false;
+	}
+
+	@Override
+	public boolean processCommands(long agentId, long seq, Command[] commands) {
+		return false;
+	}
+
+	@Override
+	public void processConnect(HostVO host, StartupCommand cmd,
+			boolean forRebalance) throws ConnectionException {
+		
+	}
+
+	@Override
+	public AgentControlAnswer processControlCommand(long agentId,
+			AgentControlCommand cmd) {
+		return null;
+	}
+
+	@Override
+	public boolean processDisconnect(long agentId, Status state) {
+		return false;
+	}
+
+	@Override
+	public boolean processTimeout(long agentId, long seq) {
+		return false;
+	}
 }