9379d1a104
fixing checkstyle in the virtual network manager. problem appeared after a rebase. probably due to my saving action in the eclipse workspace
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
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
7ad7c568d8
Adding fixes for the add user data and vpn rules
2014-10-03 06:21:28 +02:00
70bd734be7
Removing the VirtualNetworkStatus, it was not being used properly;
...
fixing the injection of the network DAO in the PrivateGatewayRules;
all tests that were failing in Travis have been tested before the commit.
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-03 06:21:28 +02:00
13ccdcb0ce
removing the root password becuase it was breaking the simulator tests. Root password must always be empty
2014-10-03 06:21:28 +02:00
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
961e71562b
Fix: VpcRouter has always PublicIp setup as it did before refactoring
2014-10-03 06:21:28 +02:00
a18e01cfde
merging cmd-visitor into cmd-visitor-rebase, with the upstream from ACS repo
...
Conflicts:
server/src/com/cloud/network/rules/DhcpRules.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
2014-10-03 06:21:28 +02:00
00e3af4584
fixing nic plug unplug rule
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
2014-10-03 06:21:28 +02:00
bb66060c40
fix dhcp subnet rules. we can create VMs again.
2014-10-03 06:21:28 +02:00
34f2863e63
Fixing NPE due to use of dependencies before Spring injection
2014-10-03 06:21:28 +02:00
0d17f3bad4
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-03 06:21:28 +02:00
1836e0ba58
auto wire the network helper
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.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
085bbb71b2
Missing license headers
2014-10-03 06:21:28 +02:00
8061c5cadb
Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers
2014-10-03 06:21:27 +02:00
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
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
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
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
0de16e0398
adding applyStaticRoutes to the new visitor pattern.
2014-10-03 06:21:27 +02:00
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
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
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
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
9d9e4407a4
Fix unnecessary changes Spring contexts
2014-10-03 06:21:27 +02:00
9289f31091
Increasing test coverage for Vpc Deployment
2014-10-03 06:21:27 +02:00
f0cae57e2d
Factor out prepareDeployment and update tests
2014-10-03 06:21:27 +02:00
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
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
440089c3f5
License headers
2014-10-03 06:21:26 +02:00
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
3f021625a2
RouterDeployment and VPC. Improving code and Unit Testing
2014-10-03 06:21:26 +02:00
70644157c5
Splitting Vpc and NonVpc deployment into phases & testing it
2014-10-03 06:21:26 +02:00
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
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
8a1462c9cc
Fixing null pointers during vpc router deployment
2014-10-03 06:21:26 +02:00
6852f31271
adding new bean to spring context file; renaming package from "com" to "org"
2014-10-03 06:21:26 +02:00
ea34c11d83
removing bean from the xml
2014-10-03 06:21:26 +02:00
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
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
e6b1a3c7e4
replacing my IP by localhost to avoid problems with my environment
2014-10-03 06:21:26 +02:00
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
7de179d464
fixing the injection of the networkDao
...
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
2014-10-03 06:21:25 +02:00
0c2051b5f1
whitespace
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
2014-10-03 06:21:25 +02:00
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
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
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
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
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
wrodrigues
Antonio Fornie
Daan Hoogland