Commit Graph

809 Commits

Author SHA1 Message Date
Wilder Rodrigues a8cb7c1480 Applygin fix from commit ID aaeadc5c44
Sheng Yang changed 2 classes, ut only one was related to the bug CLOUDSTACK-7605.
I applied the changed on the routerslist, used during the deployment of the virtual routers.

Tested Advanced Zone against the simulator. 69 happy tests in place
2014-10-03 06:21:29 +02:00
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
Antonio Fornie 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
Antonio Fornie 8061c5cadb Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers 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
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
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 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
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
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
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
Antonio Fornie 705ced3a84 Fix dependency problem. Extract and unify router deployment stuff
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-03 06:21:24 +02:00
Antonio Fornie bca81b0573 Extract general behavior to Router and Vpc delegates
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-03 06:21:24 +02:00
amoghvk 0ef6cd36c4 Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect"
This reverts commit 39fe766c2b.
2014-10-02 13:28:52 -07:00
Sanjay Tripathi 39fe766c2b CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.

Also added FirstFitPlannerTest unit test file.
2014-10-01 17:25:41 +05:30
Will Stevens 5d11385c31 CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-09-03 10:07:19 -04:00
Min Chen 47365ac4ba Fix incorrectly written unit tests. 2014-09-02 17:55:44 -07:00
Rohit Yadav 591a686d77 server: fix server package after auth plugin refactor
- Have opensaml dependency to get version from root pom
- add com.cloud.api.auth.APIAuthenticationManagerImpl to spring ctx manager
- Fix getCommands() in APIAuthenticationManagerImpl
- Fix imports in resources, test and src classes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:23 +02:00
Anthony Xu 90fe6d8087 removed trailing space 2014-08-13 11:09:38 -07:00
Rohit Yadav f11dcf8ef5 ApiServletTest: Fix test, now login/logout have their own API/class
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-12 12:01:31 +02:00
Rajani Karuturi 736ff5f8e5 Fixed CLOUDSTACK-7303 [LDAP] while importing ldap users, update the user info if it already exists in cloudstack 2014-08-11 17:54:31 +05:30
Alena Prokharchyk 8b98cc2202 CS-19072: fixed broken pagination and count in listNetworkOfferings 2014-07-28 14:44:04 -07:00
Daan Hoogland 7f14da6406 rats 2014-07-23 21:31:50 +02:00
Daan Hoogland b8112ac79e highlevel 'unit'-test for refactoring of (Vpc)VirtualNetworkApplianceManagerImpl 2014-07-23 21:30:21 +02:00
Murali Reddy 9dc322d46f CLOUDSTACK-7144: No GSLB provider is available during assigning load
balancing rule

this fix ensures any bean implementing GslbProvider interface are injected
into GlobalLoadBalancingRulesServiceImpl.
2014-07-21 16:50:21 +05:30
Daan Hoogland 3b76278b97 rvr4vpc: more interesting test 2014-07-17 15:32:03 +02:00
Likitha Shetty d3e7b43ee9 CLOUDSTACK-7119. [VMware] Don't allow VM reset when VM has snapshots. 2014-07-17 13:32:16 +05:30
Daan Hoogland 27bc791746 rats 2014-07-17 09:23:03 +02:00
Daan Hoogland 5b37c65577 oversimplified test fixed 2014-07-16 17:28:01 +02:00
Daan Hoogland cc37eb50cf checkstyle: unused imports 2014-07-16 16:52:02 +02:00
Daan Hoogland 799258662c rvr4vpc simple test for deployRouter 2014-07-16 16:44:28 +02:00
Hugo Trippaers dbc7d80329 Aggregate command cleanup is not required for the virtual router as we
already cleanup in the finish.

And consequently dies if somebody tries to test with assertions enabled.
2014-07-16 16:24:54 +02:00
Daan Hoogland 5ccd904e83 simple first test for backward compatibility testing in rvr4vpc work 2014-07-16 10:59:58 +02:00
Jayapal 73b622c823 CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate 2014-07-09 14:57:25 +05:30
Nitin Mehta 0c9c5a71b4 CLOUDSTACK-4364: Restore VM - log a usage event for newly created volume 2014-06-30 14:41:37 -07:00
Hugo Trippaers cd0ef09344 Fix typo and add the right exception to the error map. 2014-06-25 15:51:28 +02:00
Daan Hoogland c79ab570b0 Revert "CLOUDSTACK-6967: Initial OVM3 drop"
This reverts commit 8a485b9b59.
2014-06-24 10:24:01 +02:00
Funs 8a485b9b59 CLOUDSTACK-6967: Initial OVM3 drop
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e25)

Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js
2014-06-23 12:39:10 +02:00
Jayapal cc98d44542 CLOUDSTACK-6922: Updated events for firewall ingress and egress 2014-06-19 15:06:56 +05:30
Saksham Srivastava f2464e4182 CLOUDSTACK-6864: UploadSSlCert API requires double encoding of URL params 2014-06-12 10:35:47 +05:30
Tim Mackey a8212d9ef4 Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin
Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-07 04:50:23 -04:00