From e344cf250af6a67a17f082f1c646e6ef5ce9a0a7 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Mon, 8 Apr 2013 16:57:47 -0700 Subject: [PATCH] InternalLB - removed unused code from LoadBalancerDao --- .../cloud/network/dao/FirewallRulesDao.java | 1 - .../cloud/network/dao/LoadBalancerDao.java | 5 -- .../network/dao/LoadBalancerDaoImpl.java | 67 +------------------ 3 files changed, 3 insertions(+), 70 deletions(-) diff --git a/server/src/com/cloud/network/dao/FirewallRulesDao.java b/server/src/com/cloud/network/dao/FirewallRulesDao.java index 0bbaa93363d..6b9b3bb83e5 100644 --- a/server/src/com/cloud/network/dao/FirewallRulesDao.java +++ b/server/src/com/cloud/network/dao/FirewallRulesDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.host.HostVO; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRuleVO; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/network/dao/LoadBalancerDao.java b/server/src/com/cloud/network/dao/LoadBalancerDao.java index 2a3e92e99df..331f7555d81 100644 --- a/server/src/com/cloud/network/dao/LoadBalancerDao.java +++ b/server/src/com/cloud/network/dao/LoadBalancerDao.java @@ -22,14 +22,9 @@ import com.cloud.network.rules.LoadBalancerContainer.Scheme; import com.cloud.utils.db.GenericDao; public interface LoadBalancerDao extends GenericDao { - List listInstancesByLoadBalancer(long loadBalancerId); List listByIpAddress(long ipAddressId); - LoadBalancerVO findByIpAddressAndPublicPort(long ipAddressId, String publicPort); - - LoadBalancerVO findByAccountAndName(Long accountId, String name); - List listByNetworkIdAndScheme(long networkId, Scheme scheme); List listInTransitionStateByNetworkIdAndScheme(long networkId, Scheme scheme); diff --git a/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java b/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java index 39a3aac8af3..c20d8b23d6a 100644 --- a/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java +++ b/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java @@ -16,15 +16,11 @@ // under the License. package com.cloud.network.dao; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.ArrayList; import java.util.List; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.network.rules.FirewallRule.State; @@ -33,23 +29,11 @@ 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; @Component @Local(value = { LoadBalancerDao.class }) public class LoadBalancerDaoImpl extends GenericDaoBase implements LoadBalancerDao { - private static final Logger s_logger = Logger.getLogger(LoadBalancerDaoImpl.class); - private static final String LIST_INSTANCES_BY_LOAD_BALANCER = "SELECT vm.id " + - " FROM vm_instance vm, load_balancer lb, ip_forwarding fwd, user_ip_address ip " + - " WHERE lb.id = ? AND " + - " fwd.group_id = lb.id AND " + - " fwd.forwarding = 0 AND " + - " fwd.private_ip_address = vm.private_ip_address AND " + - " lb.ip_address = ip.public_ip_address AND " + - " ip.data_center_id = vm.data_center_id "; private final SearchBuilder ListByIp; - private final SearchBuilder IpAndPublicPortSearch; - private final SearchBuilder AccountAndNameSearch; protected final SearchBuilder TransitionStateSearch; @Inject protected FirewallRulesCidrsDao _portForwardingRulesCidrsDao; @@ -61,43 +45,13 @@ public class LoadBalancerDaoImpl extends GenericDaoBase im ListByIp.and("scheme", ListByIp.entity().getScheme(), SearchCriteria.Op.EQ); ListByIp.done(); - IpAndPublicPortSearch = createSearchBuilder(); - IpAndPublicPortSearch.and("ipAddressId", IpAndPublicPortSearch.entity().getSourceIpAddressId(), SearchCriteria.Op.EQ); - IpAndPublicPortSearch.and("publicPort", IpAndPublicPortSearch.entity().getSourcePortStart(), SearchCriteria.Op.EQ); - IpAndPublicPortSearch.done(); - - AccountAndNameSearch = createSearchBuilder(); - 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.and("scheme", TransitionStateSearch.entity().getScheme(), Op.EQ); TransitionStateSearch.done(); } - - @Override - public List listInstancesByLoadBalancer(long loadBalancerId) { - Transaction txn = Transaction.currentTxn(); - String sql = LIST_INSTANCES_BY_LOAD_BALANCER; - PreparedStatement pstmt = null; - List instanceList = new ArrayList(); - try { - pstmt = txn.prepareAutoCloseStatement(sql); - pstmt.setLong(1, loadBalancerId); - - ResultSet rs = pstmt.executeQuery(); - while (rs.next()) { - Long vmId = rs.getLong(1); - instanceList.add(vmId); - } - } catch (Exception ex) { - s_logger.error("error getting recent usage network stats", ex); - } - return instanceList; - } - + @Override public List listByIpAddress(long ipAddressId) { SearchCriteria sc = ListByIp.create(); @@ -113,27 +67,12 @@ public class LoadBalancerDaoImpl extends GenericDaoBase im return listBy(sc); } - @Override - public LoadBalancerVO findByIpAddressAndPublicPort(long ipAddressId, String publicPort) { - SearchCriteria sc = IpAndPublicPortSearch.create(); - sc.setParameters("ipAddressId", ipAddressId); - sc.setParameters("publicPort", publicPort); - return findOneBy(sc); - } - - @Override - public LoadBalancerVO findByAccountAndName(Long accountId, String name) { - SearchCriteria sc = AccountAndNameSearch.create(); - sc.setParameters("accountId", accountId); - sc.setParameters("name", name); - return findOneBy(sc); - } - @Override public List listInTransitionStateByNetworkIdAndScheme(long networkId, Scheme scheme) { SearchCriteria sc = TransitionStateSearch.create(); sc.setParameters("networkId", networkId); sc.setParameters("state", State.Add.toString(), State.Revoke.toString()); + sc.setParameters("scheme", scheme); return listBy(sc); }