f79e7cdcff
Applying the latest chances from the VPC Refactor branch onto the new one.
...
We will keep this branch as clean as possible to avoid problems with merge.
2014-10-03 06:21:29 +02:00
b9485761fd
Changing the way the DAOs were being injected in the RuleApplier;
...
Making code clearer and simple.
Conflicts:
server/src/com/cloud/network/rules/PrivateGatewayRules.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
2014-10-03 06:21:28 +02:00
bc90ce0871
refactor all private methods in the virtual router appliance and VPC appliance
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/com/cloud/network/rules/RuleApplier.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
2014-10-03 06:21:28 +02:00
4ae9e67a5b
fixing import in virtual router element and checkstyle in dhcp entry related changes
...
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
2014-10-03 06:21:26 +02:00
017aac9c23
making instance variables compliant with ACS convention
...
Conflicts:
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-03 06:21:25 +02:00
0a08829153
package rename
...
Conflicts:
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/com/cloud/network/rules/DhcpSubNetRules.java
2014-10-03 06:21:25 +02:00
Wilder Rodrigues
Daan Hoogland