cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/master to a838756
Date Mon, 29 Jul 2013 12:19:04 GMT
Updated Branches:
  refs/heads/master d06a5bc5f -> a8387568f


Fixed the conditon which checks for the provider's capabilty and reapply ipaliases on virtual
router restart.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>


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

Branch: refs/heads/master
Commit: a8387568f30fedc0b01a0d6c745fa2ff8a4a360e
Parents: d06a5bc
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Wed Jul 17 17:07:11 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Mon Jul 29 17:40:00 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/NetworkManagerImpl.java               | 2 +-
 .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8387568/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index b07f3cf..49162e0 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2013,7 +2013,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
                 DhcpServiceProvider sp = (DhcpServiceProvider) element;
                 Map <Capability, String> dhcpCapabilities = element.getCapabilities().get(Service.Dhcp);
                 String supportsMultipleSubnets = dhcpCapabilities.get(Capability.DhcpAccrossMultipleSubnets);
-                if ((supportsMultipleSubnets != null || Boolean.valueOf(supportsMultipleSubnets))
&& profile.getIp6Address() == null) {
+                if ((supportsMultipleSubnets != null && Boolean.valueOf(supportsMultipleSubnets))
&& profile.getIp6Address() == null) {
                     if (!sp.configDhcpSupportForSubnet(network, profile, vmProfile, dest,
context)) {
                         return false;
                     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8387568/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index c2a9d72..d43007a 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2483,7 +2483,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase
implements V
         if (_networkModel.isProviderSupportServiceInNetwork(guestNetworkId, Service.Dhcp,
provider)) {
             Map<Network.Capability, String> dhcpCapabilities = _networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(_networkDao.findById(guestNetworkId).getNetworkOfferingId()),
Service.Dhcp);
             String supportsMultipleSubnets = dhcpCapabilities.get(Network.Capability.DhcpAccrossMultipleSubnets);
-            if (supportsMultipleSubnets == null || !Boolean.valueOf(supportsMultipleSubnets))
{
+            if (supportsMultipleSubnets != null && Boolean.valueOf(supportsMultipleSubnets))
{
                 List<NicIpAliasVO> revokedIpAliasVOs = _nicIpAliasDao.listByNetworkIdAndState(guestNetworkId,
NicIpAlias.state.revoked);
                 s_logger.debug("Found" + revokedIpAliasVOs.size() + "ip Aliases to revoke
on the router as a part of dhcp configuration");
                 removeRevokedIpAliasFromDb(revokedIpAliasVOs);


Mime
View raw message