Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6DD369F1F for ; Thu, 3 Jan 2013 16:33:25 +0000 (UTC) Received: (qmail 81043 invoked by uid 500); 3 Jan 2013 16:33:24 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 80952 invoked by uid 500); 3 Jan 2013 16:33:24 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 80917 invoked by uid 99); 3 Jan 2013 16:33:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 16:33:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 51C3A822018; Thu, 3 Jan 2013 16:33:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: Merge branch 'master' into api_refactoring Message-Id: <20130103163324.51C3A822018@tyr.zones.apache.org> Date: Thu, 3 Jan 2013 16:33:24 +0000 (UTC) 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 Authored: Thu Jan 3 08:32:56 2013 -0800 Committer: Rohit Yadav 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 {