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

fixing checkstyles 

Conflicts:
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
This commit is contained in:
Wilder Rodrigues 2014-07-14 11:52:51 +02:00 committed by wilderrodrigues
parent 3457d0fbaf
commit bbce7d944b
4 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/network/rules/FirewallRules.java
View File

@ -102,7 +102,7 @@ public class FirewallRules extends RuleApplier {
public Purpose getPurpose() {
return purpose;
}
public void createApplyLoadBalancingRulesCommands(final List<LoadBalancingRule> rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) {
final LoadBalancerTO[] lbs = new LoadBalancerTO[rules.size()];
@ -159,7 +159,7 @@ public class FirewallRules extends RuleApplier {
cmds.addCommand(cmd);
}
public void createApplyPortForwardingRulesCommands(final List<? extends PortForwardingRule> rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) {
List<PortForwardingRuleTO> rulesTO = new ArrayList<PortForwardingRuleTO>();
if (rules != null) {
@ -186,7 +186,7 @@ public class FirewallRules extends RuleApplier {
cmds.addCommand(cmd);
}
public void createApplyStaticNatRulesCommands(final List<? extends StaticNatRule> rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) {
List<StaticNatRuleTO> rulesTO = new ArrayList<StaticNatRuleTO>();
if (rules != null) {
@ -205,7 +205,7 @@ public class FirewallRules extends RuleApplier {
cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
cmds.addCommand(cmd);
}
public void createApplyFirewallRulesCommands(final List<? extends FirewallRule> rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) {
List<FirewallRuleTO> rulesTO = new ArrayList<FirewallRuleTO>();
String systemRule = null;

16
server/src/com/cloud/network/rules/RuleApplier.java
View File

@ -17,8 +17,6 @@
package com.cloud.network.rules;
import javax.inject.Inject;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import com.cloud.dc.dao.DataCenterDao;
@ -40,8 +38,8 @@ import com.cloud.vm.dao.NicDao;
public abstract class RuleApplier {
protected NEWVirtualNetworkApplianceManager applianceManager;
protected NEWVirtualNetworkApplianceManager applianceManager;
protected NetworkModel networkModel;
protected LoadBalancingRulesManager lbMgr;
@ -57,17 +55,17 @@ public abstract class RuleApplier {
protected DataCenterDao dcDao;
protected DomainRouterDao routerDao;
protected NetworkDao networkDao;
protected FirewallRulesDao rulesDao;
protected VirtualMachineManager itMgr;
protected Network network;
protected VirtualRouter router;
protected RouterControlHelper routerControlHelper;
public RuleApplier(final Network network) {
@ -83,7 +81,7 @@ public abstract class RuleApplier {
public VirtualRouter getRouter() {
return router;
}
public void setManager(final NEWVirtualNetworkApplianceManager applianceManager) {
this.applianceManager = applianceManager;
}

18
server/src/com/cloud/network/rules/RuleApplierWrapper.java
View File

@ -20,13 +20,13 @@ package com.cloud.network.rules;
public class RuleApplierWrapper<T> {
private T ruleType;
public RuleApplierWrapper(T ruleApplier) {
this.ruleType = ruleApplier;
}
public T getRuleType() {
return ruleType;
}
private final T ruleType;
public RuleApplierWrapper(final T ruleApplier) {
this.ruleType = ruleApplier;
}
public T getRuleType() {
return ruleType;
}
}

30
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
View File

@ -44,10 +44,10 @@ public class VirtualNetworkApplianceFactory {
@Inject
protected DomainRouterDao routerDao;
@Inject
protected NetworkDao networkDao;
@Inject
protected FirewallRulesDao rulesDao;
@ -63,7 +63,7 @@ public class VirtualNetworkApplianceFactory {
return lbRules;
}
public FirewallRules createFirewallRules(final Network network,
final List<? extends FirewallRule> rules) {
FirewallRules fwRules = new FirewallRules(network, rules);
@ -72,19 +72,19 @@ public class VirtualNetworkApplianceFactory {
fwRules.networkDao = networkDao;
fwRules.rulesDao = rulesDao;
return fwRules;
}
private void initBeans(RuleApplier applier) {
applier.networkModel = this.networkModel;
applier.dcDao = this.dcDao;
applier.lbMgr = this.lbMgr;
applier.loadBalancerDao = this.loadBalancerDao;
applier.configDao = this.configDao;
applier.nicDao = this.nicDao;
applier.networkOfferingDao = this.networkOfferingDao;
applier.routerDao = this.routerDao;
applier.routerControlHelper = this.routerControlHelper;
private void initBeans(final RuleApplier applier) {
applier.networkModel = networkModel;
applier.dcDao = dcDao;
applier.lbMgr = lbMgr;
applier.loadBalancerDao = loadBalancerDao;
applier.configDao = configDao;
applier.nicDao = nicDao;
applier.networkOfferingDao = networkOfferingDao;
applier.routerDao = routerDao;
applier.routerControlHelper = routerControlHelper;
}
}