simulator: allow adding hosts with arch

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManager.java

@@ -39,6 +39,7 @@ public interface MockAgentManager extends Manager {
     public static final long DEFAULT_HOST_MEM_SIZE = 8 * 1024 * 1024 * 1024L; // 8G, unit of Mbytes
     public static final int DEFAULT_HOST_CPU_CORES = 4; // 2 dual core CPUs (2 x 2)
     public static final int DEFAULT_HOST_SPEED_MHZ = 8000; // 1 GHz CPUs
+    public static final String DEFAULT_HOST_ARCH = "x86_64";
 
     @Override
     boolean configure(String name, Map<String, Object> params) throws ConfigurationException;

plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManagerImpl.java

@@ -153,6 +153,7 @@ public Map<AgentResourceBase, Map<String, String>> createServerResources(Map<Str
         long cpuSpeed = Long.parseLong((String)params.get("cpuspeed"));
         long memory = Long.parseLong((String)params.get("memory"));
         long localStorageSize = Long.parseLong((String)params.get("localstorage"));
+        String arch = (String)params.get("arch");
         synchronized (this) {
             long dataCenterId = Long.parseLong((String)params.get("zone"));
             long podId = Long.parseLong((String)params.get("pod"));
@@ -170,6 +171,7 @@ public Map<AgentResourceBase, Map<String, String>> createServerResources(Map<Str
             mockHost.setCpuCount(cpuCore);
             mockHost.setCpuSpeed(cpuSpeed);
             mockHost.setMemorySize(memory);
+            mockHost.setArch(arch);
             String guid = UUID.randomUUID().toString();
             mockHost.setGuid(guid);
             mockHost.setName("SimulatedAgent." + guid);

plugins/hypervisors/simulator/src/main/java/com/cloud/resource/AgentRoutingResource.java

@@ -177,6 +177,7 @@ public StartupCommand[] initialize() {
         StartupRoutingCommand cmd =
             new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3), HypervisorType.Simulator,
                 RouterPrivateIpStrategy.HostLocal);
+        cmd.setCpuArch((String)info.get(5));
 
         Map<String, String> hostDetails = new HashMap<String, String>();
         hostDetails.put(RouterPrivateIpStrategy.class.getCanonicalName(), RouterPrivateIpStrategy.DcGlobal.toString());
@@ -274,12 +275,14 @@ protected List<Object> getHostInfo() {
         long cpus = agentHost.getCpuCount();
         long ram = agentHost.getMemorySize();
         long dom0Ram = agentHost.getMemorySize() / 10;
+        String arch = agentHost.getArch();
 
         info.add((int)cpus);
         info.add(speed);
         info.add(ram);
         info.add(agentHost.getCapabilities());
         info.add(dom0Ram);
+        info.add(arch);
 
         return info;
     }

plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java

@@ -87,6 +87,7 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
             long cpuCores = MockAgentManager.DEFAULT_HOST_CPU_CORES;
             long memory = MockAgentManager.DEFAULT_HOST_MEM_SIZE;
             long localstorageSize = MockStorageManager.DEFAULT_HOST_STORAGE_SIZE;
+            String arch = MockAgentManager.DEFAULT_HOST_ARCH;
             if (scheme.equals("http")) {
                 if (host == null || !host.startsWith("sim")) {
                     String msg = "uri is not of simulator type so we're not taking care of the discovery for this: " + uri;
@@ -111,6 +112,8 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
                                 memory = Long.parseLong(parameter[1]);
                             } else if (parameter[0].equalsIgnoreCase("localstorage") && parameter[1] != null) {
                                 localstorageSize = Long.parseLong(parameter[1]);
+                            } else if (parameter[0].equalsIgnoreCase("arch") && parameter[1] != null) {
+                                arch = parameter[1];
                             }
                         }
                     }
@@ -168,6 +171,7 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
             params.put("cpucore", Long.toString(cpuCores));
             params.put("memory", Long.toString(memory));
             params.put("localstorage", Long.toString(localstorageSize));
+            params.put("arch", arch);
 
             resources = createAgentResources(params);
             return resources;

plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockHost.java

@@ -23,6 +23,8 @@ public interface MockHost {
 
     public long getMemorySize();
 
+    String getArch();
+
     public String getCapabilities();
 
     public long getId();

plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockHostVO.java

@@ -87,6 +87,9 @@ public class MockHostVO implements MockHost, InternalIdentity {
     @Column(name = "ram")
     private long memorySize;
 
+    @Column(name = "arch")
+    private String arch;
+
     @Column(name = "capabilities")
     private String capabilities;
 
@@ -143,6 +146,14 @@ public void setMemorySize(long memorySize) {
         this.memorySize = memorySize;
     }
 
+    public String getArch() {
+        return arch;
+    }
+
+    public void setArch(String arch) {
+        this.arch = arch;
+    }
+
     @Override
     public String getCapabilities() {
         return this.capabilities;

setup/db/create-schema-simulator.sql

@@ -43,6 +43,7 @@ CREATE TABLE  `simulator`.`mockhost` (
   `cpus` int(10) unsigned,
   `speed` int(10) unsigned,
   `ram` bigint unsigned,
+  `arch` varchar(8) DEFAULT "x86_64" COMMENT "the CPU architecture of the host",
   `capabilities` varchar(255) COMMENT 'host capabilities in comma separated list',
   `vm_id` bigint unsigned,
   `resource` varchar(255) DEFAULT NULL COMMENT 'If it is a local resource, this is the class name',