etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3218: AWSAPI - For runInstances, awsapi need not send networkId information in case of advance zone 

Changes:
 awsapi will not pass networkId in case of Advance Zone and let CS identify which network to deploy VM in. The same case applies to allocateAddress API too.
This commit is contained in:
Prachi Damle 2013-06-26 16:57:22 -07:00
parent 4bbc65b34c
commit f88590f6db
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
View File

@ -849,9 +849,9 @@ public class EC2Engine extends ManagerBase {
CloudStackAccount caller = getCurrentAccount();
CloudStackZone zone = findZone();
CloudStackNetwork net = findNetwork(zone);
//CloudStackNetwork net = findNetwork(zone);
// CloudStackIpAddress resp = getApi().associateIpAddress(null, null, null, "0036952d-48df-4422-9fd0-94b0885e18cb");
CloudStackIpAddress resp = getApi().associateIpAddress(zone.getId(), caller.getName(), caller.getDomainId(), net != null ? net.getId():null);
CloudStackIpAddress resp = getApi().associateIpAddress(zone.getId(), caller.getName(), caller.getDomainId(), null);
ec2Address.setAssociatedInstanceId(resp.getId());
if (resp.getIpAddress() == null) {
@ -1399,14 +1399,14 @@ public class EC2Engine extends ManagerBase {
CloudStackZone zone = zones.get(0);
// network
CloudStackNetwork network = findNetwork(zone);
//CloudStackNetwork network = findNetwork(zone);
// now actually deploy the vms
for( int i=0; i < createInstances; i++ ) {
try{
CloudStackUserVm resp = getApi().deployVirtualMachine(svcOffering.getId(),
request.getTemplateId(), zoneId, null, null, null, null,
null, null, null, request.getKeyName(), null, (network != null ? network.getId() : null),
request.getTemplateId(), zoneId, null, null, null, null,
null, null, null, request.getKeyName(), null, null,
null, constructList(request.getGroupSet()), request.getSize().longValue(), request.getUserData());
EC2Instance vm = new EC2Instance();
vm.setId(resp.getId().toString());