gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-29 08:41:00 +00:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
24,808 Commits 394 Branches 330 Tags 894 MiB
085bbb71b2
Commit Graph

24808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Fornie
085bbb71b2 Missing license headers 2014-10-03 06:21:28 +02:00
Antonio Fornie
8061c5cadb Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers 2014-10-03 06:21:27 +02:00
Wilder Rodrigues
51ce93579e fixing check style issues 
Conflicts:
	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
	server/src/com/cloud/network/rules/AdvancedVpnRules.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/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
 2014-10-03 06:21:27 +02:00
wrodrigues
07be4945df adding setupPrivateGateway to new style; 
removing methods from Vpc appliance;
changing the way VpcElement calls the command;

there is still work tob e done with the destroyPrivateGateway rule.

Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
 2014-10-03 06:21:27 +02:00
Antonio Fornie
5489130ef5 Whole router.deployment package got 97% coverage 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
	server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 2014-10-03 06:21:27 +02:00
Antonio Fornie
c43e6efd10 DeployRouter includes nw creation following TellDontAsk principle 
Also factor out NicProfile specific methods and fix some DI config.

Conflicts:
	server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
	server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 2014-10-03 06:21:27 +02:00
wrodrigues
0de16e0398 adding applyStaticRoutes to the new visitor pattern. 2014-10-03 06:21:27 +02:00
Wilder Rodrigues
51df3aa0f2 adding applyStaticRoutes method to the network topology/visitor. it will be used by the VPC virtual net manager appliance. 
Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
 2014-10-03 06:21:27 +02:00
Antonio Fornie
a515d6c313 Refactor to include network creation as actual deployment 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
	server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
	server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 2014-10-03 06:21:27 +02:00
Wilder Rodrigues
d6b4355e2b fixing check styles 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-03 06:21:27 +02:00
wrodrigues
0ad3661564 moving sendCommand to the NetworkGeneralHelper; 
adding handle single network method to the NetworkGeneralHelper;
moving getRealPriority to the NetworkGeneralHelper;
making priority constants part of the VirtualNetworkApplianceManager;
changing the network topology implementation in order to use the NetworkGeneralManager instead of the appliance

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-03 06:21:27 +02:00
Antonio Fornie
9d9e4407a4 Fix unnecessary changes Spring contexts 2014-10-03 06:21:27 +02:00
Antonio Fornie
9289f31091 Increasing test coverage for Vpc Deployment 2014-10-03 06:21:27 +02:00
Antonio Fornie
f0cae57e2d Factor out prepareDeployment and update tests 2014-10-03 06:21:27 +02:00
Antonio Fornie
eff9b8d570 Complete tests for normal deployment and start vpc one 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
 2014-10-03 06:21:27 +02:00
Wilder Rodrigues
3008ce38ee Replacing the old [Vpc}VirtualNetworkApplianceManager by the new ones; 
Implement the missing commands related to DHCP PV Lan and DHCP SubNet

Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/DhcpRules.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/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
 2014-10-03 06:21:26 +02:00
Antonio Fornie
440089c3f5 License headers 2014-10-03 06:21:26 +02:00
Antonio Fornie
d0467731de More refactoring and testing in the same classes 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
 2014-10-03 06:21:26 +02:00
Antonio Fornie
3f021625a2 RouterDeployment and VPC. Improving code and Unit Testing 2014-10-03 06:21:26 +02:00
Antonio Fornie
70644157c5 Splitting Vpc and NonVpc deployment into phases & testing it 2014-10-03 06:21:26 +02:00
Wilder Rodrigues
6e2cb08375 fixing VPC IP Association and ACL rules. Have to rewrite in a better why the apply rules method in the Advanced Topology 2014-10-03 06:21:26 +02:00
Wilder Rodrigues
acc3f23645 apply network acls; acls items to pvt gw; vpc ip association 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-03 06:21:26 +02:00
Antonio Fornie
8a1462c9cc Fixing null pointers during vpc router deployment 2014-10-03 06:21:26 +02:00
Wilder Rodrigues
6852f31271 adding new bean to spring context file; renaming package from "com" to "org" 2014-10-03 06:21:26 +02:00
Wilder Rodrigues
ea34c11d83 removing bean from the xml 2014-10-03 06:21:26 +02:00
Wilder Rodrigues
83a2cd945c commenting broken code in tests in order to run build adn tests other changes via the UI 
Conflicts:
	server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
 2014-10-03 06:21:26 +02:00
Wilder Rodrigues
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
Wilder Rodrigues
e6b1a3c7e4 replacing my IP by localhost to avoid problems with my environment 2014-10-03 06:21:26 +02:00
Antonio Fornie
09763596d0 Deployment more OO - Objects with data and behavior 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-03 06:21:26 +02:00
wrodrigues
7de179d464 fixing the injection of the networkDao 
Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
 2014-10-03 06:21:25 +02:00
Daan Hoogland
0c2051b5f1 whitespace 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
 2014-10-03 06:21:25 +02:00
wrodrigues
66aec9a808 fixing injection of beans with a relationship 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-03 06:21:25 +02:00
Wilder Rodrigues
d86f589a1c adding user data pwd rules 
Conflicts:
	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/BasicNetworkTopology.java
 2014-10-03 06:21:25 +02:00
Wilder Rodrigues
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
Wilder Rodrigues
2b95723adb adding userdata to router and ssh pub key to router rules. 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
 2014-10-03 06:21:25 +02:00
Antonio Fornie
d306dfc194 Unify and encapsulate deployment flow methods and params 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-03 06:21:25 +02:00
Wilder Rodrigues
b14f42665e adding password to router rules; moving the advance code to the advance net topology. 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-03 06:21:25 +02:00
Wilder Rodrigues
514beef30e fixing the classes relationship; adding beans properly in the spring context; using the right basic/advance stuff; testing ip and port forwarding rules 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
 2014-10-03 06:21:25 +02:00
Antonio Fornie
3d16a407c9 Temporary put state info in a state object 2014-10-03 06:21:25 +02:00
Daan Hoogland
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
Antonio Fornie
6188adb970 Fix offering setup 2014-10-03 06:21:25 +02:00
Wilder Rodrigues
5b60394a3a adding Ip Association and VPN Rules 
Conflicts:
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
	server/src/com/cloud/network/topology/NetworkTopologyVisitor.java
 2014-10-03 06:21:25 +02:00
Wilder Rodrigues
91dfad4a97 adding apache license headers 2014-10-03 06:21:25 +02:00
Wilder Rodrigues
7b59dce792 we have to check if VPC is null bfore calling it. VPC is not used in gest networks, so deploying a new VM was broken. 2014-10-03 06:21:24 +02:00
Wilder Rodrigues
00f39e6b51 adding static nat rules. Deploying new VMs is not working due to the appliance refactory, will check the changes with Antonio tomorrow. 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
 2014-10-03 06:21:24 +02:00
Daan Hoogland
08cf6b11a1 TODO 2014-10-03 06:21:24 +02:00
Wilder Rodrigues
1365acd200 finished firewall rules and load balancing rules; fixed all the injection problems; added VirtualMachineManager to the appliance factory to be injected. 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/NEWVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
 2014-10-03 06:21:24 +02:00
Wilder Rodrigues
b56b62b9d4 fixing checkstyles 
Conflicts:
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
 2014-10-03 06:21:24 +02:00
Wilder Rodrigues
5f5bbe1988 changing accessor modifier in instance variables 2014-10-03 06:21:24 +02:00
Wilder Rodrigues
db844438b4 Adding Firewall Rules to comply with the Visitor pattern implementation; refactoring the applyRules so we can reuse it. 
Conflicts:
	server/src/com/cloud/network/rules/LoadBalancingRules.java
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
	server/src/com/cloud/network/topology/NetworkTopology.java
 2014-10-03 06:21:24 +02:00