incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [7/7] git commit: Merge branch 'master' into api_refactoring
Date Thu, 03 Jan 2013 16:33:24 GMT
Updated Branches:
  refs/heads/api_refactoring 580bf857f -> edb00bb61


Merge branch 'master' into api_refactoring


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

Branch: refs/heads/api_refactoring
Commit: edb00bb613f197d6b7aaa3ca7035de832bd5a774
Parents: 580bf85 cc3d692
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Thu Jan 3 08:32:56 2013 -0800
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Thu Jan 3 08:32:56 2013 -0800

----------------------------------------------------------------------
 plugins/hypervisors/vmware/pom.xml                 |    6 +-
 .../cloud/network/element/NiciraNvpElement.java    |    3 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java    |    7 +-
 .../src/com/cloud/network/nicira/NiciraNvpApi.java |    2 +-
 .../network/element/NiciraNvpElementTest.java      |  119 +++++++++++++++
 .../guru/NiciraNvpGuestNetworkGuruTest.java        |  114 ++++++++++++++
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   20 +---
 vmware-base/pom.xml                                |    6 +-
 8 files changed, 248 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/edb00bb6/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
----------------------------------------------------------------------
diff --cc plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
index 4974cbe,0a7d042..cc53ee1
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
@@@ -842,9 -842,10 +842,10 @@@ public class NiciraNvpElement extends A
  			for (PublicIpAddress ip : ipAddress) {
  				cidrs.add(ip.getAddress().addr() + "/" + NetUtils.getCidrSize(ip.getNetmask()));
  			}
 -			ConfigurePublicIpsOnLogicalRouterCommand cmd = new ConfigurePublicIpsOnLogicalRouterCommand(routermapping.getLogicalRouterUuid(),

 +			ConfigurePublicIpsOnLogicalRouterCommand cmd = new ConfigurePublicIpsOnLogicalRouterCommand(routermapping.getLogicalRouterUuid(),
  					niciraNvpHost.getDetail("l3gatewayserviceuuid"), cidrs);
  			ConfigurePublicIpsOnLogicalRouterAnswer answer = (ConfigurePublicIpsOnLogicalRouterAnswer)
_agentMgr.easySend(niciraNvpHost.getId(), cmd);
+ 			//FIXME answer can be null if the host is down
  			return answer.getResult();
  		}
  		else {


Mime
View raw message