Commit Graph

6 Commits

Author SHA1 Message Date
Wilder Rodrigues 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
Wilder Rodrigues 7ad7c568d8 Adding fixes for the add user data and vpn rules 2014-10-03 06:21:28 +02:00
Wilder Rodrigues 3ba8599ed6 making sure the instance variable _router in the Rules is being used instead of the parameter
Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-03 06:21:28 +02:00
wrodrigues 00e3af4584 fixing nic plug unplug rule
Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
2014-10-03 06:21:28 +02:00
Wilder Rodrigues 1836e0ba58 auto wire the network helper
Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-03 06:21:28 +02:00
Wilder Rodrigues 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