Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 72429EFD5 for ; Tue, 25 Jun 2013 04:23:15 +0000 (UTC) Received: (qmail 18703 invoked by uid 500); 25 Jun 2013 04:23:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 18522 invoked by uid 500); 25 Jun 2013 04:23:09 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 18515 invoked by uid 99); 25 Jun 2013 04:23:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2013 04:23:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3EB7F82F96A; Tue, 25 Jun 2013 04:23:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kawai@apache.org To: commits@cloudstack.apache.org Message-Id: <0dca250b427d47dbada78b037c259340@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to ed5697f Date: Tue, 25 Jun 2013 04:23:07 +0000 (UTC) Updated Branches: refs/heads/master f706f6757 -> ed5697f3e filter out the network providers that does not handle IP address The elements that deploy IP address are subclass of IpDeployingRequester CloudRuntimeException will be raised for elements that is not implemeing the interface at NetworkManagerImpl#applyIpAssociations. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed5697f3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed5697f3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed5697f3 Branch: refs/heads/master Commit: ed5697f3e175a9bb71660bb1617063c96b6fa0de Parents: f706f67 Author: Hiroaki KAWAI Authored: Tue Jun 25 13:18:06 2013 +0900 Committer: Hiroaki KAWAI Committed: Tue Jun 25 13:18:06 2013 +0900 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkModelImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed5697f3/server/src/com/cloud/network/NetworkModelImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index 4a4da8e..9ab8f3f 100755 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -489,6 +489,9 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { Map> providerToServices = getProviderServicesMap(network.getId()); Map> providerToIpList = new HashMap>(); for (Provider provider : providerToServices.keySet()) { + if (!(getElementImplementingProvider(provider.getName()) instanceof IpDeployingRequester)) { + continue; + } Set services = providerToServices.get(provider); ArrayList ipList = new ArrayList(); Set ipSet = new HashSet();