diff --git a/agent-simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java b/agent-simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
index 023bd399b44..cff8b72277a 100644
--- a/agent-simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
+++ b/agent-simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
@@ -111,6 +111,15 @@ public class MockVmManagerImpl implements MockVmManager {
             vm.setName(vmName);
             vm.setVncPort(vncPort);
             vm.setHostId(host.getId());
+            if(vmName.startsWith("s-")) {
+            	vm.setType("SecondaryStorageVm");
+            } else if (vmName.startsWith("v-")) {
+            	vm.setType("ConsoleProxy");
+            } else if (vmName.startsWith("r-")) {
+            	vm.setType("DomainRouter");
+            } else if (vmName.startsWith("i-")) {
+            	vm.setType("User");
+            }
             vm = _mockVmDao.persist((MockVMVO)vm);
         } else {
             if(vm.getState() == State.Stopped) {
diff --git a/agent-simulator/src/com/cloud/simulator/MockVMVO.java b/agent-simulator/src/com/cloud/simulator/MockVMVO.java
index af11eff15e5..a66fef1f804 100644
--- a/agent-simulator/src/com/cloud/simulator/MockVMVO.java
+++ b/agent-simulator/src/com/cloud/simulator/MockVMVO.java
@@ -79,6 +79,10 @@ public class MockVMVO implements MockVm{
         return this.state;
     }
     
+    public String getType() {
+    	return this.vmType;
+    }
+    
     public void setState(State state) {
         this.state = state;
     }
@@ -106,5 +110,9 @@ public class MockVMVO implements MockVm{
     public void setCpu(int cpu) {
         this.cpu = cpu;
     }
+    
+    public void setType(String type) {
+    	this.vmType = type;
+    }
 
 }
diff --git a/agent-simulator/src/com/cloud/simulator/MockVm.java b/agent-simulator/src/com/cloud/simulator/MockVm.java
index c4ba8632c0d..aeb9aaf5cda 100644
--- a/agent-simulator/src/com/cloud/simulator/MockVm.java
+++ b/agent-simulator/src/com/cloud/simulator/MockVm.java
@@ -21,12 +21,13 @@ public interface MockVm {
 	public long getMemory();
 	
 	public int getCpu();
-	
+	public String getType();
 	public int getVncPort();
 	
 	public void setName(String name);
 	public void setMemory(long memory);
 	public void setCpu(int cpu);
+	public void setType(String type);
 	public void setVncPort(int vncPort);
 	public long getId();
 }