cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject [1/6] git commit: updated refs/heads/affinity_groups to edb12b1
Date Fri, 29 Mar 2013 07:18:52 GMT
Updated Branches:
  refs/heads/affinity_groups bffdefacf -> edb12b1d9


Not using entity factory


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/adf7ddb6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/adf7ddb6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/adf7ddb6

Branch: refs/heads/affinity_groups
Commit: adf7ddb6153b4a68a0ac8181426a29eae3877714
Parents: bffdefa
Author: Prachi Damle <prachi@cloud.com>
Authored: Mon Mar 18 11:09:29 2013 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Fri Mar 29 00:09:17 2013 -0700

----------------------------------------------------------------------
 .../platform/orchestration/CloudOrchestrator.java  |   71 +++++++--------
 1 files changed, 35 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adf7ddb6/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java
index 60ea9f5..afe6daf 100755
--- a/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java
@@ -25,7 +25,6 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.engine.cloud.entity.api.NetworkEntity;
 import org.apache.cloudstack.engine.cloud.entity.api.TemplateEntity;
 import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
@@ -53,7 +52,6 @@ import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.vm.NicProfile;
-import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.dao.UserVmDao;
@@ -68,32 +66,32 @@ public class CloudOrchestrator implements OrchestrationService {
 
 	@Inject
 	private VirtualMachineManager _itMgr;
-	
+
 	@Inject
 	protected VMTemplateDao _templateDao = null;
-	
+
     @Inject
     protected VMInstanceDao _vmDao;
-    
+
     @Inject
     protected UserVmDao _userVmDao = null;
-    
+
 	@Inject
 	protected ServiceOfferingDao _serviceOfferingDao;
-	
+
 	@Inject
 	protected DiskOfferingDao _diskOfferingDao = null;
-	
-	@Inject 
+
+	@Inject
 	protected VirtualMachineEntityFactory _vmEntityFactory;
 
 	@Inject
 	protected NetworkDao _networkDao;
-	
+
 	@Inject
 	protected AccountDao _accountDao = null;
 
-	
+
     public VirtualMachineEntity createFromScratch(String uuid, String iso, String os, String
hypervisor, String hostName, int cpu, int speed, long memory, List<String> networks,
List<String> computeTags,
             Map<String, String> details, String owner) {
         // TODO Auto-generated method stub
@@ -150,17 +148,17 @@ public class CloudOrchestrator implements OrchestrationService {
 
     @Override
     public VirtualMachineEntity createVirtualMachine(
-            String id, 
-            String owner, 
-            String templateId, 
-            String hostName, 
+            String id,
+            String owner,
+            String templateId,
+            String hostName,
             String displayName,
             String hypervisor,
-            int cpu, 
-            int speed, 
+            int cpu,
+            int speed,
             long memory,
             Long diskSize,
-            List<String> computeTags, 
+            List<String> computeTags,
             List<String> rootDiskTags,
             Map<String, NicProfile> networkNicMap, DeploymentPlan plan) throws InsufficientCapacityException
{
 
@@ -183,22 +181,22 @@ public class CloudOrchestrator implements OrchestrationService {
 			// add error handling here
 		}
     	vmEntity.init(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags,
new ArrayList<String>(networkNicMap.keySet()));
-        
-    	
+
+
     	HypervisorType hypervisorType = HypervisorType.valueOf(hypervisor);
 
     	//load vm instance and offerings and call virtualMachineManagerImpl
     	VMInstanceVO vm = _vmDao.findByUuid(id);
-    	
+
 		// If the template represents an ISO, a disk offering must be passed in, and will be used
to create the root disk
 		// Else, a disk offering is optional, and if present will be used to create the data disk
 
     	Pair<DiskOfferingVO, Long> rootDiskOffering = new Pair<DiskOfferingVO, Long>(null,
null);
 		List<Pair<DiskOfferingVO, Long>> dataDiskOfferings = new ArrayList<Pair<DiskOfferingVO,
Long>>();
- 
+
 		ServiceOfferingVO offering = _serviceOfferingDao.findById(vm.getServiceOfferingId());
 		rootDiskOffering.first(offering);
-		
+
 		if(vm.getDiskOfferingId() != null){
     		DiskOfferingVO diskOffering = _diskOfferingDao.findById(vm.getDiskOfferingId());
     		if (diskOffering == null) {
@@ -215,24 +213,25 @@ public class CloudOrchestrator implements OrchestrationService {
     		}
     		dataDiskOfferings.add(new Pair<DiskOfferingVO, Long>(diskOffering, size));
 		}
-		
-		
-		
+
+
+
     	if (_itMgr.allocate(_userVmDao.findById(vm.getId(), true), _templateDao.findById(new
Long(templateId)), offering, rootDiskOffering, dataDiskOfferings, networkIpMap, null,	plan,
hypervisorType, _accountDao.findById(new Long(owner))) == null) {
 			return null;
 		}
-    	
+
         return vmEntity;
     }
 
     @Override
     public VirtualMachineEntity createVirtualMachineFromScratch(String id, String owner,
String isoId, String hostName, String displayName, String hypervisor, String os, int cpu,
int speed, long memory,Long diskSize,
             List<String> computeTags, List<String> rootDiskTags, Map<String,
NicProfile> networkNicMap, DeploymentPlan plan)  throws InsufficientCapacityException {
-		
+
     	// VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName,
displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager);
     	VirtualMachineEntityImpl vmEntity = null;
 		try {
-			vmEntity = _vmEntityFactory.getObject();
+            vmEntity = VirtualMachineEntityImpl.class.newInstance();
+            vmEntity = ComponentContext.inject(vmEntity);
 		} catch (Exception e) {
 			// add error handling here
 		}
@@ -240,12 +239,12 @@ public class CloudOrchestrator implements OrchestrationService {
 
     	//load vm instance and offerings and call virtualMachineManagerImpl
     	VMInstanceVO vm = _vmDao.findByUuid(id);
-    	
-    	
+
+
 		Pair<DiskOfferingVO, Long> rootDiskOffering = new Pair<DiskOfferingVO, Long>(null,
null);
 		ServiceOfferingVO offering = _serviceOfferingDao.findById(vm.getServiceOfferingId());
 		rootDiskOffering.first(offering);
-		
+
 		List<Pair<DiskOfferingVO, Long>> dataDiskOfferings = new ArrayList<Pair<DiskOfferingVO,
Long>>();
 		Long diskOfferingId = vm.getDiskOfferingId();
 		if (diskOfferingId == null) {
@@ -266,7 +265,7 @@ public class CloudOrchestrator implements OrchestrationService {
 		}
 		rootDiskOffering.first(diskOffering);
 		rootDiskOffering.second(size);
-		
+
         List<Pair<NetworkVO, NicProfile>> networkIpMap = new ArrayList<Pair<NetworkVO,
NicProfile>>();
         for (String uuid : networkNicMap.keySet()) {
             NetworkVO network = _networkDao.findByUuid(uuid);
@@ -274,13 +273,13 @@ public class CloudOrchestrator implements OrchestrationService {
                 networkIpMap.add(new Pair<NetworkVO, NicProfile>(network, networkNicMap.get(uuid)));
             }
         }
-		
+
 		HypervisorType hypervisorType = HypervisorType.valueOf(hypervisor);
-		
+
     	if (_itMgr.allocate(_userVmDao.findById(vm.getId(), true), _templateDao.findById(new
Long(isoId)), offering, rootDiskOffering, dataDiskOfferings, networkIpMap, null,	plan, hypervisorType,
_accountDao.findById(new Long(owner))) == null) {
 			return null;
 		}
-    	
+
         return vmEntity;
     }
 


Mime
View raw message