You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/06/28 00:50:01 UTC
git commit: updated refs/heads/master to f88590f
Updated Branches:
refs/heads/master 4bbc65b34 -> f88590f6d
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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f88590f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f88590f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f88590f6
Branch: refs/heads/master
Commit: f88590f6dbbadd72f7de234da63ddd85527e11a2
Parents: 4bbc65b
Author: Prachi Damle <pr...@cloud.com>
Authored: Wed Jun 26 16:57:22 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Thu Jun 27 15:49:31 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/bridge/service/core/ec2/EC2Engine.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f88590f6/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index f24bfed..163d9f8 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -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());