apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,855 Commits 307 Branches 324 Tags
Commit Graph

8631 Commits

Author SHA1 Message Date
wrodrigues
b7c193a88d fixing nic plug unplug rule 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
 2014-10-14 15:08:10 +02:00
wrodrigues
5f51a06e3c fix dhcp subnet rules. we can create VMs again. 2014-10-14 15:08:10 +02:00
Antonio Fornie
02c75251b3 Fixing NPE due to use of dependencies before Spring injection 2014-10-14 15:08:09 +02:00
Antonio Fornie
cd8cadaf9c Refactor hypervisor retrieval from VpcNwHelper and NwHelper 
Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
	server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
	server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 2014-10-14 15:08:09 +02:00
Wilder Rodrigues
65fb21647a auto wire the network helper 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:08:09 +02:00
Wilder Rodrigues
546e563c27 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-14 15:08:09 +02:00
Antonio Fornie
b5e96af4e2 Missing license headers 2014-10-14 15:02:14 +02:00
Antonio Fornie
2802d3b75b Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers 2014-10-14 15:02:14 +02:00
Wilder Rodrigues
e08cb11fc0 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-14 15:02:14 +02:00
wrodrigues
01edc8e394 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-14 15:02:13 +02:00
Antonio Fornie
b9bff843c6 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-14 15:02:13 +02:00
Antonio Fornie
3d4ddb7251 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-14 15:02:13 +02:00
wrodrigues
adebaf2bd0 adding applyStaticRoutes to the new visitor pattern. 2014-10-14 15:02:13 +02:00
Wilder Rodrigues
b96035f356 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-14 15:02:12 +02:00
Antonio Fornie
2da3ceda31 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-14 15:02:12 +02:00
Wilder Rodrigues
00dc8a7b24 fixing check styles 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:02:12 +02:00
wrodrigues
16ad4122b4 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-14 15:02:11 +02:00
Antonio Fornie
95d32b4d0d Fix unnecessary changes Spring contexts 2014-10-14 15:01:17 +02:00
Antonio Fornie
0d81cf09f6 Increasing test coverage for Vpc Deployment 2014-10-14 15:01:16 +02:00
Antonio Fornie
240a539d43 Factor out prepareDeployment and update tests 2014-10-14 15:01:16 +02:00
Antonio Fornie
d2d9157ab0 Complete tests for normal deployment and start vpc one 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
 2014-10-14 15:01:16 +02:00
Wilder Rodrigues
12b0d188cb 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-14 15:01:16 +02:00
Antonio Fornie
a83f5790eb License headers 2014-10-14 15:01:15 +02:00
Antonio Fornie
6fac12675d More refactoring and testing in the same classes 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
 2014-10-14 15:01:15 +02:00
Antonio Fornie
f3c04172a4 RouterDeployment and VPC. Improving code and Unit Testing 2014-10-14 15:01:14 +02:00
Antonio Fornie
8852153d0c Splitting Vpc and NonVpc deployment into phases & testing it 2014-10-14 15:01:14 +02:00
Wilder Rodrigues
325026de3f fixing VPC IP Association and ACL rules. Have to rewrite in a better why the apply rules method in the Advanced Topology 2014-10-14 15:01:14 +02:00
Wilder Rodrigues
b97f2b05c7 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-14 15:01:14 +02:00
Antonio Fornie
f23ba91ed1 Fixing null pointers during vpc router deployment 2014-10-14 15:01:13 +02:00
Wilder Rodrigues
bfd4316b58 adding new bean to spring context file; renaming package from "com" to "org" 2014-10-14 15:01:13 +02:00
Wilder Rodrigues
8437c2fda0 removing bean from the xml 2014-10-14 15:01:13 +02:00
Wilder Rodrigues
e35fded401 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-14 15:01:12 +02:00
Wilder Rodrigues
0b78731bc7 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-14 15:01:12 +02:00
Antonio Fornie
95395f9574 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-14 15:01:12 +02:00
wrodrigues
e99b5b0760 fixing the injection of the networkDao 
Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
 2014-10-14 15:00:33 +02:00
Daan Hoogland
c76952b5ff whitespace 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
 2014-10-14 15:00:33 +02:00
wrodrigues
d15329679b 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-14 15:00:33 +02:00
Wilder Rodrigues
8f313ca5d3 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-14 15:00:32 +02:00
Wilder Rodrigues
b9ffe2329e 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-14 15:00:32 +02:00
Wilder Rodrigues
f0189ac3c3 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-14 15:00:32 +02:00
Antonio Fornie
631b561d9c Unify and encapsulate deployment flow methods and params 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-14 15:00:31 +02:00
Wilder Rodrigues
299c42c336 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-14 14:55:26 +02:00
Wilder Rodrigues
87f0e68983 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-14 14:55:25 +02:00
Antonio Fornie
a98253296a Temporary put state info in a state object 2014-10-14 14:55:25 +02:00
Daan Hoogland
e1866bf90d package rename 
Conflicts:
	server/src/com/cloud/network/rules/DhcpEntryRules.java
	server/src/com/cloud/network/rules/DhcpSubNetRules.java
 2014-10-14 14:55:25 +02:00
Antonio Fornie
563f853d59 Fix offering setup 2014-10-14 14:55:24 +02:00
Wilder Rodrigues
6b2d35c8c2 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-14 14:55:24 +02:00
Wilder Rodrigues
f965fb9672 adding apache license headers 2014-10-14 14:55:24 +02:00
Wilder Rodrigues
7e98e3e132 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-14 14:55:23 +02:00
Wilder Rodrigues
fb8973f1e2 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-14 14:55:23 +02:00