etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resetting unwanted files similar to 3.0.x

This commit is contained in:
Vijay 2012-07-24 10:45:25 +05:30
parent 39a42ef224
commit 62082b0de6
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-common.xml
View File

@ -48,7 +48,7 @@
<echo message="Compiling @{top.dir}/src"/>
<javac srcdir="@{top.dir}/src" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${classes.dir}/@{jar.name}"
source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false" compiler="javac1.6"
memoryinitialsize="256m" memorymaximumsize="512m" fork="true">
memoryinitialsize="512m" memorymaximumsize="1024m" fork="true">
<!-- compilerarg line="-processor com.cloud.annotation.LocalProcessor -processorpath ${base.dir}/tools/src -Xlint:all"/ -->
<!-- compilerarg line="-processor com.cloud.utils.LocalProcessor -processorpath ${base.dir}/utils/src -Xlint:all"/ -->
<compilerarg line="-Xlint:-path"/>

30
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -223,7 +223,7 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
serviceResponse.setName(service.getName());
if ("Lb".equalsIgnoreCase(service.getName())) {
Map<Capability, String> serviceCapabilities = serviceCapabilitiesMap
.get(service);
.get(service);
if (serviceCapabilities != null) {
for (Capability capability : serviceCapabilities
.keySet()) {
@ -910,7 +910,7 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
try {
if (ipVO.getAssociatedWithNetworkId() == null) {
boolean assignToVpcNtwk = network.getVpcId() != null
&& ipVO.getVpcId() != null && ipVO.getVpcId().longValue() == network.getVpcId();
&& ipVO.getVpcId() != null && ipVO.getVpcId().longValue() == network.getVpcId();
if (assignToVpcNtwk) {
// set networkId just for verification purposes
_networkMgr.checkIpForService(ipVO, Service.Lb, lb.getNetworkId());
@ -945,10 +945,10 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
if (performedIpAssoc) {
ipVO = _ipAddressDao.findById(ipVO.getId());
_networkMgr.unassignIPFromVpcNetwork(ipVO.getId(), lb.getNetworkId());
}
}
}
}
if (result == null) {
throw new CloudRuntimeException("Failed to create load balancer rule: " + lb.getName());
@ -1227,24 +1227,6 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
return dstList;
}
public List<LbCondition> getExistingPolicyConditions(long policyId) {
List<LbCondition> conditionList = new ArrayList<LbCondition>();
return conditionList;
// List<LoadBalancerVMMapVO> lbVmMaps = _lb2VmMapDao.listByLoadBalancerId(lbId);
// LoadBalancerVO lb = _lbDao.findById(lbId);
//
// String dstIp = null;
// for (LoadBalancerVMMapVO lbVmMap : lbVmMaps) {
// UserVm vm = _vmDao.findById(lbVmMap.getInstanceId());
// Nic nic = _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(lb.getNetworkId(), vm.getId());
// dstIp = nic.getIp4Address();
// LbDestination lbDst = new LbDestination(lb.getDefaultPortStart(), lb.getDefaultPortEnd(), dstIp,
// lbVmMap.isRevoke());
// dstList.add(lbDst);
// }
// return dstList;
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
@ -1540,10 +1522,10 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
}
protected void removeLBRule(LoadBalancerVO rule) {
//remove the rule
_lbDao.remove(rule.getId());
// if the rule is the last one for the ip address assigned to VPC, unassign it from the network
IpAddress ip = _ipAddressDao.findById(rule.getSourceIpAddressId());
_networkMgr.unassignIPFromVpcNetwork(ip.getId(), rule.getNetworkId());