Commit Graph

86 Commits

Author SHA1 Message Date
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
Srikanteswararao Talluri b8358e109e CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 14:26:44 +05:30
Talluri 1fe50a8d67 CLOUDSTACK-2363: fixing the scripts to conform with lib changes
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 14:26:43 +05:30
Talluri 731cc439a3 CLOUDSTACK-2362: correct list append method
fix userdata integration test
2013-05-08 14:26:43 +05:30
Talluri 93db64fc25 CLOUDSTACK-2359: fix missing network type in the test scripts test_volumes.py and test_templates.py
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 14:26:40 +05:30
Prasanna Santhanam 548a8d8c1f Breaking down region tests
region tests will be run in smoke and regression. In smoke we only test
the basic creation of a region. More extensive testing of duplicate
regions, test for updating region atteributes is in component.

Separated the class for testing accounts within region (account sync)
into a a new suite.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 13:50:04 +05:30
Likitha Shetty 3a41a83f88 [MARVIN] Fixing dedicate_guest_vlan_range test 2013-05-08 11:22:16 +05:30
Prasanna Santhanam 1e4274dd9f Renaming TesDedicateVlanRange -> TestDedicateVlanRange
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:45 -07:00
Prasanna Santhanam 2ca03a8513 moving test data to top level dictionary
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
Alex Huang c745e6d28e Fixed up the simulator to run with windows paths in cygwin 2013-05-07 13:16:43 -07:00
Prasanna Santhanam 46f59cd49e Fixed the incorrect assertion in noncontiguous_vlan test
The assertion fails if the VLAN is found in which case find returns a
positive number. So here the assertion should infact assert < 0 result.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:13:56 -07:00
Prasanna Santhanam bd1dcc10b3 Affinity Groups requires multiple storage pools
Fixing the affinity group test which would fail to find the appropriate
storage pool to satisfy the anti-affinity group of the second VM

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:13:56 -07:00
Talluri 156fd68902 CLOUDSTACK-2323: fix test scripts to conform with library changes
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:13:55 -07:00
Likitha Shetty d5cd3f7e00 Dedicate guest vlan range to account 2013-05-07 13:13:54 -07:00
Prasanna Santhanam 887f405ce3 Renaming TesDedicateVlanRange -> TestDedicateVlanRange
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 15:29:10 +05:30
Prasanna Santhanam 64522b6bd5 moving test data to top level dictionary
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:52:12 +05:30
Alex Huang bc823f946c Fixed up the simulator to run with windows paths in cygwin 2013-05-06 16:34:41 -07:00
Prasanna Santhanam 4c0eecc195 Fixed the incorrect assertion in noncontiguous_vlan test
The assertion fails if the VLAN is found in which case find returns a
positive number. So here the assertion should infact assert < 0 result.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-06 20:39:36 +05:30
Prasanna Santhanam c388f7f180 Affinity Groups requires multiple storage pools
Fixing the affinity group test which would fail to find the appropriate
storage pool to satisfy the anti-affinity group of the second VM

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-06 19:53:42 +05:30
Talluri f0749ce625 CLOUDSTACK-2323: fix test scripts to conform with library changes
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-06 14:55:58 +05:30
Likitha Shetty c8d843241e Dedicate guest vlan range to account 2013-05-06 10:02:41 +05:30
Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1
Conflicts:
	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/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-05-03 12:50:59 -07:00
Alena Prokharchyk 053e18454d InternalLB: marvin integration test for internal lb feature 2013-05-03 11:07:07 -07:00
Mice Xia d7cab21e9a 1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot 2013-05-03 12:32:53 +08:00
Harikrishna Patnala 10b6c1c6c8 CLOUDSTACK-741: Granular Global Parameters Added parameters to cluster level cluster.storage.allocated.capacity.notificationthreshold cluster.storage.capacity.notificationthreshold
CLOUDSTACK-2036
global parameter for Router Template ID functionality added
We use 5 parameters to set the router template name for each hypervisor

Moved cpu.overprovisioning.factor and mem.overprovisioning.factor to be able to update/list using update/list configuration API at cluster level.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-01 12:12:37 +05:30
Harikrishna Patnala deaf9106ca CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
2013-04-29 14:11:51 +05:30
Prasanna Santhanam 762977d7c6 Account object dereferences as account.name
Previously the jsonHelper would incorrectly deserialize the json
response if the object returned had an attribute of the same name
resulting in an additional level of indirection to refer to the entity's
attributes. eg: account.account.name instead of account.name

This fixes the tests that have still the same indirection exposed.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-24 14:42:44 +05:30
Prasanna Santhanam 4e9e7937ed Fix Vijay's test to use the marvin integratin libararies
Changes to marvin_request and base libraries to accomadate POST
requests.

Additional tests for sending userdata through GET Userdata tests - send
size>2k data via GET and POST.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-24 13:43:08 +05:30
Prasanna Santhanam a1912d9ce2 Refactoring vlan and globalsetting tests
Refactoring the vlan and global_setting tests to use the marvin
libraries instead of command classes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-22 19:35:22 +05:30
Prasanna Santhanam 5a0f4b6330 return a ready template even if ostype doesn't match 2013-04-21 17:06:01 +05:30
Prasanna Santhanam 4a0b05a0b2 correcting the zone reference in scalevm test
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-21 16:54:45 +05:30
Prasanna Santhanam dc87d9325e naming conventions for test_modules
Pythonesque is better. Also test_modules should not have executable bit
set as the test runner will not find them.
2013-04-21 14:26:27 +05:30
Prasanna Santhanam d0108b8132 Fixing the incorrect zone typo
zone.networktype reference corrected as part of commit
5ee3cc41fe
2013-04-21 12:33:00 +05:30
Harikrishna Patnala eae22d2ffa CLOUDSTACK-741: Granular Global Parameters
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-19 10:36:52 +05:30
Prasanna Santhanam b12905b7a8 pep8 compliance for cloudstackConnection
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-18 07:44:25 +05:30
Bharat Kumar 8b40e393b8 Cloudstack-701 Support for non contiguous vlan ranges.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-17 10:14:42 +05:30
Srikanteswararao Talluri e7090e6933 CLOUDSTACK-2032: populate mode in the services dict from the list zones instead of hard coding
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-15 18:12:23 +05:30
Talluri 0abfe240c3 CLOUDSTACK-1995: Enhance resize volume tests to support xenserver hypervisor and fix few test flow errors
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-15 12:00:08 +05:30
Prasanna Santhanam 45f852bec2 nose won't discover the test if it is executable.
Changing test_public_ip_range.py to 644

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-12 23:27:43 +05:30
Prasanna Santhanam fd84c56bf9 moving the integration test to the smoke folder
The smoke folder is for the bvts and that's where maven+marvin will pick
up the tests tagged for the simulator run.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-12 23:27:42 +05:30
Prasanna Santhanam 4ae3e5de7f scalevm test: adjust the tags to suit the environment
scalevm works with the xenserver hypervisortype only.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-12 16:32:12 +05:30
Prasanna Santhanam 9de7a68e92 affinitygroup bvt: changes to the bvt for affinity groups
Added tags for the test, base.py extensions for list, craete, delete and
fixes to the test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-11 13:23:39 -07:00
Prasanna Santhanam 943aef76f1 marvin bvt: getting rid of unused keys in the test
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-11 13:23:34 -07:00
Prasanna Santhanam 79812c253f bvt: marvin test for the affinity groups feature
The test deploys two VMs in the simulator context and verifies that the
default host -antiaffinity processor placed the VMs on two distinct
hosts.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-11 13:23:32 -07:00
Prasanna Santhanam e52bf52238 affinity group tests moved into the test folder
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-11 13:23:30 -07:00
Prasanna Santhanam 5d67c98e5b marvin+apidiscovery: Extend API discovery plugin
API discovery plugin will return embedded entities for marvin to
discovery and generate it's API classes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:30 +05:30
Prasanna Santhanam d4dc264917 simulator+marvin: include a router test
Added a test that will ensure the advanced router comes up in the
account belonging to the deployed VM. It should come up with the
publicip, guestip and linklocalip.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:30 +05:30
Prasanna Santhanam 2e2046fe38 marvin changes to do an pre-integration and integration test
Introducing the simulator spring context -
simulatorComponentContext.xml.in. This separates the simulator beans so
that production deployments don't have the simulator in them. Context is
enabled with -Dsimulator as part of the developer profile.

Also adding config files - Simulator Config for advanced zone and basic
zone deployments under setup/dev.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +05:30
Prasanna Santhanam fe48bbebda moving out the vmpasswd into its own suite
vm passwords are extended features that don't need to be part of the
smoke suite.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +05:30
Nitin Mehta 3e4430d811 CLOUDSTACK-658 - Scaleup vm support for Xenserver
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
2013-03-28 16:43:37 +05:30