etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,905 Commits 323 Branches 325 Tags 912 MiB
Commit Graph

25905 Commits

Author SHA1 Message Date
Gaurav Aradhye bd9d57e20c CLOUDSTACK-7690: Added missing unittest import to test_escalations_volumes.py 
fixed pep8 issues

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-15 11:02:33 +05:30
Gaurav Aradhye ac820a3230 CLOUDSTACK-7690: Added missing unittest import to test_escalations_volumes.py 
fixed pep8 issues

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-15 11:01:39 +05:30
Gaurav Aradhye 159a372fdd CLOUDSTACK-7693: Fixing pep8 issues 
pep8 fixes for test_routers.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-15 10:58:15 +05:30
Gaurav Aradhye 35e05a69a5 CLOUDSTACK-7693: Fixing pep8 issues 
pep8 fixes for test_routers.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-15 10:56:55 +05:30
sailajamada 58cfbcdf98 vGPU VMSnapshot Test Automation 2014-10-15 10:32:34 +05:30
Mike Tutkowski e70dde09c9 Implementing snapshot-strategy support for reverting a volume to a snapshot 2014-10-14 22:04:18 -06:00
amoghvk 71c9804165 Fixing possible formatting issue with license header, causing builds to fail. Works well locally 2014-10-14 14:37:38 -07:00
Jessica Wang 26f3e8499a CLOUDSTACK-7723: UI > Storage > detail view > add Disk Offering field. 2014-10-14 14:17:39 -07:00
Jessica Wang 340bcc60c0 CLOUDSTACK-7723: UI > Storage > detail view > add Disk Offering field. 2014-10-14 14:02:29 -07:00
Mike Tutkowski 35a8b70799 Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage) 2014-10-14 12:26:40 -06:00
Min Chen e7fa3a2959 CLOUDSTACK-7563: Fix potential NPE from FingBugs. 2014-10-14 11:21:01 -07:00
Min Chen 4b8bfe2627 CLOUDSTACK-7563: Fix potential NPE from FingBugs. 2014-10-14 11:19:39 -07:00
Daan Hoogland 771d052381 Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack 2014-10-14 20:14:50 +02:00
wilderrodrigues 1e87d7b266 Fixing checkstyle. 
Making local variable compatible with our checkstyle settings.
 2014-10-14 15:25:50 +02:00
wilderrodrigues 2ed64b2356 Applying fix from commit id 6b8e0baa21 
Changes by Edilson Su: if vpc public network with snat enabled, then will triger this issue.
 2014-10-14 15:10:14 +02:00
Wilder Rodrigues db86bdfb2c 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-14 15:08:13 +02:00
Wilder Rodrigues c81b3380df 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-14 15:08:13 +02:00
wrodrigues 3ac2e222e8 CLOUDSTACK-6278 Baremetal Advanced Networking support from commit id e06fa18ed2 by Frank Zhang 
Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
 2014-10-14 15:08:13 +02:00
wrodrigues 4e21948f5c Fixing the NetworkHelperImpl class. It was throwing a NPE due to a hypervisor type SIMULATOR not being in the hashmap. 
When the refactor took place, we should have changed first structure, then behaviour. By refactoring the deployRouter method
we changed how the templateName was retrieved.
Fixed and tested using the simulator and the following Marvin tests

test_privategateway_acl
test_routers
test_vpc_vpn
test_service_offerings
test_volumes
test_reset_vm_on_reboot
test_multipleips_per_nic

Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
 2014-10-14 15:08:12 +02:00
wrodrigues 025ff72410 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-14 15:08:12 +02:00
Wilder Rodrigues 9f801d1f3a 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-14 15:08:12 +02:00
Wilder Rodrigues 60eea3bb1a Adding fixes for the add user data and vpn rules 2014-10-14 15:08:11 +02:00
Wilder Rodrigues f2f4732854 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-14 15:08:11 +02:00
wrodrigues 251e7ff740 removing the root password becuase it was breaking the simulator tests. Root password must always be empty 2014-10-14 15:08:11 +02:00
Wilder Rodrigues dc5fefc018 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-14 15:08:11 +02:00
Antonio Fornie 64eed6c6ab Fix: VpcRouter has always PublicIp setup as it did before refactoring 2014-10-14 15:08:10 +02:00
Wilder Rodrigues ee9068b5b2 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-14 15:08:10 +02:00
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