cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to e42e876
Date Sat, 22 Feb 2014 05:01:52 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master c0ed0b781 -> e42e8762e


Fixed allocatePublicIp call done from CiscoVnmcElement


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

Branch: refs/heads/master
Commit: e42e8762eaeec95e43c9b0d78722271729ccaf2c
Parents: c0ed0b7
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Feb 21 21:02:29 2014 -0800
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri Feb 21 21:03:04 2014 -0800

----------------------------------------------------------------------
 .../src/com/cloud/network/element/CiscoVnmcElement.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e42e8762/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
index 5ad64a0..d4d3c8d 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
@@ -29,11 +29,10 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 import javax.persistence.EntityExistsException;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
@@ -356,7 +355,7 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro
                 try {
                     Account caller = CallContext.current().getCallingAccount();
                     long callerUserId = CallContext.current().getCallingUserId();
-                    outsideIp = _ipAddrMgr.allocateIp(owner, false, caller, callerUserId,
zone, displayIp);
+                    outsideIp = _ipAddrMgr.allocateIp(owner, false, caller, callerUserId,
zone, true);
                 } catch (ResourceAllocationException e) {
                     s_logger.error("Unable to allocate additional public Ip address. Exception
details " + e);
                     throw new CloudRuntimeException("Unable to allocate additional public
Ip address. Exception details " + e);


Mime
View raw message