new networking change integration

Kelven Yang · Kelven Yang · commit b285bbb68377 · 2010-12-08T18:30:30.000-08:00
diff --git a/api/src/com/cloud/template/VirtualMachineTemplate.java b/api/src/com/cloud/template/VirtualMachineTemplate.java
@@ -75,4 +75,6 @@ public enum TemplateFilter {
     TemplateType getTemplateType();
     
     HypervisorType getHypervisorType();
+    
+    int getBits();
 }
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -70,6 +70,11 @@ protected <T extends VirtualMachine> VirtualMachineTO toVirtualMachineTO(Virtual
         to.setNics(nics);
         to.setDisks(vmProfile.getDisks().toArray(new VolumeTO[vmProfile.getDisks().size()]));
         
+        if(vmProfile.getTemplate().getBits() == 32)
+        	to.setArch("i686");
+        else
+        	to.setArch("x86_64");
+        
         return to;
     }
     

Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,6 @@ public enum TemplateFilter {`
`75`	`75`	`TemplateType getTemplateType();`
`76`	`76`
`77`	`77`	`HypervisorType getHypervisorType();`
	`78`	`+`
	`79`	`+ int getBits();`
`78`	`80`	`}`