bug 12919: pass all lb rules in transition (revoke/add) state to the backend when apply a single LB rule

Alena Prokharchyk · Alena Prokharchyk · commit d20e10edd3e0 · 2012-01-18T14:15:21.000-08:00
status 12919: resolved fixed
diff --git a/api/src/com/cloud/network/rules/FirewallRule.java b/api/src/com/cloud/network/rules/FirewallRule.java
@@ -20,7 +20,6 @@
 import java.util.List;
 
 import com.cloud.acl.ControlledEntity;
-import com.cloud.network.rules.FirewallRule.FirewallRuleType;
 
 public interface FirewallRule extends ControlledEntity {
     enum Purpose {
diff --git a/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
@@ -22,8 +22,6 @@
 
 import javax.ejb.Local;
 
-import org.apache.log4j.Logger;
-
 import com.cloud.network.IPAddressVO;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRule.FirewallRuleType;
@@ -41,13 +39,12 @@
 
 @Local(value=FirewallRulesDao.class) @DB(txn=false)
 public class FirewallRulesDaoImpl extends GenericDaoBase<FirewallRuleVO, Long> implements FirewallRulesDao {
-    private static final Logger s_logger = Logger.getLogger(FirewallRulesDaoImpl.class);
     
     protected final SearchBuilder<FirewallRuleVO> AllFieldsSearch;
     protected final SearchBuilder<FirewallRuleVO> NotRevokedSearch;
     protected final SearchBuilder<FirewallRuleVO> ReleaseSearch;
     protected SearchBuilder<FirewallRuleVO> VmSearch;
-    protected final SearchBuilder<FirewallRuleVO> systemRuleSearch;
+    protected final SearchBuilder<FirewallRuleVO> SystemRuleSearch;
     
     protected final FirewallRulesCidrsDaoImpl _firewallRulesCidrsDao = ComponentLocator.inject(FirewallRulesCidrsDaoImpl.class);
     
@@ -83,15 +80,16 @@ protected FirewallRulesDaoImpl() {
         ReleaseSearch.and("ports", ReleaseSearch.entity().getSourcePortStart(), Op.IN);
         ReleaseSearch.done();
         
-        systemRuleSearch = createSearchBuilder();
-        systemRuleSearch.and("type", systemRuleSearch.entity().getType(), Op.EQ);
-        systemRuleSearch.and("ipId", systemRuleSearch.entity().getSourceIpAddressId(), Op.NULL);
-        systemRuleSearch.done();
+        SystemRuleSearch = createSearchBuilder();
+        SystemRuleSearch.and("type", SystemRuleSearch.entity().getType(), Op.EQ);
+        SystemRuleSearch.and("ipId", SystemRuleSearch.entity().getSourceIpAddressId(), Op.NULL);
+        SystemRuleSearch.done();
+        
     }
     
     @Override
     public List<FirewallRuleVO> listSystemRules() {
-    	SearchCriteria<FirewallRuleVO> sc = systemRuleSearch.create();
+    	SearchCriteria<FirewallRuleVO> sc = SystemRuleSearch.create();
     	sc.setParameters("type", FirewallRuleType.System.toString());
     	return listBy(sc);
     }
diff --git a/server/src/com/cloud/network/dao/LoadBalancerDao.java b/server/src/com/cloud/network/dao/LoadBalancerDao.java
@@ -28,5 +28,6 @@ public interface LoadBalancerDao extends GenericDao<LoadBalancerVO, Long> {
     List<LoadBalancerVO> listByIpAddress(long ipAddressId);
     LoadBalancerVO findByIpAddressAndPublicPort(long ipAddressId, String publicPort);
     LoadBalancerVO findByAccountAndName(Long accountId, String name);
-    List<LoadBalancerVO> listByNetworkId(long networkId);
+    List<LoadBalancerVO> listByNetworkId(long networkId);
+    List<LoadBalancerVO> listInTransitionStateByNetworkId(long networkId);
 }
diff --git a/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java b/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
@@ -28,10 +28,12 @@
 import org.apache.log4j.Logger;
 
 import com.cloud.network.LoadBalancerVO;
+import com.cloud.network.rules.FirewallRule.State;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.db.Transaction;
 
 @Local(value={LoadBalancerDao.class})
@@ -48,6 +50,7 @@ public class LoadBalancerDaoImpl extends GenericDaoBase<LoadBalancerVO, Long> im
     private final SearchBuilder<LoadBalancerVO> ListByIp;
     private final SearchBuilder<LoadBalancerVO> IpAndPublicPortSearch;
     private final SearchBuilder<LoadBalancerVO> AccountAndNameSearch;
+    protected final SearchBuilder<LoadBalancerVO> TransitionStateSearch;
     
     protected final FirewallRulesCidrsDaoImpl _portForwardingRulesCidrsDao = ComponentLocator.inject(FirewallRulesCidrsDaoImpl.class);
 
@@ -66,6 +69,11 @@ protected LoadBalancerDaoImpl() {
         AccountAndNameSearch.and("accountId", AccountAndNameSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
         AccountAndNameSearch.and("name", AccountAndNameSearch.entity().getName(), SearchCriteria.Op.EQ);
         AccountAndNameSearch.done();
+        
+        TransitionStateSearch = createSearchBuilder();
+        TransitionStateSearch.and("networkId", TransitionStateSearch.entity().getNetworkId(), Op.EQ);
+        TransitionStateSearch.and("state", TransitionStateSearch.entity().getState(), Op.IN);
+        TransitionStateSearch.done();
     }
 
     @Override
@@ -118,5 +126,12 @@ public LoadBalancerVO findByAccountAndName(Long accountId, String name) {
         sc.setParameters("name", name);
         return findOneBy(sc);
     }
-    
+    
+    @Override
+    public List<LoadBalancerVO> listInTransitionStateByNetworkId(long networkId) {
+    	 SearchCriteria<LoadBalancerVO> sc = TransitionStateSearch.create();
+         sc.setParameters("networkId", networkId);
+         sc.setParameters("state", State.Add.toString(), State.Revoke.toString());
+         return listBy(sc);
+    }
 }
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -688,8 +688,9 @@ public LoadBalancer createLoadBalancer(CreateLoadBalancerRuleCmd lb, boolean ope
 
     @Override
     public boolean applyLoadBalancerConfig(long lbRuleId) throws ResourceUnavailableException {
-        List<LoadBalancerVO> lbs = new ArrayList<LoadBalancerVO>(1);
-        lbs.add(_lbDao.findById(lbRuleId));
+    	LoadBalancerVO lb = _lbDao.findById(lbRuleId);
+    	//get all rules in transition state
+        List<LoadBalancerVO> lbs = _lbDao.listInTransitionStateByNetworkId(lb.getNetworkId());
         return applyLoadBalancerRules(lbs, true);
     }
 
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -146,7 +146,6 @@
 import com.cloud.network.dao.RemoteAccessVpnDao;
 import com.cloud.network.dao.VirtualRouterProviderDao;
 import com.cloud.network.dao.VpnUserDao;
-import com.cloud.network.element.NetworkElement;
 import com.cloud.network.lb.LoadBalancingRule;
 import com.cloud.network.lb.LoadBalancingRule.LbDestination;
 import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@ public interface LoadBalancerDao extends GenericDao<LoadBalancerVO, Long> {`
`28`	`28`	`List<LoadBalancerVO> listByIpAddress(long ipAddressId);`
`29`	`29`	`LoadBalancerVO findByIpAddressAndPublicPort(long ipAddressId, String publicPort);`
`30`	`30`	`LoadBalancerVO findByAccountAndName(Long accountId, String name);`
`31`		`- List<LoadBalancerVO> listByNetworkId(long networkId);`
	`31`	`+ List<LoadBalancerVO> listByNetworkId(long networkId);`
	`32`	`+ List<LoadBalancerVO> listInTransitionStateByNetworkId(long networkId);`
`32`	`33`	`}`