cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject git commit: updated refs/heads/master to ed5697f
Date Tue, 25 Jun 2013 04:23:07 GMT
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 <kawai@stratosphere.co.jp>
Authored: Tue Jun 25 13:18:06 2013 +0900
Committer: Hiroaki KAWAI <kawai@stratosphere.co.jp>
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<Provider, Set<Service>> providerToServices = getProviderServicesMap(network.getId());
         Map<Provider, ArrayList<PublicIpAddress>> providerToIpList = new HashMap<Provider,
ArrayList<PublicIpAddress>>();
         for (Provider provider : providerToServices.keySet()) {
+            if (!(getElementImplementingProvider(provider.getName()) instanceof IpDeployingRequester))
{
+                continue;
+            }
             Set<Service> services = providerToServices.get(provider);
             ArrayList<PublicIpAddress> ipList = new ArrayList<PublicIpAddress>();
             Set<PublicIpAddress> ipSet = new HashSet<PublicIpAddress>();


Mime
View raw message