etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/test/integration/smoke
History
Alena Prokharchyk 1b8a6986a6 Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/async/AsyncJob.java
	api/src/com/cloud/network/NetworkModel.java
	api/src/com/cloud/network/rules/LoadBalancerContainer.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
	client/tomcatconf/commands.properties.in
	engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkModelImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkModelImpl.java
	server/test/resources/appLoadBalancer.xml
	setup/db/db/schema-410to420.sql
	test/integration/component/test_multiple_ip_ranges.py
	test/integration/smoke/test_guest_vlan_range.py
	tools/marvin/marvin/integration/lib/base.py
 		2013-05-08 13:29:43 -07:00
..
__init__.py apply chip childers licensing patches for the test directory 2012-06-26 11:19:58 -04:00
test_affinity_groups.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_deploy_vm_with_userdata.py CLOUDSTACK-2362: correct list append method 2013-05-08 14:26:43 +05:30
test_disk_offerings.py fixing sed replace typo 2012-11-09 18:56:23 +05:30
test_global_settings.py CLOUDSTACK-741: Granular Global Parameters Added parameters to cluster level cluster.storage.allocated.capacity.notificationthreshold cluster.storage.capacity.notificationthreshold 2013-05-01 12:12:37 +05:30
test_guest_vlan_range.py Merge branch 'master' into internallb1 2013-05-08 13:29:43 -07:00
test_hosts.py fixing sed replace typo 2012-11-09 18:56:23 +05:30
test_internal_lb.py InternalLB: marvin integration test for internal lb feature 2013-05-03 11:07:07 -07:00
test_iso.py CLOUDSTACK-2323: fix test scripts to conform with library changes 2013-05-07 13:13:55 -07:00
test_network.py CLOUDSTACK-2363: fixing the scripts to conform with lib changes 2013-05-08 14:26:43 +05:30
test_nic.py CLOUDSTACK-2323: fix test scripts to conform with library changes 2013-05-07 13:13:55 -07:00
test_non_contigiousvlan.py Fixed the incorrect assertion in noncontiguous_vlan test 2013-05-07 13:13:56 -07:00
test_primary_storage.py fixing sed replace typo 2012-11-09 18:56:23 +05:30
test_public_ip_range.py Account object dereferences as account.name 2013-04-24 14:42:44 +05:30
test_regions.py Breaking down region tests 2013-05-08 13:50:04 +05:30
test_routers.py CLOUDSTACK-2323: fix test scripts to conform with library changes 2013-05-07 13:13:55 -07:00
test_scale_vm.py CLOUDSTACK-2323: fix test scripts to conform with library changes 2013-05-07 13:13:55 -07:00
test_secondary_storage.py fixing sed replace typo 2012-11-09 18:56:23 +05:30
test_service_offerings.py Summary: Modifying integration tests to use 128MB service offerings 2013-01-16 10:30:31 -07:00
test_ssvm.py fixing sed replace typo 2012-11-09 18:56:23 +05:30
test_templates.py CLOUDSTACK-2363: fixing the scripts to conform with lib changes 2013-05-08 14:26:43 +05:30
test_vm_life_cycle.py Fixed up the simulator to run with windows paths in cygwin 2013-05-07 13:16:43 -07:00
test_vm_snapshots.py 1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot 2013-05-03 12:32:53 +08:00
test_volumes.py CLOUDSTACK-2359: fix missing network type in the test scripts test_volumes.py and test_templates.py 2013-05-08 14:26:40 +05:30