Commit Graph

856 Commits

Author SHA1 Message Date
miguelaferreira bb1c70b3d8 Test if config specifies a zone before using it
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-07-23 20:30:33 +05:30
Ashutosh K 613eb12104 CLOUDSTACK-7044: Portable IP Range test case changes - reading portable ip range from test_data.py file 2014-07-22 07:44:35 -04:00
sanjeev 4596ae9aac Changed delete method signature inside VirtualMachine class. From 4.3 onwards vm destroy has expunge parameter to expunge the vm immediately.
Signed-off-by: sanjeev <sanjeev@apache.org>
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-07-22 11:50:01 +05:30
Ashutosh K 6f9b3cc9d1 CLOUDSTACK-7108: Reading provisioningtype for disk offering in base.py 2014-07-16 20:41:02 -04:00
sanjeevneelarapu dfee7b1456 CLOUDSTACK-6992 Test data was passed to test methods.Made code changes to get test data and pass it to test methods. Also reading portable ip config values was not proper in getPortableIpRangeServices method. So corrected it
CLOUDSTACK-6992: Incorporated review comments for patch request 23009

CLOUDSTACK-6992: Added portable ip range to services class

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-07-16 13:05:56 +05:30
Vania Xu 89a326a878 Update to retrieve additional properties for testing.
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
2014-07-08 15:01:50 -06:00
John Dilley 63ba1ddfb9 CLOUDSTACK-7010: Add domain to createZones in marvin 2014-07-08 22:28:56 +05:30
Koushik Das a413536f90 Added a simulator based test for VM sync 2014-07-07 12:57:55 +05:30
SrikanteswaraRao Talluri 2148a1a64d CLOUDSTACK-7009: add ability to handle serviceofferingdetails to base.py
to support creation of service offering upon passing details in the  following format
            serviceofferingdetails[1].key=pciDevice
            serviceofferingdetails[1].value=Group of NVIDIA Corporation GK107GL [GRID K1] GPUs
            serviceofferingdetails[2].key=vgpuType
            serviceofferingdetails[2].value=GRID K120Q
2014-06-30 19:23:03 +05:30
John Dilley 477a812a6f CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-25 19:42:43 +02:00
Gaurav Aradhye 0df156c09e CLOUDSTACK-6984: Resolving issues found during simulator run 2014-06-24 20:54:05 +05:30
Girish Shilamkar e054154ca0 LOUDSTACK-6861: Fixing nfs mount path 2014-06-19 18:42:43 +05:30
Gaurav Aradhye e7fe391be4 CLOUDSTACK-1466: Automatiion - Primary Storage Limits test cases 2014-06-18 13:15:21 +05:30
Santhosh Edukulla 7c15f148da CLOUDSTACK-6914: Fixed the mentioned issue
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-06-17 14:26:44 +05:30
VinayV 99e4da15da CLOUDSTACK-6282-Modified IpAddresses, Instances, Templates, Snapshots tests to handle KVM and modified IPAddresses for failed list cases 2014-06-16 16:56:54 +05:30
Girish Shilamkar 8e0aba4609 CLOUDSTACK-6888: Read postable IP configuration from config 2014-06-13 09:41:20 +05:30
SrikanteswaraRao Talluri 34b177f2b5 CLOUDSTACK-6904: removed typeInfo key as part of sanitize command
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-06-12 17:52:26 +05:30
Santhosh Edukulla 31d870933d Fixed vm ha cases failing in master
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-06-11 16:39:10 +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
sedukull b43517c496 CLOUDSTACK-6856 : Fixed few data corruption and retries issues for failing cases
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-06-06 21:52:03 +05:30
monism cdf4047ce8 CLOUDSTACK-6282-Added Autometed test for network APIs after incorporating review comments 2014-05-29 18:03:12 +05:30
Marcus Sorensen 20a31b43d6 CLOUDSTACK-6784: Expose data types via API so consumers of API can validate data 2014-05-27 15:23:23 -06:00
Gaurav Aradhye 0cc826aa53 CLOUDSTACK-5342: Fix for failure in adding network to VM 2014-05-27 14:44:59 +05:30
Gaurav Aradhye fa05cfbc78 CLOUDSTACK-6764: Marvin - Accomodating networkid parameter while deploying VM in advanced zone and account contains mor than one network 2014-05-27 14:41:59 +05:30
Gaurav Aradhye 2218053fb1 Fixed issues in regression suite project cpu limits
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-05-26 10:53:14 +05:30
Gaurav Aradhye a0ad836fd2 CLOUDSTACK-6758: [Marvin] Detect failed job and throw exception
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-05-26 10:50:08 +05:30
santhosh 8b39e2ff71 Added fix for CLOUDSTACK-6529
Fixed to continue adding all hosts, even if any addition fails and remove
unused args from host class.

Signed-off-by: santhosh <santhosh.edukulla@gmail.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-05-26 10:49:43 +05:30
Doug Clark 6f0b57216c Fix for Marvin utils.py:checkVolumeSize Fix for test_01_create_volume to use the correct volume name for XenServer
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-05-22 11:12:37 +05:30
vinayvarmav ef2012677c CLOUDSTACK-6282 - Divided test_escalations.py into individual files based on functionality and added automed tests for Public IP Addresses 2014-05-19 02:15:17 -04:00
Girish Shilamkar b4ad709d32 Revert "CLOUDSTACK-6282 - Divided test_escalations.py into individual files based on functionality and added automed tests for Public IP Addresses"
This reverts commit 2ba6322030.
2014-05-19 01:59:23 -04:00
vinayvarmav 2ba6322030 CLOUDSTACK-6282 - Divided test_escalations.py into individual files based on functionality and added automed tests for Public IP Addresses 2014-05-19 01:43:32 -04:00
Gaurav Aradhye 89b041a62d CLOUDSTACK-6612: Resolved issue with sshClient.py 2014-05-19 01:17:02 -04:00
Gaurav Aradhye de9909403e CLOUDSTACK-6687: Fixed IP reservation test case failures with code re-factoring 2014-05-18 21:04:31 -04:00
Girish Shilamkar 1f05fa2fba CLOUDSTACK-6655: Fixing cleanup issues with portable IP test cases 2014-05-16 04:13:28 -04:00
Gaurav Aradhye 94a7dee395 CLOUDSTACK-6612: Resolved DB connection issue related to passing correct password 2014-05-15 00:36:08 -04:00
Gaurav Aradhye ee29915ef0 Fixed config issue related to Persistent Networks 2014-05-14 20:50:49 -04:00
santhoshe 24bf1c56df Added few exception changes,test suite name generation for information collected post run, fixed pep8 issues
Signed-off-by: santhoshe <santhosh.edukulla@gmail.com>

Conflicts:
	tools/marvin/marvin/marvinInit.py
2014-05-14 18:34:27 +05:30
SrikanteswaraRao Talluri c42e9036f7 1. list* calls are modified to take listall=True when
account and domainid is passed to conform to recent IAM
related changes in 4.4-forward
2. fixed typo passd to passwd in cloudstackTestClient.py
3. added few missing data required for tests in test_data.py
4. removed config.cfg

mend

Conflicts:
	tools/marvin/marvin/config/test_data.py
	tools/marvin/marvin/lib/base.py
2014-05-14 18:14:09 +05:30
Gaurav Aradhye 6c8a0a1f96 Fixing few issues in Multiple IPs test cases 2014-05-10 00:37:56 -04:00
santhosh e69a94b61e Fixed few issues for userapiclient and port issue
Signed-off-by: santhosh <santhosh.edukulla@gmail.com>
Signed-off-by: Koushik Das <koushik@apache.org>
2014-05-08 16:13:18 +05:30
Gaurav Aradhye 38e8a20afb CLOUDSTACK-6580: Adding listall parameter while listing Account in createUserApiClient 2014-05-07 21:22:34 -04:00
santhoshe 0e975a773a Fixed Few cases running on invalid zone,domain Fixed creating client on user passed port Fixed other misc issues
Signed-off-by: jayapal <jayapal@apache.org>
2014-05-08 01:47:29 +10:00
Anish Kumar Bindal 25b1c037d6 JIRAID - CLOUDSTACK-6282 Added Networks API calls to test_escalations.py 2014-05-06 23:48:34 -04:00
Girish Shilamkar 8f1498dc8c CLOUDSTACK-6559: Added listall=True to list vm API 2014-05-05 11:13:11 +05:30
Gaurav Aradhye 59d0b75e79 CLOUDSTACK-6257: Adding function to check state of VM 2014-05-02 23:12:13 +05:30
Min Chen 1b78a1c87d CLOUDSTACK-6502:Remove trailing whitespaces. 2014-05-01 15:57:28 -07:00
Sachchidanand Vaidya 537536835b - Created new devcloud advanced networking config file (devcloud-advanced_juniper-contrail.cfg). - Modification to deployDataCenter script, to enable "JuniperContrailRouter" & "JuniperContrailVpcRouter" providers.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-05-01 13:10:12 +02:00
SrikanteswaraRao Talluri 9ed6563e7a Fixes for BVT and Regression run failures against 4.4 CS 2014-04-30 19:25:53 +05:30
SrikanteswaraRao Talluri b273f66423 CLOUDSTACK-5674:Fixes for BVT and Regression test failures.
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Conflicts:
	test/integration/smoke/test_nic.py
2014-04-30 19:25:35 +05:30
Santhosh Edukulla bf54f74ffc Fix few issues seen in run.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2014-04-30 13:56:34 +05:30
root 56a44151aa Fixed pep8 issues arising as part of merge
Fixed pep8 issues arising as part of merge

Signed-off-by: root <root@localhost.localdomain>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-29 19:36:09 +05:30
Min Chen 96af7396b6 CLOUDSTACK-6502:IAMGroup.list and IAMPolicy.list in marvin base.py are
not working.
2014-04-28 11:11:35 -07:00
SrikanteswaraRao Talluri e9fb906599 CLOUDSTACK-6511: fixed for bvt and component test failures 2014-04-25 18:13:47 +05:30
SrikanteswaraRao Talluri 06d510abcc CLOUDSTACK-6492: fixed localtime import and its usage in deployDataCenter.py 2014-04-24 18:59:52 +05:30
unknown e9e8c65b4d CLOUDSTACK-6282: Added Automated tests to test_escalations.py for Security Groups, VPN Customer Gateways, Templates, ISO's CS API calls
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-24 17:37:31 +05:30
Santhosh Edukulla ef9e2a9367 Fixed issues in CLOUDSTACK-6489
Fixed issues for CLOUDSTACK-6489
Along with fixed few indent issues.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-24 15:02:49 +05:30
SrikanteswaraRao Talluri 7df30611fe CLOUDSTACK-6492: fixed strftime import and its usage in deployDataCenter.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-24 13:00:29 +05:30
unknown 2e95b5b707 0001-JiraId-CLOUDSTACK-6282.patch Added automated tests for Instances API calls to test_escalations.py file and added utility functions to base.py file 2014-04-24 12:33:57 +05:30
Santhosh Edukulla f57f22a79e Fixed few Licensing Issues
Added licensing information to files

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-24 12:16:49 +05:30
SrikanteswaraRao Talluri d22adf943d Merge branch 'marvin'
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Conflicts:
	test/integration/component/test_dynamic_compute_offering.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_disk_offerings.py
	test/integration/smoke/test_volumes.py
2014-04-23 11:45:43 +05:30
Koushik Das b088821c61 CLOUDSTACK-6445: Simulator enhancements
Refer FS - https://cwiki.apache.org/confluence/display/CLOUDSTACK/Simulator+enhancements
2014-04-18 16:44:21 +05:30
Santhosh Edukulla 901d633ca4 Added few changes for CLOUDSTACK-6316
1. Added pep8 changes, delete dc flag.
2. Now, delete dc works only if flag is set under config.
3. SSH, retries and delay were altered to reduce the time
for ssh connection

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-16 15:56:30 +05:30
SrikanteswaraRao Talluri b2543efaca CLOUDSTACK-6316: added else code in __createUserApiClient function 2014-04-11 19:32:13 +05:30
SrikanteswaraRao Talluri 2f02abf364 Fixed failed tests in regression tests. 2014-04-11 12:11:50 +05:30
SrikanteswaraRao Talluri ca67e25f23 CLOUDSTACK-6316: fixed test data and their references in the test files and few more fixes in tests 2014-04-11 11:43:38 +05:30
SrikanteswaraRao Talluri 94fc4bf6bd CLOUDSTACK-6316: fixes for bvt failures 2014-04-11 02:28:49 +05:30
Girish Shilamkar ef9471692d CLOUDSTACK-5674: Remove assigning accountname which was useless 2014-04-10 17:49:39 +05:30
SrikanteswaraRao Talluri f866bb21e6 CLOUDSTACK-6316: Fixed component and smoke test failures-third pass 2014-04-10 13:20:13 +05:30
Girish Shilamkar 8df1c71b6d CLOUDSTACK-5674: Fix issues with BVT 2014-04-09 21:17:01 +05:30
SrikanteswaraRao Talluri b83407fca3 CLOUDSTACK-6316: Fixed component and smoke test failures-second pass 2014-04-09 19:53:50 +05:30
Ashutosh K b5a93751e2 CLOUDSTACK-6147: Adding automation tests for Dynamic Compute
Offering
2014-04-09 15:13:35 +05:30
unknown d0b6e01da0 CLOUDSTACK-6282: Added-volume-API-tests-to-test_escalations.py.patch JiraId-CLOUDSTACK-6282.patch
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-08 23:13:08 +05:30
SrikanteswaraRao Talluri 0e223d6787 Merge branch 'master' into marvin
Conflicts:
	test/integration/component/test_base_image_updation.py
	test/integration/component/test_cpu_domain_limits.py
	test/integration/component/test_cpu_limits.py
	test/integration/component/test_cpu_project_limits.py
	test/integration/component/test_ip_reservation.py
	test/integration/component/test_memory_limits.py
	test/integration/component/test_mm_domain_limits.py
	test/integration/component/test_mm_project_limits.py
	test/integration/component/test_persistent_networks.py
	test/integration/component/test_portable_ip.py
	test/integration/component/test_routers.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_deploy_vm_with_userdata.py
	test/integration/smoke/test_internal_lb.py
	test/integration/smoke/test_vm_life_cycle.py
	test/integration/smoke/test_volumes.py
	tools/marvin/marvin/codes.py
	tools/marvin/marvin/configGenerator.py
	tools/marvin/marvin/lib/base.py
	tools/marvin/marvin/lib/common.py
	tools/marvin/marvin/lib/utils.py
2014-04-08 17:53:37 +05:30
SrikanteswaraRao Talluri 818d4a6d9d CLOUDSTACK-6316: Fixed component and smoke test failures for wrong references 2014-04-08 16:08:27 +05:30
SrikanteswaraRao Talluri 08b87c0409 CLOUDSTACK-6316: Fixed bvt failures 2014-04-08 15:02:37 +05:30
SrikanteswaraRao Talluri 0d5ec63371 CLOUDSTACK-6316: Fixed issues in various files(testcases and marvin related)
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-04 19:46:25 +05:30
Santhosh Edukulla 65e8f2dc53 Fixed issues related to CLOUDSTACK-5674
Fixed issues mentioned for CLOUDSTACK-5674.
More changes in the bug

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-04 18:30:45 +05:30
Ashutosh K ca1b911a4f CLOUDSTACK-2266: Adding automation tests for IP reservation feature
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-02 10:59:06 +05:30
Santhosh Edukulla 34409d74cd Fixed few issues for CLOUDSTACK-6316,CLOUDSTACK-5674
Fixed issues related to the mentioned bugs.
More information in the bug.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-01 23:53:14 +05:30
Santhosh Edukulla 63d3688360 Added fix for CLOUDSTACK-6316
Added changes for CLOUDSTACK-6316.
More details in the bug

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2014-04-01 16:15:53 +05:30
SrikanteswaraRao Talluri 70e104021c Revert "Added fix for CLOUDSTACK-6316"
This reverts commit 95a645349f.
2014-04-01 16:09:54 +05:30
Santhosh Edukulla 95a645349f Added fix for CLOUDSTACK-6316
Added changes for CLOUDSTACK-6316.
More details in the bug

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2014-04-01 16:02:59 +05:30
Santhosh Edukulla e4053bc32b CLOUDSTACK-5674: Added few fixes for CLOUDSTACK-5674 2014-03-26 10:36:13 -07:00
Ashutosh K fe5ab4aa91 CLOUDSTACK-4840: Final set of test cases for Multiple IPs
per NIC feature
2014-03-23 21:15:45 -07:00
SrikanteswaraRao Talluri 6338db1f9a CLOUDSTACK-5113: temporary fix to return first template in the list 2014-03-20 19:07:44 +05:30
Santhosh Edukulla afb58b37a3 CLOUDSTACK-5674: Added few fixes for CLOUDSTACK-5674 2014-03-19 18:34:59 -07:00
Santhosh Edukulla 09e1eb69cb Added a change to fix the local variable issue. 2014-03-19 18:34:02 -07:00
Marcus Sorensen 8fc6e263b3 now fix MY root resize test, which passes 0 in one test... 2014-03-14 07:40:12 -06:00
Marcus Sorensen 345fc3c8ec Change newly added details map for deployVirtualMachine to an empty
map, instead of passing all possible keys as empty values
2014-03-14 07:18:06 -06:00
Marcus Sorensen d638d04cbf CLOUDSTACK-6181: Merge of resize root feature (resize-root branch) 2014-03-14 07:17:33 -06:00
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Murali Reddy 015b667c6a integration tests for VPC's enabled for distributed routing 2014-03-14 16:56:38 +05:30
Min Chen 99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
SrikanteswaraRao Talluri fd1b983d03 CLOUDSTACK-6222: Fix the marvin config generator scripts to include
new syntax changes in marvin code and fix the logFolderPath

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Conflicts:
	tools/marvin/marvin/configGenerator.py
2014-03-11 16:13:45 +05:30
SrikanteswaraRao Talluri 991e1eb6b1 CLOUDSTACK-6222: Fix the marvin config generator scripts to include
new syntax changes in marvin code and fix the logFolderPath
2014-03-11 16:09:01 +05:30
Sanjay Tripathi c7d31fe288 CLOUDSTACK-4760 : Enabling GPU support for XenServer.
CLOUDSTACK-4762 : Enabling VGPU support for XenServer.

This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors.
2014-03-11 15:44:51 +05:30
sanjeevneelarapu 4eece72eb1 Bug-Id: CS-19455 Add support for Hyper-v in regression test test_routers.py
Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
2014-03-10 18:12:21 +05:30
Gaurav Aradhye 3f7b628c70 CLOUDSTACK-6147: Adding first set of test caess for Dynamic Compute Offering feature
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-03-10 11:20:44 +05:30
Gaurav Aradhye 3b3ae02459 CLOUDSTACK-5626: Simplifying VM Migrate code
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-03-10 11:18:26 +05:30
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Min Chen 91882e26bf List VM marvin test fix. 2014-03-03 17:26:16 -08:00
Min Chen ae9be657e4 Fix IAM VM marvin test. 2014-02-28 17:33:10 -08:00
Min Chen 9f47466fea Fix some issues in renaming iam api, also fix marvin library. 2014-02-26 17:30:34 -08:00
Santhosh Edukulla 4a0e95cf5b CLOUDSTACK-6164: Added few changes for CLOUDSTACK-6164 2014-02-26 17:03:22 +05:30
Santhosh Edukulla 23e059b1b9 CLOUDSTACK-5674: Added few changes for CLOUDSTACK-567 2014-02-26 10:42:45 +05:30
Santhosh Edukulla bf77e9d669 CLOUDSTACK-6160: Changes to marvin apiclient
Removed apiclient.hypervisor references. More details in the bug
Few other changes pending for this related to VirtualMachine.create
need to be cleaned up
2014-02-24 18:56:46 +05:30
Santhosh Edukulla d06f2b6a70 CLOUDSTACK-6158: Fix few changes 2014-02-24 18:55:41 +05:30
Min Chen b78cb2284a Add marvin integration test for list VM. 2014-02-21 15:35:48 -08:00
Ashutosh K 2091211c28 CLOUDSTACK-2232: Adding automation test cases for Persistent Networks feature 2014-02-21 17:46:14 +05:30
Girish Shilamkar 47c5b63881 CLOUDSTACK-5674: Fixed all BVTs and some marvin functions 2014-02-19 16:33:42 +05:30
Ashutosh K 860b020950 CLOUDSTACK-4840: Adding first set of test cases for Multiple IPs per NIC feature 2014-02-18 15:51:57 +05:30
Girish Shilamkar f0eb184d8a CLOUDSTACK-5674: Fix get_domain and remove dependency on ostype in get_template 2014-02-13 19:57:04 -05:00
Santhosh Edukulla c0d8b9e334 CLOUDSTACK-5674: getZoneForTests should return None if zone is "NA" in test_data.py 2014-02-14 10:45:14 +05:30
Girish Shilamkar f3364ca6a4 CLOUDSTACK-5674: Add missing test_data.py 2014-02-12 17:52:50 +05:30
Santhosh Edukulla c78292e9cd CLOUDSTACK-6082: Add alternate zone creation under deploy DC 2014-02-12 17:35:19 +05:30
Santhosh Edukulla 3dbb2ae488 CLOUDSTACk-5674: Added fix for CLOUDSTACK-5674 2014-02-12 17:34:34 +05:30
Santhosh Edukulla 7cc9423b8d CLOUDSTACk-5674: Added few misc changes to make it work. 2014-02-12 17:33:13 +05:30
Girish Shilamkar c1d34369aa Revert "CLOUDSTACK-5674: Few fixes"
This reverts commit e6b93b0a68.
2014-02-12 17:27:47 +05:30
Girish Shilamkar e6b93b0a68 CLOUDSTACK-5674: Few fixes 2014-02-11 14:54:46 +05:30
Girish Shilamkar 995e3f5b5d Revert "CLOUDSTACK-5674: Few new fixes"
This reverts commit 3493f17bad.
2014-02-11 12:36:07 +05:30
Girish Shilamkar 3493f17bad CLOUDSTACK-5674: Few new fixes 2014-02-09 16:04:31 -05:00
Ashutosh K 899ad17393 CLOUDSTACK-5978: Changes in get_template function to make it
independent of ostype passed through test case
2014-02-10 12:38:09 +05:30
Gaurav Aradhye d44c850445 CLOUDSTACK-5959: Fixed cascading failures in portable IP test cases 2014-02-10 12:34:17 +05:30
Santhosh Edukulla 286afda5d6 CLOUDSTACK-5980: Fix test case failing with "Error reading SSH protocol banner" ssh error 2014-02-04 15:45:45 +05:30
Santhosh Edukulla bf72441d13 CLOUDSTACK-6006: Remove integration folder and lib 2014-02-04 12:01:58 +05:30
Santhosh Edukulla a908b8d94b CLOUDSTACK-5793: Fixed few issues related CLOUDSTACK-5973 2014-02-04 11:23:10 +05:30
Girish Shilamkar df58f51e33 Merge remote-tracking branch 'origin/master' into marvin 2014-01-29 14:20:04 +05:30
Santhosh Edukulla d057585128 CLOUDSTACK-5948: Fixes to BVT test_volumes.py
1. Added a generic way of verifying isk volumes.
2. Now, detach volume is called post the assert.
3. Added a sleep post detach volume to facilitate list volumes to have some time for detach operation.
4. Added a fix for a log check.
2014-01-29 10:36:23 +05:30
Girish Shilamkar 226df296d0 CLOUDSTACK-5674: Some fixes to marvin and resultant changes to tests. 2014-01-28 02:11:24 -05:00
Girish Shilamkar 7305063fb4 CLOUDSTACK-5925: get_*() functionality changed in marvin, changed BVT too. 2014-01-28 11:12:24 +05:30
Santhosh Edukulla edfd2b6799 CLOUDSTACK-5764: Some fixes to marvin 2014-01-22 18:34:10 +05:30
Girish Shilamkar 6a2cc9fbd0 CLOUDSTACK-5925: Moved test data from testsuites to marvin/config
Also merged redundant testdata as they were found.
2014-01-22 12:21:07 +05:30
Santhosh Edukulla 9393275611 CLOUDSTACK-5674: Added Fix for CLOUDSTACK-5674,5498,5500 and other issues as
part of cleanup
2014-01-22 12:19:20 +05:30
Santhosh Edukulla 3a3d8f27dd Fix for CLOUDSTACK-5864
Fixed the mentioned issue.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2014-01-15 11:45:58 +01:00
Ashutosh K c108d7f0d0 CLOUDSTACK-2237: Automation-Adding next set of test cases for feature - SG in advanced zone 2014-01-14 14:34:21 +05:30
SrikanteswaraRao Talluri c98ac9aae0 CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template in ready state with
matching given ostype
2014-01-10 19:56:38 +05:30
Gaurav Aradhye b98c0ee809 CLOUDSTACK-5630: Fixed snapshots' test cases 2014-01-08 17:16:06 +05:30
SrikanteswaraRao Talluri 249993b2f1 CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template
by default
2014-01-07 17:41:36 +05:30
Ashutosh K 4d9b95e13d CLOUDSTACK-2237: Automation - Adding new test cases for security group in advanced zone feature 2013-12-27 16:06:34 +05:30
Girish Shilamkar b544669a84 CLOUDSTACK-5497: Fix test_guest_vlan_range.py to get free vlan range 2013-12-24 11:11:17 +05:30
Gaurav Aradhye a160b46cd4 CLOUDSTACK-4780: Changes related to checking snapshot path
on NFS server, also made marvin import paths specific
2013-12-23 17:58:51 +05:30
Girish Shilamkar fde14bcc32 Revert "CLOUDSTACK-4780: Changes related to checking snapshot on NFS server"
This reverts commit 33fb241fdf.
2013-12-21 12:47:32 +05:30
Gaurav Aradhye 33fb241fdf CLOUDSTACK-4780: Changes related to checking snapshot on NFS server 2013-12-19 10:21:33 +05:30
SrikanteswaraRao Talluri 8374ff591d CLOUDSTACK-5449: fixed pep8 errors
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-12-12 17:10:37 +05:30
Santhosh Edukulla e498bf00d4 CLOUDSTACK-5443: Fixed the issue. 2013-12-11 19:37:29 +05:30
Santhosh Edukulla ab025f0269 Fixed CLOUDSTACK-5436
Fixed few RAT issues reported for new additions of files to repo.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-12-11 15:33:52 +05:30
SrikanteswaraRao Talluri a9d96aff06 CLOUDSTACK-5449: fix the log creation failure case and added an option
for user to provide --log-folder-path=

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-12-11 01:57:44 +05:30
Santhosh Edukulla 3144e01c13 CLOUDSTACK-5423: Fixed 5423 2013-12-10 20:25:23 +05:30
Girish Shilamkar a55f108285 CLOUDSTACK-5405: Changed marvin to create sg in account into which vm is deployed 2013-12-10 00:27:49 -05:00
Santhosh Edukulla 6b70a6db94 CLOUDSTACK-5413: Fixed bug CLOUDSTACK-5413 2013-12-09 19:45:22 +05:30
Santhosh Edukulla 5cbda8b64a CLOUDSTACK-5269: Fix nose failures. 2013-12-09 19:36:10 +05:30
Santhosh Edukulla a2e4fdbd5a Moving build scripts maintained in separate repo to cloudstack repo 2013-12-09 19:28:08 +05:30
Girish Shilamkar 2368b6de68 Added files missed in cafd820e3e 2013-12-07 13:43:18 +05:30
Santhosh Edukulla cafd820e3e Enhanced few features under Marvin
Added few enhancements to marvin.
Added new module for Logging Facility to marvin.
Added new Init facility to marvin.
Currently, there are multiple ways we are doing logging
Removed few unwanted logging cases.
Removed few command line switch options for logging.
The new way of logging now provides consolidated logging
under one single folder timestamped under the configured
folder path.
Removed parsing configuration from deploydata center
Added parsing,start logging and deploy as part of init
Added new error handling facility to catch unknown exception from
test cases. Currently, lot of scripts are throwing unknown
exceptions, add a handler to plugin to dump them to a file

ToDO:
Will do clean up in phase2 for this patch.
Separate deployDatacenter from creating test client.
Clean up configGenerator
2013-12-06 12:01:53 +05:30
Girish Shilamkar c39bc04be6 CLOUDSTACK-5337: Trimming account name (username) to 99 characters 2013-12-03 15:59:42 +05:30
Gaurav Aradhye 2ba27db0ce CLOUDSTACK 2233: Automation test cases for Add Remove Networks to VM
Signed-off-by: Girish Shilamkar <girish@clogeny.com>
2013-11-25 13:15:49 +05:30
Hugo Trippaers cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Gaurav Aradhye 6aca7de291 CLOUDSTACK-5215: Correcting and refactoring code related to
getting free vlan
2013-11-21 10:53:27 +05:30
Girish Shilamkar 0b8cc9705f Fix marvin to refer to correct random_gen() function 2013-11-15 17:13:12 +05:30
Gaurav Aradhye c141e418e9 CLOUDSTACK-5180: Increasing the timeout for uploading volume 2013-11-15 16:23:18 +05:30
Ashutosh K 401e0ca0ba Including tests for VPC VM Lifecycle on Tagged hosts 2013-11-13 21:56:51 +05:30
Santhosh Edukulla aebbb15a64 Fixed a connection issue under asyncmgr.
Fixed a connection issue under asyncmgr.
Added __init__.py files to directory to make it
a package.This file was missing under few directories and
so not appearing as packages while refactoring.
Adding one None Check
2013-11-11 16:55:09 +05:30
Santhosh Edukulla 175ead4ea9 CLOUDSTACK-5121: There was one wrong initialization of cloudstackConnection.
The bug mentioned is causing test cases to fail.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-11-11 10:26:32 +05:30
SrikanteswaraRao Talluri 1e57f1cee7 Modified remoteSSHClient references to SshClient 2013-11-08 19:50:22 +05:30
SrikanteswaraRao Talluri 011b87eadc fixed indentaion problem in utils.py :359
Conflicts:
	tools/marvin/marvin/integration/lib/utils.py
2013-11-08 18:05:05 +05:30
Santhosh Edukulla c7fe212c3b CLOUDSTACK-5099: Utils.py-has-wrong-reference, cleaned it. As well added Uniform naming convention
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-11-08 16:34:46 +05:30
SrikanteswaraRao Talluri 65b12f45b9 Revert "CLOUSTACK-5099: Utils.py-has-wrong-reference, cleaned it. As well added Uniform naming convention"
This reverts commit ec00a6fb74.
2013-11-08 16:05:30 +05:30
Santhosh Edukulla ec00a6fb74 CLOUSTACK-5099: Utils.py-has-wrong-reference, cleaned it. As well added Uniform naming convention
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-11-08 16:02:10 +05:30
Santhosh Edukulla 3342a82f39 Increasing the timeout values to 600 seconds from 300 seconds
Timeout for ssh related test cases is increased based upon
few test run observations where ssh is taking more time during
restart scenarios as an example. We have done few changes to streamline
ssh library. This is in addition to those to keep less ssh script issues

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-11-08 15:26:44 +05:30
Santhosh Edukulla 089f43a1eb Added fix for bug 5056.
The fix contains fixes related to ssh library majorly.
Complete description should be available under bug
description.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-11-08 15:21:13 +05:30
Gaurav Aradhye 3c350ab0b8 CLOUDSTACK-4648: Fixed Snapshots test cases
Fixed following test cases:
1) test_01_volume_from_snapshot
2) test_03_snapshot_detachedDisk
3) test_07_template_from_snapshot

All three test cases are running successfully on XenServer but test cases (01 and 07) failing on KVM due to a common issue.
Product defect logged for this: https://issues.apache.org/jira/browse/CLOUDSTACK-5097

test_03 is running ok on KVM too, the problem was - disk was not getting detached because it was not unmounted before detaching. Added code to unmount the disk.

Signed-off-by: Girish Shilamkar <girish@clogeny.com>
2013-11-08 12:54:20 +05:30
Santhosh Edukulla 1058e3049a CLOUDSTACK-5032 Provides custom assert facility to test features
Added assertElementInList to cloudstackTestCase.
Users can use this new custom addition to add
assertions, thus replacing current multiple assertions

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-11-05 11:06:26 +01:00
Santhosh Edukulla 58cd71f5c1 Added a verifyElementInList utility function
The purpose is to verify a given element in list
at a given position with few error checks like
list type,empty list and position
Returns appropriate codes based upon the inputs.
Can be used under tests instead of multiple asserts

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-11-01 16:55:07 +05:30
Gaurav Aradhye 23499efe42 CLOUDSTACK-4995: Fixed test_reset_ssh_keypair which checks the state of the VM
Signed-off-by: Girish Shilamkar <girish@clogeny.com>
2013-10-31 21:57:57 +05:30
Santhosh Edukulla 0b617a13fd Fixed Bug: 4899
Added Configuration Support to Marvin.

1. It provides the basic configuration facilities to marvin.

2. User can just add configuration files for his tests, deployment
              etc, under one config folder before running their tests.
              cs/tools/marvin/marvin/config.
              They can remove all hard coded values from code and separate
              it out as config at this location.
              Either add this to the existing setup.cfg as separate section
              or add new configuration.
3. This will thus removes hard coded tests and separate
              data from tests.

4. This API is provided as an additional facility under
              cloudstackTestClient and users can get the
              configuration object as similar to apiclient,dbconnection
              etc to drive their test.

5. They just add their configuration for a test,
              setup etc,at one single place under configuration dir
              and use "getConfigParser" API of cloudstackTestClient
              It will give them "configObj".They can either pass their own
              config file for parsing to "getConfig" or it will use
              default config file @ config/setup.cfg.
6. They will then get the dictionary of parsed
              configuration and can use it further to drive their tests or
              config drive
7. Test features, can  drive their setups thus removing hard coded
          values. Configuration default file will be under config and as
              setup.cfg.
8. Users can use their own configuration file passed to
              "getConfig" API,once configObj is returned.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-31 17:54:13 +05:30
Ashutosh Kelkar c53d4e9e14 CLOUDSTACK-2243: Add automation tests for VMs base image
update faclity

Signed-off-by: Girish Shilamkar <girish@clogeny.com>
2013-10-31 14:55:29 +05:30
Gaurav Aradhye 1972d6121d Adding missing test cases: Snapshots Improvement 2013-10-29 23:42:38 +05:30
Prasanna Santhanam 6a904d2f9b fix pep8
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-29 16:19:48 +05:30
Prasanna Santhanam ddf4dfa60a marvin: enable the nose-marvin plugin using the --with-marvin directive
enable the marvin plugin when the --with-marvin directive is given to nose. The
enableOpt value is set from the command line directive and self.enabled
(True|False) determines whether marvin's tests will run.  By default
non-default plugins like marvin will be disabled"

This fixes regression from 03830c5

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-29 15:46:50 +05:30
Santhosh Edukulla 03830c570e Adding few changes and cleaning up the code
- Added few common naming conventions
- Cleanedup code
- Added a simple utility function

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-28 12:49:41 +05:30
Santhosh Edukulla b4ceefa469 Adding readable start and end time stamps
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-28 11:29:27 +05:30
Santhosh Edukulla 0780604503 CLOUDSTACK-4885: basic timing profiler for tests
This will add time taken in seconds along with start and end timestamp
logging facility for test cases.Currently this is not
available for console logs

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-24 14:52:53 +05:30
Santhosh Edukulla d4072c6daa Added few changes related to bug 4920. Removed unwanted code
There were few unwanted calls as part of test client, did some clean up
Made the test client API uniform to accept both mgmt and dbsvr details
Did some minor bug fixes as well.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-23 13:53:43 +05:30
Santhosh Edukulla 3f656b0434 The code module represents enum for constant comparison
This module provides facilitation to use uniform codes across various test
features. Users can import this  module and use these codes to maintain
readability and one point of change.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-22 15:38:48 +05:30
Prasanna Santhanam dfa0678fc6 marvin: a1b979da8 breaks formatting and pep8.
setup/dev/advanced.cfg is used by the simulator deployments that are
usually not https. disabled the http within this config file.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-22 11:59:14 +05:30
Santhosh Edukulla a1b979da86 CLOUDSTACK-4832. Added support for https to marvin.
advanced.cfg: Contains three additional flags "useHttps,certCAPath,certPath"
for https usage in marvin for establishing cs connection. We will use the
configuraiton under advanced.cfg provided by user to establish connection over
https. If establishing the connection over https failed, then the default certs
will be used.  or else raise the exception, the existing http will work as it
is when useHttps flag set to "False"

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-22 11:32:10 +05:30
Gaurav Aradhye 0a8bce5cf6 CLOUDSTACK-4647: Fixed snapshot_gc test case and common util function is_snapshot_on_nfs
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-15 13:37:08 +05:30
Anshul Gangwar 7b5daaea20 added support for ispersistent parameter for networkoffering
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-15 13:22:42 +05:30
Prasanna Santhanam 52c2bc0baf pep8: fix regression from 10938612cc
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-10 17:47:52 +05:30
Daan Hoogland 10938612cc [CLOUDSTACK-4832] no cert verification on https 2013-10-08 17:35:46 +02:00
Prasanna Santhanam 5ed493c6e6 pep8: fix recent pep8 violations
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-04 14:13:37 +05:30
Gaurav Aradhye b7e00d3700 CLOUDSTACK: 4706 - Adding missing method get_region in common.py
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 503fe75dc9)
2013-09-30 15:19:58 +05:30
SrikanteswaraRao Talluri 65da24c35e CLOUDSTACK-4691: move egress rules host maintenance tests to maint folder
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 6b28e03d6d)
2013-09-30 15:12:20 +05:30
Edison Su b3ac12e171 delete snapshot_store_ref if the snapshot is in error state 2013-09-25 15:51:55 -07:00
Hugo Trippaers 15a97ec412 Cleanup pom.xml in various projects to properly use managed versions and other defaults 2013-09-21 17:21:06 +08:00
Anshul Gangwar 955408166c CLOUDSTACK-2266: marvin tests for IP Address reservation within a network it also adds the ipaddress parameter to virtual machine's create method in base.py
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-09-18 09:21:24 +05:30
Gaurav Aradhye ae1cebf4e9 Automation - Portable Ip feature test cases
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 23c759ec35)
2013-09-13 17:35:08 +05:30
Prasanna Santhanam 433d5839a1 CLOUDSTACK-4608: Resolve the hostname to fqdn from marvin config
In case the marvin configuration does not contain fqdn information fetch
and compare the fqdns of hostip from `cloud`.`host` with the fqdn
available on the client.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-09-09 11:41:13 +05:30
Gaurav Aradhye eb390fba22 CLOUDSTACK-4531: Fixed indent problem with the patch.
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 751fe8e339)
2013-09-06 21:36:42 +05:30
Sowmya Krishnan 8b5cb374b9 CLOUDSTACK-4487 Fix adding Netscaler service provider if not already done
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit c1ea61a0e7)
2013-09-05 15:08:43 +05:30
Girish Shilamkar 0fb2014d19 CLOUDSTACK-4531: Resolved ssh error for basic zone. Public ip should be used for ssh instead of ipaddress of nic
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 4f3b411d4c)
2013-09-05 10:20:17 +05:30
Prasanna Santhanam 5326833971 Fix pep8 formatting to fix cloudstack-marvin build 2013-08-30 12:40:42 +05:30
Gaurav Aradhye 95e4b7afa8 Automation: Limit Resources - Adding tests related to CPU limits
Reviewed-by: Sanjay Tripathi <Sanjay.Tripathi@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-29 14:13:39 +05:30
Girish Shilamkar c6f0d46911 CLOUDSTACK-4407: Use extractTemplate API to get hypervisor specific template information
Template url, hypervisor and format were defined in Service class to be Xenserver specific
and therefore registering a new template failed on Vmware and KVM.
Fixed this to get hypervisor specific info for registering new template.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 20256706b376551fe8993ee2e73c61df31dcb6de)
2013-08-29 14:10:54 +05:30
Prasanna Santhanam 1058654cb4 CLOUDSTACK-4499: Wait until hosts are up before adding storage pools
This works around the delay caused in adding Xen 6.1/6.2 hosts where
host takes two attempts to transition to Up state. We will wait for one
minute per cluster before attempting to add storage pool in the cluster.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 22ee499c3571b2a6b6921abb36c679128893c415)
2013-08-29 14:10:54 +05:30
Ashutosh Kelkar a7833cdfb4 CLOUDSTACK-4303: Add missing base.py changes
egressdefaultpolicy parameter was not set in base.py. Therefore
egress test failed. Added this missing change.

Signed-off-by: Jayapal <jayapal@apache.org>
2013-08-27 16:08:37 +05:30
Prasanna Santhanam de770d37ec CLOUDSTACK-4452: Fix the mount format to host:dir
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit eabd53b9719fe38b933efe1169c420c88ad5ecf5)
2013-08-27 15:28:20 +05:30
Sowmya Krishnan f1c6535f6e CLOUDSTACK-4510 Move NS scripts to appropriate suites and related common.py fixes
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit f7df3ef9f1)
2013-08-27 10:59:13 +05:30
Prasanna Santhanam 02e7630f1c CLOUDSTACK-4452: Cleaning up the is_snapshot_on_nfs utility
- Pass in config and determine the mgmtsvr credentials
- remove the dir_paths param which is not reqd.
- pass all entities as uuids and convert to ids within the method

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-26 11:10:06 +05:30
Gaurav Aradhye 684573939f CLOUDSTACK-4452 - Fixed method is_snapshot_on_nfs and moved it to utils
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 35ee38385c)
2013-08-26 10:40:44 +05:30
Prasanna Santhanam 4a96740681 CLOUDSTACK-4473: allow_egress referenced before assignment
When deploying with networkids allow_egress gets no default value. This
is a regression caused by fix for CLOUDSTACK-4418

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 239ba9447109412cf48cfefc547d6b5fef83a4a9)
2013-08-23 17:02:34 +05:30
Prasanna Santhanam b3306497fe CLOUDSTACK-4453: fetch host credentials from marvin config
Tests would fetch the credentials for the host to hop into router to
check for essential services. Each test would require to put in the host
information into the test data. Instead fetch the credential information
from the marvin configuration file.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 4b546ce85d40098ade69c575316e76e25a422a12)
2013-08-22 20:20:16 +05:30
Sowmya Krishnan e4b5d4d62e CLOUDSTACK-3927, CLOUDSTACK-3928: Fix NS scripts to add/remove NS device in setupClass/tearDown
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 1c31ee22d4)
2013-08-22 10:27:56 +05:30
Prasanna Santhanam 7e36dd6be8 CLOUDSTACK-4418: allow egress access to all networks for VMs on NAT
Tests doing operations within guests post VirtualMachine.create w. default
network offering fail since the egress policy with isolated networks and
sourcenat services is DENY.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 81b5146c8e)
2013-08-21 15:20:27 +05:30
Prasanna Santhanam 61b787975c CLOUDSTACK-4283: remove hardcoded shared_vlan from test_shared_networks
SharedNetwork creation requires a pre-setup VLAN outside of the guest
VLANs defined during zone creation. Use a VLAN tag outside the guest
range as a shared network vlan to create shared networks.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 35867ccbd90c824b4faae438dac99400babeff95)
2013-08-13 15:31:43 +05:30
Prasanna Santhanam fb58addc35 Fix snapshot GC test
Changes to object store removes SecondaryStorage host from the host
table. This affects the test where we identify the secondary storage nfs
host to login to where we verify if the snapshot is present on the
physical resource.

* added base classes for imagestore/stagingstore operations
* fixed the test to check only if NFS is used as backing store

TODO: Fix for s3 based storage layer

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 4f973778bf6c2bfc7da2b8c785557e86f81af9d5)
2013-08-07 14:33:57 +05:30
SrikanteswaraRao Talluri c853426c76 CLOUDSTACK-4098: Fix the test which deploys a VM from password enabled template.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 64591e65be)
2013-08-06 18:46:44 +05:30
Prasanna Santhanam f37417e365 Fix pep8
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 1060997bcd40282656503a15191abd1814bfe064)
2013-08-05 14:06:51 +05:30
Prasanna Santhanam ccbcee5e00 isportable defaults to False
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-02 22:23:44 +05:30
Gaurav Aradhye 6ef51b4159 CLOUDSTACK:3594: Fixes related to affinity groups tests. Included two test suites those were missed because there was no decorator for test cases
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3028f4223b2a00f80159b387e86211effcfeda11)
2013-08-02 16:00:05 +05:30
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
Prasanna Santhanam d714ce54b5 CLOUDSTACK-3921: Don't change order of params in PublicIpAddress.create()
Or existing tests that depend on the order barf and fail.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit ec054cde23113baa40ae35c6195bc666d3c1b8d0)
2013-08-01 19:25:37 +05:30
Prasanna Santhanam d31fe92169 Remove unused code
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-01 16:10:57 +05:30
Sheng Yang a3df696fd6 Automation: Fix SSH connection test
And increase default retry to 10 times, each 30 seconds.

Comment out auth exception part because sometime it caused failure when VM
is starting up.

Now we just wait anyway for 5 minutes if it's failing.
2013-07-31 18:28:33 -07:00
Sheng Yang 536c377752 Marvin: Add missing __init__ to StaticRoute 2013-07-31 15:10:39 -07:00
Prasanna Santhanam cce14f3974 Include SSH retry logic when encountering channel failures.
Only on SSHExceptions we attempted retries, but during socket failures,
like Network Unreachable we failed the ssh connection immediately.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit dcbb2fcaa18e3faaf1c0765633300f7d0fa46d2c)
2013-07-31 17:20:35 +05:30
Prasanna Santhanam 476bd93e43 Cleanup the marvin logger
It is useful to have the same logger used in the marvinplugin into the
testcase. The testcase can then append its name to the logger making
the logs specify exactly which test is executing when the logs are
generated

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c84a2d8801b7898dbfee18e17950cb9fca7d36e7)
2013-07-31 17:20:35 +05:30
Prasanna Santhanam 28835054e6 CLOUDSTACK-3921: AssociateIpAddress fails
When you have a method with named parameters, all calls to it should
explicitly pass name=value pairs. Not doing so can result in the wrong
params being passed in the method call. This is a result of the
"services" dictionary being passed into the isportable flag failing the
API signature generation and hence the API call.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-30 15:01:34 +05:30
Girish Shilamkar 4054a8e2ac CLOUDSTACK-3454: Fix test_portable_publicip
Added isportable param to associateIP API. Fixed base class
for PortableIP tio call portableip APIs.
Removed test_createPortablePublicIPAcquire from basic zone run
requires additional network creation handling which can be done
in component tests.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-29 20:00:08 +05:30
Prasanna Santhanam 97424e2954 CLOUDSTACK-3906: PrivateGw constructor
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit b82c0c9e7b565a2373cf553f8413819afa37d8c3)
2013-07-29 17:11:50 +05:30
Prasanna Santhanam 17b711bd7c CLOUDSTACK-3906: unbound method PrivateGw.create is not @classmethod
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-29 16:57:04 +05:30
Prasanna Santhanam 20e64be8d7 Fix broken pep8 from 1305697eaa
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 8545e6461880dae08a8b3f7d07d9302807982c29)
2013-07-29 15:33:23 +05:30
Prasanna Santhanam ade13bb773 Remove duplicate while-loop retries during ssh
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 53feae08de)
2013-07-29 14:52:07 +05:30
Min Chen c8cafb91a7 CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 15:07:45 -07:00
Prasanna Santhanam 4be18aefc4 CLOUDSTACK-2450: Fix userdata to be urlencoded safely
urlencoding the userdata and quoting the = since apiserver will strip
them out. This will send an invalid userdata down to the plugin (vmops)
where base64 decoding fails causing vm deployment to fail.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-26 19:40:22 +05:30
Prasanna Santhanam 8e72a728b7 Fix pep8 that broken marvin build 10 days ago :(
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-25 23:00:41 +05:30
Prasanna Santhanam 23e7753741 Fix bunch of affinity group tests
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 2b0a972676)
2013-07-25 22:51:35 +05:30
Prasanna Santhanam 9e8663c7ca CLOUDSTACK-3617: Skip the test if config is not suitable
Provided a utility method to ensure the config is suitable for running
the test. If vm.instancename.flag is unset then skip the tests.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 8b8cee52f09f9f2c1b612ece16fc7ffc4b2c9176)
2013-07-25 15:34:04 +05:30
Girish Shilamkar b8a38ca7bd CLOUDSTACK-3594: Fix regression in Affinity Groups tests
One of the patches introduced a regression where account
and domainid parameters were changed. Therefore Affinity
Groups for those accounts were not found and tests failed.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 4a7f5d59d6)
2013-07-24 16:53:45 +05:30
Girish Shilamkar 18fbbcfc5a CLOUDSTACK-3610: Fix regression test "test_accounts.TestUserLogin"
Now password is sent as clear text as per CLOUDSTACK-1734
So changed marvin to handle this. Plus domainid was not
passed in the testcase and marvin used "domainid" instead of
"domainId" as a parameter. Fixed these two errors.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit dba09791fc99c342974d8ca1c69609c04f1a5512)
2013-07-22 19:36:28 +05:30
Prasanna Santhanam 4956e46884 CLOUDSTACK-3075: When only setUpClass() is creating account
Missed scenario for appending test case names to accounts when
setUpClass calls the account.creation integration library.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 9a5d2e9e36411ac5df17baca13874e0575233dac)
2013-07-22 19:36:27 +05:30
Prasanna Santhanam a75a62a318 CLOUDSTACK-3075: Test names appended with <module>-<testname>
Prevent chained appending of the testclass/testnames to the accounnt
names.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit fb75f51755)
2013-07-22 12:50:28 +05:30
Prasanna Santhanam 2d55914e70 CLOUDSTACK-3075: append module/suite name
If the test doesn't create the account within the testXxx method we miss
the trail of the accountname because the setUpClass() created the
account. Append the module name in advance in such cases to identify the
account that was created in the suite before any tests were executed.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 6a8608a916eec2551797e93634d9716e9d15c783)
2013-07-22 12:19:03 +05:30
Prasanna Santhanam 2000005f90 CLOUDSTACK-3075: append test case name to account
Accounts will be prepended by the testcase name to ease analysis
post-test runs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 17af34fd19)
2013-07-20 15:53:50 +05:30
Prasanna Santhanam b8148c6220 CLOUDSTACK-3452: Refactor VirtualMachine.create()
When creating a VM if it's going to a basic zone program sec.group rules
so as to allow SSH access for any tests requiring ssh access to the
guest. Similarly method used to program the NAT and PF for SSH access is
refactored and extracted into a separate method. By default no SSH
access is allowed if the mode is set to 'default'

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 9c9003a0db)
2013-07-20 13:31:03 +05:30
Gaurav Aradhye 4f8c43fc20 CLOUDSTACK:3452: Check if security groups feature is enabled in basic zone before creating security group while creating VM
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3c360ce028)
2013-07-20 12:28:35 +05:30
Sanjay Tripathi ecfeaa1037 CLOUDSTACK-3620: [Automation] API removevpnuser failed, in test case test_project_usage.TestVpnUsage.test_01_vpn_usage.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-20 12:20:15 +05:30
Gaurav Aradhye bd80efc49a CLOUDSTACK-3452: Created security group for basic mode to allow SSH to vm
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 9c24c471bca83241a9ebf586567c0fd61231da19)
2013-07-19 17:44:52 +05:30
Prasanna Santhanam ae2ee95069 CLOUDSTACK-3655: RvR fails with unexpected state
The guestcidr is no longer specified directly. Use the netmask and
gateway combination to create custom cidr network

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit a4d902fc9b48e963d5987965207e3745e1728741)
2013-07-19 17:44:52 +05:30
Edison Su c618caf102 fix localendpoint npe 2013-07-17 16:29:52 -07:00
Girish Shilamkar 234db0561f CLOUDSTACK-3586: Fixed regression test cases for Affinity Groups
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-17 19:23:58 +05:30
Edison Su bf32776f9f be able to upload template into swift 2013-07-16 18:07:06 -07:00
rayeesn b3e2871e73 vmware - not reqiured to add host, host will be added as part of cluster
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-12 16:11:20 +05:30
Prasanna Santhanam f96b89f25e CLOUDSTACK-3273: ClassCastException when adding cache store via API
Filter the detail map sent over the wire into Map<String, String> before
processing underneath by  storage life cycle

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-05 15:32:41 +05:30
Prasanna Santhanam da9552b7f3 move isAlmostEqual to utils
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-04 20:14:54 +05:30
Edison Su 810c64e387 fix marvin when deploy vmware setup 2013-07-03 14:34:33 -07:00
Prasanna Santhanam 02f207f6c9 include account and domainid in affinity group creation
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-02 17:02:00 +05:30
Prasanna Santhanam 3684bafd37 pep8 fix
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-30 13:58:16 +05:30
Prasanna Santhanam f3e3048682 CLOUDSTACK-3074: include support for vmwaredc mapping to zone
vmware dc can be mapped to the zone after CLOUDSTACK-1963. include
support in marvin for adding the vmwaredc.

vmwaredc : {
    name:
    username:
    vcenter:
    password:
    zoneid:
}

Will be sent during pod creation before cluster creation.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 10:03:51 +05:30
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Prasanna Santhanam 9e474d018b do not flout pep8
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-28 19:02:59 +05:30
Prasanna Santhanam 9e8cf60b34 upgrade marvin classes to new style python objects
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-28 19:01:31 +05:30
Girish Shilamkar 3c0c6cb0b3 CLOUDSTACK-2254: Tests for Affinity and Anti Affinity rules
TestCreateAffinityGroup
TestListAffinityGroups
TestDeleteAffinityGroups
TestUpdateVMAffinityGroups
TestDeployVMAffinityGroups
TestAffinityGroupsAdminUser

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-27 09:51:29 +05:30
Daan Hoogland 3e430ccbf0 CLOUDSTACK-3096 format TestCaseExecuteEngine 2013-06-23 13:54:06 -04:00
Daan Hoogland d53f1c0946 CLOUDSTACK-3096 format cloudstackTestCase.py 2013-06-23 11:30:30 -04:00
Daan Hoogland 3f4204b8bc CLOUDSTACK-3096 format cloudstackException.py 2013-06-23 11:28:46 -04:00
Daan Hoogland 34fc209419 CLOUDSTACK-3096 format asyncJobMgr 2013-06-23 11:26:53 -04:00
Daan Hoogland 3fdcf1836c CLOUDSTACK-3096 format cloudsteackTestClient.py 2013-06-23 11:25:16 -04:00
Prasanna Santhanam 064b570c82 Correcting typo in deployDataCenter.py
isFreeZone is actually a test for whether the zone is a pure advanced
zone or an advanced zone with security groups. Renaming the var and
fixing the typo introduced by a65d21.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-21 21:23:10 +05:30
Daan Hoogland 1c50f1c756 CLOUDSTACK-3096: format codegenerator.py 2013-06-21 09:35:54 -04:00
Daan Hoogland f0ab05dc04 CLOUDSTACK-3096: format configGenerator.py 2013-06-21 08:55:08 -04:00
Daan Hoogland 3e5937e01d format dbConnection.py 2013-06-21 08:33:25 -04:00
Daan Hoogland 16e4f2ff72 format deployAndRun 2013-06-21 08:30:43 -04:00
Daan Hoogland a65d2153f1 pep8 deployDatacenter 2013-06-21 08:28:18 -04:00
Prasanna Santhanam a7ef5c343b pep8 - long line complaint.
.. and inline comment complaint.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-21 12:12:29 +05:30
Daan Hoogland c03ba0c8e6 CLOUDSTACK-3096: jsonHelper cleanup
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-21 11:46:37 +05:30
Daan Hoogland cd221fc33e marvinPlugin.py cleansed 2013-06-20 12:57:58 -04:00
Daan Hoogland fa58080807 remoteSSHClient cleansed 2013-06-20 12:56:18 -04:00
Daan Hoogland 30c6e2707a settings.py pep8 compliant 2013-06-20 12:32:39 -04:00
Daan Hoogland 4ca3f5c5e9 init without trailing whitespace 2013-06-20 12:29:06 -04:00
Daan Hoogland e8f0b2a48b pep8'ed the file 2013-06-20 12:24:28 -04:00
Prasanna Santhanam 694391ad04 add required provider for NFS storage
Changing the sandbox scripts and the marvin-checkin-test configurations
to include the required 'provider' argument when adding an image store
(secondary storage)

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-20 16:44:49 +05:30
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Girish Shilamkar 6e63bb7822 CLOUDSTACK-1758: Update ssh key location for vmware
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-19 12:15:10 +05:30
Prasanna Santhanam 746af2bb6f CLOUDSTACK-3049: marvin-nose causes other plugins to fail when not enabled
enabled by default. Running regular nosetests with plugins other than
marvin will fail because of this. Failure manifests itself as nose
looking for the config file when using the marivn-nose plugin

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-18 15:20:58 +05:30
Prasanna Santhanam 28b598b4ac Fix VPC tests related to user roles
Many vpc tests fail because of incorrect apiClient passed in to create
the VPC, network etc. The exact method used is getUserApiClient to fetch
the apiclient for a specific user.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-17 17:32:05 +05:30
Min Chen 6e0757bbf5 Fix indentation error in deployDataCenter.py. 2013-06-12 15:52:43 -07:00
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -07:00
Shane Witbeck 5fa1ad518f fix for incorrect secondary dns 2013-06-05 17:21:44 -04:00
Prasanna Santhanam 1ddcd3e697 refactor network acl test to use marvin libraries
Refactor the network ACL test to use the integration libraries

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-05 20:32:34 +05:30
Prasanna Santhanam 0a9b9f7944 Internal LB test refactored to use integration lib
Refactoring the internal lb test to use the marvin libraries. Also added
reqd methods for the internal lb related APIs into integration.lib

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-05 17:00:47 +05:30
Ashutosh 85062a75ae Test cases for assignVirtualMachne feature.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-30 11:03:25 +05:30
Anthony Xu 19a1116df2 Merge branch '4-2-advanced-zone-security-group' 2013-05-28 11:03:56 -07:00
ashutoshkelkar 204bdac77f Fix for repeated log lines in test case logs.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-28 11:15:57 +05:30
Prasanna Santhanam ed2ce27371 CLOUDSTACK-2652: requests module differs on Python 2.6
On 2.6 response.json returns the JSOn in the response while on 2.7
response.json() is a method. Since Marvin installs on both platforms
fixing the error appropriately

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-24 19:22:49 +05:30
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Wei Zhou e6863c612b Integration test for advanced zone with security groups
Description:
This patch includes three parts for advancedsg:
(1) Marvin support.
(2) devcloud support.
(3) integration test scripts

Testing Done:
devcloud testing ok.

Signed-off-by: Anthony Xu <anthony.xu@citrix.com>
2013-05-22 15:39:22 -07:00
Murali Reddy d6452be861 CLOUDSTACK-652: meging 'portable public ip' feature
Squashed commit of the following:

commit f244f9ce7982db16984dd87c31545f1c0240c704
Merge: 993cbb0 f5c8e38
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:54:05 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java

commit 993cbb0df9fa6e64b96b18ed775b73cdf4a8f5d7
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:49:54 2013 +0530

    introduce 'transferPortableIP' interface method in network manger. This
    method will transfer association of portable ip from one network to
    another network.

commit 0c1c2652c1b39e9a81ca35464360e11ed9ef23f1
Merge: a718d35 a29e393
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Fri May 17 02:48:54 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	utils/src/com/cloud/utils/net/NetUtils.java

commit a718d353f7
Merge: ecca117 c211818
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 21:22:19 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/network/addr/PublicIp.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit ecca117e34
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 20:05:29 2013 +0530

    added integration tests for testing portable ip ranges

commit 895a27c277
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 15:12:19 2013 +0530

    - establish model for transferring portable IP association from a network
      with which it is associated to another network.

    - enabling static nat api, extended to transfer potrtable IP across the
      networks if the VM/network is different from the current associate
      network of the portable ip

commit 51509751b2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 12:05:33 2013 +0530

    seperate out associate/disassociate with guest network operations from
    alloc and release of portable ip

commit bd058f58c2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 21:14:48 2013 +0530

    enhance disasociateIPAddr API to release protable IP associated with a
    guest network or VPC

commit 27504d9098
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 16:53:45 2013 +0530

    enhance asociateIPAddr API to acquire a protable IP and associate with a
    guest network or VPC

commit f82c6a8431
Merge: 3dbfb44 0749013
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 23:32:13 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
    	setup/db/db/schema-410to420.sql

commit 3dbfb44eb5
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 20:33:19 2013 +0530

    - add 'portable' boolean as property of IpAddress, persist the property in
    IPAddressVO, return the property in IpAddressResponse

    - add ability to request portable IP in associateIpAddress api

commit bf3cb274cf
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 16:08:40 2013 +0530

    add the status of each portable IP (its state, details of associated data
    center/VPC/guest network etc) in the PortableIpRangeResponse returned by
    listPortableIpRanges API

commit e7b2fb2255
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 14:36:01 2013 +0530

    Introdcues notion of 'portable IP' pool at region level.

    Introduces root admin only API's to provision portable ip to a region
       - createPortableIpRange
       - deletePortableIpRange
       - listPortableIpRanges
2013-05-20 20:05:47 +05:30
SrikanteswaraRao Talluri 28c5fbcb05 CLOUDSTACK-2483: Fix base.py migrate volume method
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-17 14:24:47 +05:30
Girish Shilamkar 4d0cea6626 CLOUDSTACK-2513: VPN tests refer to invalid connection.user in cloudConnection
cloudConnection object should always have "user" and "passwd" attributes.
And they are "None" while creating userAPIClient. As we already
have "user" and "password" for mgmt server.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-17 14:05:04 +05:30
Devdeep Singh adbebc1892 Changes for implicitly dedicating a resource. It includes a following:
1. A new implicit planner which extends the functionality provided by FirstFitPlanner.
2. Implicit planner can be used in either strict or preferred mode. In strict mode it tries to deploy a vm of a given account on a host on which vms of the account are already running. If no such host is found it'll search for an empty host to service the request. Otherwise the deploy vm request fails.
3. In preferred mode, if a host which is running vms of the account or an empty host isn't found, the planner then tries to deploy on any other host provided it isn't running implicitly dedicated strict vms of any other account.
4. Updated the createServiceOffering api to configure the details for the planner that the service offering is using.
5. Made db changes to store the service offering details for the planner.
6. Unit tests for testing the implicit planner functionality.
7. Marvin test for validating the functionality.
2013-05-17 11:40:31 +05:30
Prasanna Santhanam 50eeae81da don't let requests logs
requests logs to the logger making it hard to distinguish marvin logs
from http logs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-15 19:41:48 -07:00
Prasanna Santhanam b17be94cf5 don't let requests logs
requests logs to the logger making it hard to distinguish marvin logs
from http logs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-15 14:52:33 +05:30
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Prasanna Santhanam 894413e362 Marvin IP cleared tests for various cloudstack components
One big blob of all the tests that were posted for IP clearance several
months ago. IP clearance VOTE has passed on general@

Ref: http://markmail.org/thread/xareczan2kx4hhom

RAT check passed.
2013-05-14 10:24:27 +05:30
Edison Su 1694c1a502 fix download timeout 2013-05-13 14:40:49 -07:00
Prasanna Santhanam df39196bf7 marvin: build fails when no setuptools/distribute found
appropriately warn the user to install setuptools.

Also - fixed the jenkins url for builds.a.o

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-13 11:21:38 +05:30
Min Chen 0d580ccb26 Fix NPE in adding host and also put back lost change in deployDataCenter
due to rebase with master.
2013-05-11 22:00:40 -07:00
Alex Huang 3047929367 Merged 2013-05-10 16:21:43 -07:00
Min Chen 292e77b96b Fix marvin test to add S3 image store and cache storage. 2013-05-09 16:19:06 -07:00
Alena Prokharchyk 2660a6b7a7 CLOUDSTACK-747: Internal LB between VPC tiers support
Squashed commit of the following:

commit def0861d5a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu May 9 10:53:09 2013 -0700

    Inernallb: added internalLbVm to the list of network elements for nonoss build

commit 56d94fc074
Merge: d828c15 8f9a42e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu May 9 09:51:36 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
    	server/src/com/cloud/network/vpc/VpcManagerImpl.java

commit d828c154fd
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 8 14:58:22 2013 -0700

    internallb: Fixed nonoss build

commit 1b8a6986a6
Merge: 9e74fa9 738d35a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 8 13:20:07 2013 -0700

    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

commit 9e74fa9406
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Thu May 9 00:11:40 2013 +0530

    marvin changes for internallbvm provider

    - changed the simulator context to load the internallb bean
    - fixed deployDataCenter to use the additional provider by default
    - fixed the sandbox script and the setup script for simulator checkin
      tests

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 0a2d49301b
Author: Jessica Wang <jessicawang@apache.org>
Date:   Tue May 7 15:50:41 2013 -0700

    Internal LB - UI - zone wizard - advanced zone - enable internal LB element, enable internal LB provider.

commit 43e1667f90
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue May 7 13:26:53 2013 -0700

    Moved all DAOs and VOs to the cloud-engine-schema project

commit 2fd94c8bbe
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Date:   Tue May 7 18:26:08 2013 +0530

    CLOUDSTACK-893 api

commit 12b64d6c00
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 17:06:15 2013 +0530

    Fixing the gmaven configuration for marvin/pom.xml

    For the marvin checkin test custom properties had a typo when run for
    the *nix environment.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 1e4274dd9f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:28:43 2013 +0530

    Renaming TesDedicateVlanRange -> TestDedicateVlanRange

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 9264ac526f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:28:20 2013 +0530

    Adding isolation method to the zone creation of marvin

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 3a0dc67de0
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:27:26 2013 +0530

    adding ACL for dedicateGuestVlanRange set of APIs

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 79f6e11368
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:26:48 2013 +0530

    add debug logs when access checkers fail to find API

    When the access checkers fail for api discovery, we fail silently.
    instead record a debug message.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 92cb7d3e0f
Author: Hugo Trippaers <trippie@gmail.com>
Date:   Tue May 7 11:44:23 2013 +0200

    commit e0d8f01ecd enabled all tests. Fix
    AWSAPI build by removing broken tests and excluding failing tests.

commit 4a391464c7
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Tue May 7 10:57:23 2013 +0200

    commit e0d8f01ecd enabled all tests, but the tests in vmware-base are horribly broken and will not compile with the current CloudStack.

    Removing the tests to fix the nonoss build and they are so broken they should be rewritten from scratch anyway.

commit 2ca03a8513
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:51:34 2013 +0530

    moving test data to top level dictionary

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit ceaa4e1b0d
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:50:56 2013 +0530

    Adding tracelogs to the API discovery service

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit a3f5f01c7e
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:50:12 2013 +0530

    dedicateGuestVlanRange is admin only API

    Adding ACL for the dedicateGuestVlanRange API.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 1c4c80fe91
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Tue May 7 09:58:16 2013 +0200

    Recent pom switcharoo caused the client to lose the dependecy on console-proxy, which it needs to include the systemvm

commit 8103f3c386
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Date:   Tue May 7 11:30:17 2013 +0530

    CLOUDSTACK-893 first cut

commit 67d0411d73
Author: Dave Cahill <dcahill@midokura.com>
Date:   Fri Apr 19 17:31:44 2013 +0900

    Add docs for MidoNet networking plugin [CLOUDSTACK-996]

    Signed-off-by: Dave Cahill <dcahill@midokura.com>

commit c745e6d28e
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 16:34:03 2013 -0700

    Fixed up the simulator to run with windows paths in cygwin

commit be91c03702
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 10:34:22 2013 -0700

    Moved over the VLAN daos

commit dcc09f8472
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 06:31:47 2013 -0700

    Missing file and updated .gitignore

commit e9953cd1a8
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 06:29:59 2013 -0700

    Fixed up unit testing to use only an in class TestConfiguration

commit 6727571403
Author: Alex Huang <alex.huang@gmail.com>
Date:   Thu May 2 15:20:49 2013 -0700

    Fixed an incorrect unit test for affinity group.  Removed some useless pom.xml.

commit d015fb3520
Author: Alex Huang <alex.huang@gmail.com>
Date:   Thu May 2 06:50:38 2013 -0700

    Moved most of the VOs and DAOs from server package into engine-schema as well

commit 77547a58df
Author: Alex Huang <alex.huang@gmail.com>
Date:   Wed May 1 15:15:57 2013 -0700

    Removed files that are no longer used and further separated out the files in the core project

commit 345f3d3482
Author: Alex Huang <alex.huang@gmail.com>
Date:   Wed May 1 05:46:15 2013 -0700

    Moved agent commands to core and out of api

commit e91ca00571
Author: Alex Huang <alex.huang@gmail.com>
Date:   Tue Apr 30 19:06:20 2013 -0700

    Removed framework-api which is completely useless.  Changed framework-ipc to reference gson itself.  Move VOs into engine-schema.

commit f64564e490
Author: Dennis Lawler <dlawler@gmail.com>
Date:   Mon Apr 29 15:10:09 2013 -0700

    Removing filterwin2k option

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 944a7ea5d6
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Mon May 6 20:57:02 2013 +0100

    CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup

    Signed-off-by: Chip Childers <chip.childers@gmail.com>

commit ff7f8ba362
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Mon May 6 20:56:06 2013 +0100

    CLOUDSTACK-2322: update network.gateway to fix deployVm error on
    SharedNetwork after ipv6 support

    Signed-off-by: Chip Childers <chip.childers@gmail.com>

commit a153373c7e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon May 6 11:45:19 2013 -0700

    CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack

commit 46f59cd49e
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 20:39:36 2013 +0530

    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>

commit bd1dcc10b3
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 19:53:42 2013 +0530

    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>

commit 7f853cdb8f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 19:16:15 2013 +0530

    fixing double calls to VM deploy

    This fixes regression introduced in commit 2f40a90c that made duplicate
    calls to deployVirtualMachine.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 646e810fcf
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 18:51:53 2013 +0530

    fixing wildcard imports

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit b29b6e8525
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Fri May 3 14:03:53 2013 +0200

    BigSwitch should only respond if it is the actual provider on the network.

    This fixes an NPE during the release call.

commit 6fcc9b009b
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Thu May 2 17:38:27 2013 +0200

    Prevent Nicira NVP tags from exceeding the 40 character limit.

commit d8e61a1c0a
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date:   Thu May 2 13:45:39 2013 +0530

    CLOUDSTACK-2188 : Parsing error with Download Monitor while checking the health of downloaded templates

    Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

commit 5b6e1140f9
Author: Sebastien Goasguen <runseb@gmail.com>
Date:   Mon May 6 05:35:58 2013 -0400

    CLOUDSTACK-2339: Adding libcloud example

commit 7be62d2374
Author: Sebastien Goasguen <runseb@gmail.com>
Date:   Mon May 6 05:35:19 2013 -0400

    CLOUDSTACK-2338: Adding example of how to sign api requests in python

commit 156fd68902
Author: Talluri <Srikanteswararao.Talluri@citrix.com>
Date:   Fri May 3 23:11:56 2013 +0530

    CLOUDSTACK-2323: fix test scripts to conform with library changes

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 33ff5e9107
Author: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Date:   Tue Apr 30 20:09:46 2013 +0530

    CLOUDSTACK-702: Tests for Multiple IP Ranges

    1.Deleting IP Range from the existing CIDR
    2.Add non-contiguous guest IP range in new CIDR
    3.Add overlapped guest IP range in existing CIDR

    Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 33059d1f66
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Mon May 6 14:08:40 2013 +0530

    scaleUp VM response change corresponding UI changes

commit 92e18d8106
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Mon May 6 13:45:32 2013 +0530

    CLOUDSTACK-2337:Resize button available for root/domain admin and normal users

commit d5cd3f7e00
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Wed May 1 13:47:26 2013 +0530

    Dedicate guest vlan range to account

commit 12c79c8377
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sun May 5 12:02:32 2013 +0530

    scale up virtual machine response change in the backend

commit 94bac27622
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Sun May 5 09:58:04 2013 +0530

    appliance: Upgrade systemvm appliance from rc1 to Debian7 GA

    Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

commit c598bb0038
Author: Isaac Chiang <isaacchiang@gmail.com>
Date:   Sun May 5 01:57:35 2013 +0530

    CLOUDSTACK-2076:Listview widget infinte scrolling error

commit d0615ea9a1
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sun May 5 01:15:14 2013 +0530

    CLOUDSTACK-2274:Detail view loading problem when deleting a zone

commit 733b513c3a
Author: Isaac Chiang <isaacchiang@gmail.com>
Date:   Sat May 4 13:41:02 2013 +0530

    CLOUDSTACK-2160:Refresh button functionality for security groups and statistics tab

commit 418d75d7a4
Author: Marcus Sorensen <marcus@betterservers.com>
Date:   Fri May 3 14:09:52 2013 -0600

    Summary: Release old DHCP entries

    Detail: Refresh dnsmasq with updated entries live, no outage

    BUG-ID: CLOUDSTACK-2299
    Submitted-by: Dennis Lawler <dlawler@gmail.com>
    Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367611792 -0600

commit b3dce64577
Author: Kelven Yang <kelveny@gmail.com>
Date:   Tue May 7 10:57:19 2013 -0700

    fix unitest

commit b17885f0f6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue May 7 09:55:47 2013 -0700

    InternalLb: some fixes to the unittest

commit 1cff609347
Merge: 053e184 a3a5c13
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri May 3 11:23:08 2013 -0700

    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

commit 053e18454d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri May 3 11:07:07 2013 -0700

    InternalLB: marvin integration test for internal lb feature

commit 2e8e2f98f5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 13:53:20 2013 -0700

    InternalLB: don't allow to upgrade the network from the network offering with internal LB to the offering with public LB, and vice versa

commit c773d204c8
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed May 1 13:21:52 2013 -0700

    Internal LB: if we detect that we are inside an internal lb vm, call out to the ilb script to perform LB configuration

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 8c8845bf77
Merge: 7e95545 471ca30
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 10:14:06 2013 -0700

    Merge branch 'master' into internallb1

commit 7e9554596f
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 10:01:16 2013 -0700

    InternalLb: boot args parameters cleanup for the internal lb vm

commit b7cf870074
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 30 10:31:28 2013 -0700

    InternalLb: more unittests for internal lb element

commit 63bb98ebe2
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Mon Apr 29 18:29:25 2013 -0700

    allow ssh on eth1

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit ca1c313c29
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 17:58:45 2013 -0700

    InternalLb: DB upgrade - update existing physical networks with InternalLbVm provider

commit ed50caa01c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 17:48:36 2013 -0700

    InternalLbVM: handle the scenario when sourceIpAddress is not passed when create internal Lb rule

commit 4c22c911a9
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Mon Apr 29 15:56:00 2013 -0700

    backend support for Internal LB

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 7b24a7640c
Merge: 440e848 a0dbf89
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 15:49:48 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/api/query/QueryManagerImpl.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit 440e8484d6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 13:27:06 2013 -0700

    InternalLB: unittests for InternalLoadBalancerVMManager

commit 63babe4b7e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 26 13:44:01 2013 -0700

    InternalLb:

    1) Added unittests for InternalLoadBalancerVMService
    2) Added unittests for InternalLoadBalancerElementService

commit 4f9c47ce54
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 25 14:46:42 2013 -0700

    InternalLb: create internal lb vm specific service offering

commit 408ee59d1f
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 17:08:08 2013 -0700

    Internallb: new set of Web services APIs for managing Internal LB VMs

commit 7680e1cc10
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 17:08:08 2013 -0700

    Internallb:

    1) InternalLb and PublicLb can't be enabled on the same network offering
    2) Can have internalLb only on VPC tier

commit d73ca7ef73
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 13:02:32 2013 -0700

    InternalLb:
    1) fixed the bug when the guest nic on internal lb vm wasnt set to be default
    2) Don't send the rules to the internal lb vm if its in Stopped state

commit ca2fc30655
Merge: 8057567 04a2b2d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 23 16:56:11 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/vpc/VpcManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	setup/db/db/schema-410to420.sql

commit 8057567aaa
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 23 13:15:36 2013 -0700

    Internallb: more unittests for ApplicationLoadBalancerService

commit 35c0273b85
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 19 16:17:45 2013 -0700

    InternalLb: unittests for ApplicationLoadBalancerService

commit 69b23f7003
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 14:01:10 2013 -0700

    InternalLb: create/configure/listInternalLoadBalancerElement - fixes to the API response

commit a3321ce617
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 13:31:16 2013 -0700

    Internal LB : renamed the classes responsible for managing internal lb elements. Now the names are InternalLoadBalancerVMManager, InternalLoadBalancerVMService and InternalLoadBalancerVMManagerImpl

commit 2baf7c365c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 10:02:17 2013 -0700

    Internallb: verify requested IP for LB rule (if specified) against guest network cidr

commit 0cfe96bd00
Merge: 501f2ff 11162f5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 17 15:41:51 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	setup/db/db/schema-410to420.sql

commit 501f2ffa0b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 17:03:50 2013 -0700

    InternalLb: validate source ip network as a part of LB rule creation

commit 4d9a7dfd85
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 16:03:32 2013 -0700

    InternalLB: in VPC, restrict public LB to one tier only. Internal LB can be supported on multiple tiers

commit 8689bf9eb3
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 15:59:56 2013 -0700

    Internal LB: added internal lb vm to the list of supported providers in VPC default offering

commit b7709b89ff
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 11:04:22 2013 -0700

    Internal Lb: added 2 boolean fields - internal_lb and public_lb - to the network offering. Define if internal or public LB service is supported. In the current release it's either one or another; in the future releases we might support both on the same network

commit 014689e45e
Merge: b3b16ba 90e8158
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 09:55:45 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/network/Network.java
    	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit b3b16bae48
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 17:00:31 2013 -0700

    InternalLB: allow to specify more than one provider for the LB service when create network offering as diff providers can support internal and public LB for the same network

commit a4fc1d7d65
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 13:45:25 2013 -0700

    Internal LB:

    1) Added network_offering_details DB table and corresponding VO/DAO objects. Change createNetworkOffering web services api to accept the map of key/value pairs as details.
    2) Allow to have multiple providers for the same service for the network to support the case when LB service can have separate providers for Internal LB and Public LB

commit 4530cebf2b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 10:06:10 2013 -0700

    InternalLbVm: support for start/stop Internal lb vm

commit ae69f0ae56
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 17:25:02 2013 -0700

    InternalLb: fixed prepare() in InternalLbElement - have to prepare nics of User vms only

commit 888a83c221
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:58:27 2013 -0700

    InternalLb: Start/deploy internal LB vms for the existing LB rules as a part of network implement

commit 3b41d5bee1
Merge: bb73531 4b1a9f1
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:32:40 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/NetworkModelImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java

commit bb73531fed
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:13:55 2013 -0700

    Internal Lb: list internal lb vms as a part of listRouters response. Introduced new parameter - role (can be virtual_router or internal_lb_vm)

commit c113ea184b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 12:00:09 2013 -0700

    Add Internal Lb Provider/Element as a part of adding a physical network

commit 78c9db79da
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 10:05:28 2013 -0700

    InternalLbVm: destroy the internal lb vm when the last rule for the ip is being revoked

commit af6201257b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 16:55:37 2013 -0700

    Internal LB: fixed some bugs in internal lb vm startup process

commit 1db240c2b6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 14:23:55 2013 -0700

    InternalLb: fixed searchCriteria constructor in ApplicationLoadBalancerDaoImpl

commit 3795048fcc
Merge: f4c2b53 5f8a278
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 14:09:31 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/async/AsyncJob.java
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	api/src/org/apache/cloudstack/api/BaseCmd.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiDBUtils.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	setup/db/db/schema-410to420.sql

commit f4c2b53c21
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 13:46:47 2013 -0700

    InternalLB: modified InternalLbElement to start the Internal Lb vm for each ip address (if not already started)

commit 76a4b1cf81
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 11:41:47 2013 -0700

    InternalLB: added logic for acquiring guest ip address for the Internal LB rule

commit 915e39fbaa
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 10:19:18 2013 -0700

    Removed unused methods doing ipAllocation from GuestNetworkGuru and NetworkServiceImpl. The correct method is located in NetworkModelImpl

commit 3f2a62c7f6
Merge: 20beb7a a0b5ebc
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 17:16:07 2013 -0700

    Merge branch 'master' into internallb1

commit 20beb7a16c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 15:28:12 2013 -0700

    Internal LB: applyLoadBalancerRules - put not null check for sourceIpAddressId (can be null when Schema is not Public)

commit 87e5f5b9a6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 15:17:58 2013 -0700

    Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl

commit 53b9c0d142
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 17:55:10 2013 -0700

    Internal LB: added @Since to API docs for Internal LB related commands

commit 867b305ea8
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 17:51:19 2013 -0700

    Internal LB: Made InternalLbElement to extend the ip deployer as the LB service implements IPDeployerRequester

commit 7b9af28094
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 15:45:30 2013 -0700

    InternalLb: new set of Web Services APIs to add InternalLB as a network element to the cloudStack (the element is packaged as an independent plugin). New APIs:

    1) configureInternalLoadBalancerElement
    2) createInternalLoadBalancerElement
    3) listInternalLoadBalancerElements

commit 039e303d4a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 14:01:11 2013 -0700

    InternalLB: Modified pluggable service VirtualRouterElementService to accept only VirtualRouter and VpcVirtualRouter as a VirtualRouterProvider type when add/configure elements. Other VirtualRouterProviderTypes are are taken care by elb/internal lb plugins.

commit f0018b4512
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 12:56:42 2013 -0700

    Internal LB:

    1)Added InternalLoadBalancerManager and corresponding Impl
    2)Add InternalLbVm as a default CS provider. DB upgrade is covered as well

commit e344cf250a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 16:57:47 2013 -0700

    InternalLB - removed unused code from LoadBalancerDao

commit 3588f46848
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 16:23:03 2013 -0700

    Internal LB - added network-element plugin for internal lb service

commit 76325e6168
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 13:58:08 2013 -0700

    Internal Lb:

    1) When network has both kinds of LB rules - Public and Internal - never send them in the same set to the provider
    2) Added extra checks on the provider side to validate if the schema - Public or Internal - is supported.

commit 56c2fe1d37
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 12:34:59 2013 -0700

    InternalLB:

    1) Added new capability for the LB service - LbSchemes. Can take 2 values - Internal and Public.
    2) F5 and Netscaler LB providers - changes all LB related methods to accept LoadBalancingRule instead of ? extends FirewallRule.

commit 34bcb2d026
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 12:11:11 2013 -0700

    InternalLB: implemented list/delete/create web services API commands that will be used for Internal LB creation

commit 9ab31e11f7
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 5 15:59:55 2013 -0700

    InternalLB: change LoadBalancingRule - reference sourceIpAddress of th load balancer by its value, not DB id

commit 08f855d4e4
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 4 09:26:21 2013 -0700

    InternalLB:

    1) Added new set of Interfaces - including the new VO - for the internal load balancer
    2) DB change - added source_ip_address/source_ip_address_network_id/scheme (Internal/Public) fields to the load_balancer table
2013-05-09 11:54:41 -07:00
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
Sangeetha Hariharan 5ef2f1f26f CLOUDSTACK-2329, CLOUDSTACK-1820: Tests for regions
Marvin tests and corresponding library changes for the regions feature.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 13:49:13 +05:30
Likitha Shetty 3a41a83f88 [MARVIN] Fixing dedicate_guest_vlan_range test 2013-05-08 11:22:16 +05:30
Prasanna Santhanam b9f262aa1c Fixing the gmaven configuration for marvin/pom.xml
For the marvin checkin test custom properties had a typo when run for
the *nix environment.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 17:06:15 +05:30
Prasanna Santhanam 808b49b216 Adding isolation method to the zone creation of marvin
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
Alex Huang 3722d66aae Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
Prasanna Santhanam 71771c1ba4 fixing double calls to VM deploy
This fixes regression introduced in commit 2f40a90c that made duplicate
calls to deployVirtualMachine.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-06 19:16:15 +05:30
Likitha Shetty c8d843241e Dedicate guest vlan range to account 2013-05-06 10:02:41 +05:30
Mice Xia d7cab21e9a 1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot 2013-05-03 12:32:53 +08:00
Min Chen 36c1538f06 Bugfix to make deployDataCenter.py work. 2013-04-30 17:42:48 -07:00
Ashutosh Kelkar 2f40a90c53 Multiple fixes to marvin framework
1. adding hypervisor information to configs
    TODO: support for multi-hypervisor zones?
2. CLOUDSTACK-601: Marvin unicode decode errors when running mysql
queries via dbClient
3. adding keypair support for remotessh client

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-26 12:16:08 +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
Talluri 9572f57648 CLOUDSTACK-2135: fix the string formatting error in cloudstackConnection.py
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
Devdeep Singh 21ce3befc8 Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-19 11:36:42 +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
Prasanna Santhanam 167781ec01 refactor marvin to use requests instead of urllib2
Use python-requests [1] for Marvin. Requests enables graceful handling
of http connections. Marvin's cloudstackConnection has been refactored,
cleaned up to act as a single module for all kinds of cloudstack API
requesting.

TODO:
1. session based login mechanism of the UI should work from
cloudstackConnection
2. cloudmonkey can also reuse /import marvin.cloudstackConnection
3. More graceful handling of POST requests

[1] http://docs.python-requests.org/en/latest/

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-17 19:11:47 +05:30
Koushik Das e94c70254b Squashed commit of the following:
commit 7ce45ea108
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 15 18:36:33 2013 +0530

    Fixed indentation and line ending

commit 0232048f90
Merge: 735c4c8 97911e9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 15 17:05:59 2013 +0530

    Merge branch 'master' into cisco-vnmc-api-integration

    Conflicts:
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	client/tomcatconf/commands.properties.in
    	setup/db/db/schema-410to420.sql
    	tools/marvin/marvin/integration/lib/base.py

commit 735c4c8955
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 15 15:20:37 2013 +0530

    Fixed unit tests based on recent changes in the Vnmc resource code

commit f166f2d0bf
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 15 14:50:25 2013 +0530

    added tests to register vnmc and asa appliance in cloudstack

commit f38be4810e
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 18:42:06 2013 +0530

    Removed unwanted files

commit 902ce426c1
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 17:59:30 2013 +0530

    Fixed auto-wiring of components for Cisco Vnmc

commit 08467ee307
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 16:04:54 2013 +0530

    Fixed compilation issues, incorrect merges from last commit

commit 67f11d46ad
Merge: 3422cee c9c68e1
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 15:11:10 2013 +0530

    Merge branch 'master' into cisco-vnmc-api-integration

commit 3422ceefb6
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 14:42:32 2013 +0530

    Correctly associating nat, acl policy sets to edge security profile in VNMC

commit 9c1e193fca
Author: Koushik Das <koushik.das@citrix.com>
Date:   Sun Apr 7 21:22:22 2013 +0530

    Passing correct subnet mask while creating edge firewall in VNMC

commit 05e3d04b55
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Apr 2 17:50:57 2013 +0530

    Added changes related to icmp

commit bcecb589de
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 1 13:57:21 2013 +0530

    Some xml file renames

commit 9c1ee93f2e
Author: Koushik Das <koushik.das@citrix.com>
Date:   Sat Mar 30 15:54:25 2013 +0530

    Fixed PF and static NAT rule creation in VNMC

commit 7e6159fa05
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 27 18:53:49 2013 +0530

    Added more unit tests for Cisco Vnmc element

commit fc0ed9adb6
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 27 16:48:28 2013 +0530

    Cleaning up VNMC config as part of network shutdown

commit 5a427d48e2
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 27 02:22:54 2013 +0530

    Added unit test for Vnmc network element implement() method

commit 48cbf34d3b
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 27 02:20:45 2013 +0530

    Passing correct gateway ip while creating vservice node and guest port profile in Nexus

commit 2c386c61ef
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 22 13:50:52 2013 +0530

    Nexus 1000v fix

commit 4d2168bfa9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 22 00:30:01 2013 +0530

    Egress firewall rule

commit e81ab3a2f4
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Mar 21 10:50:29 2013 +0530

    More tests for VnmcResource class

commit 9e9c179212
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Mar 21 00:25:10 2013 +0530

    Fixed build issue from master merge

commit f0c1af2b5c
Merge: 4f305c2 873ec27
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 20 16:20:10 2013 +0530

    Merge branch 'master' into cisco-vnmc-api-integration

    Conflicts:
    	api/src/com/cloud/network/Network.java
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	client/tomcatconf/components-nonoss.xml.in
    	client/tomcatconf/nonossComponentContext.xml.in
    	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
    	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
    	setup/db/db/schema-410to420.sql
    	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java

commit 4f305c2beb
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 20 15:09:34 2013 +0530

    Initial set of tests, will add more in subsequent commits

commit 50bfcc1f75
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 20 15:02:14 2013 +0530

    Updated pom to copy xmls to target location during build

commit 45bc92b826
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 20 14:58:59 2013 +0530

    Fixed cpmpilation issue as missed out adding this file

commit 2ce7cdc756
Author: Koushik Das <koushik.das@citrix.com>
Date:   Sun Mar 17 17:02:25 2013 +0530

    Creating vservice node and associating it with port profile in nexus for guest VMs

commit 387545caff
Author: Koushik Das <koushik.das@citrix.com>
Date:   Sat Mar 16 11:14:43 2013 +0530

    Added license headers to XML files

commit 43e2997421
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 13 11:51:59 2013 +0530

    Changes related to instantiating the dao components

commit 99e88ecbf9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Mar 12 23:40:35 2013 +0530

    Fix build errors after merge from master

commit 7c20b120c2
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Mar 12 23:31:46 2013 +0530

    Fixing poms and other xmls

commit ee868759a8
Merge: 9c94b6d a1b33ca
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Mar 12 14:44:59 2013 +0530

    Merge branch 'master' into cisco-vnmc-api-integration

    Conflicts:
    	api/src/com/cloud/network/Network.java
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	plugins/pom.xml
    	setup/db/create-schema.sql

commit 9c94b6d231
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 8 22:20:23 2013 +0530

    Fixed XML to create static route in VNMC correctly

commit ef069b3323
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 8 15:26:26 2013 +0530

    Added logic for revoking ACL, PF and Static NAT rules

commit 4c65b70668
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 8 13:51:37 2013 +0530

    Renamed delete-acl-rule -> delete-rule

commit aa94eca516
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 8 00:38:52 2013 +0530

    - Creating static routes in VNMC as part of edge firewall configuration
    - Passing order parameter while creating rules so that they are evaluated in a specific order
    - Added methods in VnmcResource for listing acl policies and rules belonging to variouos policies. This is used to compute order while creation of various rules in VNMC

commit cc824e8585
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Mar 7 12:16:29 2013 +0530

    Adding appropriate ACL rules for PF and static NAT

commit fb23c50365
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 1 17:21:45 2013 +0530

    Added logic for deleting various VNMC artifacts. Added/updated relevant xmls as well.

commit 970c21a9a3
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 1 01:54:10 2013 +0530

    Added implementation for delete of asa and vnmc apis

commit 22e1455142
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 1 01:19:43 2013 +0530

    List asa api to return guest network if associated. From this it can be inferred if asa is available or not

commit 32223736c9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 1 00:50:55 2013 +0530

    Added Vmware cluster info along with asa1kv appliance.
    This is used to select the correct n1kv vsm for configuring the guest network

commit deed3cc951
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 25 18:03:59 2013 +0530

    Added support for static NAT rules.
    - Xmls for creating static nat rules in VNMC
    - applyStaticNats implementation in VNMC network element
    - handler for static nat in resource class

commit 681f0b7b50
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 25 10:44:13 2013 +0530

    Added implementation for firewall and port forwarding rules in Cisco VNMC element class

commit 66b01a6589
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 22 19:19:44 2013 +0530

    VNMC xml for deleting NAT policy

commit 5d98686768
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 22 19:16:41 2013 +0530

    Added support for PF/DNAT rules.
    Created methods in VNMCConnection class to create PF rules. Also moved out common code for PF and source NAT in methods.
    Updated the corresponding VNMC resource class.

commit 8db2fbeb8f
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 22 18:21:45 2013 +0530

    Added xml for creating NAT policy set in VNMC

commit f2da0d50ca
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 22 18:17:53 2013 +0530

    Added VNMC XMLs for supporting PF/DNAT rules.
    Also moved out some XMLs related to source NAT to common files so that these can be used for both source NAT and DNAT

commit 124a48819d
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Feb 21 17:53:12 2013 +0530

    Separated out creation of ACL policy set and policy in VNMC

commit 1e38515f35
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Feb 21 11:54:44 2013 +0530

    Added changes to create ingress fw rules in VNMC

commit cb2fba9e7c
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Feb 14 16:23:05 2013 +0530

    Source NAT in VNMC

commit 720fe2f908
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Feb 13 14:16:47 2013 +0530

    Fix Vnmc test file

commit d6dbe790c6
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Feb 13 12:07:03 2013 +0530

    Added db. tables for asa1kv devices and their mapping with guest network

commit 3fd7e30f6e
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Feb 13 11:52:12 2013 +0530

    Changes:
    - Added implementation for add/list asa1kv APIs
    - Added agent command for associating asa1kv appliance with logical edge firewall in VNMC
    - Added handler for the above agent command in VNMC resource class
    - Updated VNMC element class to support the above

commit d08e2a1faf
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Feb 13 11:40:58 2013 +0530

    Added lifecycle APIs for Cisco Asa 1000v appliance.
    Added corresponding Dao and VO classes.
    Also added mapping Dao and VO for guest netwok and asa appliance

commit 6b999ec867
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Feb 12 00:05:39 2013 +0530

    Changes:
    a. Added handlers for CreateLogicalEdgeFirewall and ConfigureNexusVSMForASA commands
    b. Logic for add/list vnmc device API
    c. Partial implementation for network element implement()

commit 0656250308
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 11 23:48:19 2013 +0530

    Moved VNMC provider creation to Network.java. The plugin code would have been the ideal place to keep it but current state of the code doesn't allow it.

commit dc402eaa7a
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 11 23:35:19 2013 +0530

    Added new commands for the following:
    a. Logical edge firewall creation in VNMC
    b. Asa1kv vservice node creation and updating asa1kv inside port profile with guest network vlan id in n1kv VSM

commit d6cdfe35f8
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 11 23:06:36 2013 +0530

    Added helper method to create port profile in n1kv VSM with additional parameters VDC tenant and edge security profile
    Added helper method to create a vservice node in n1kv VSM

commit db42da17e9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 11 22:44:01 2013 +0530

    Added database table for storing VNMC devices

commit f991436335
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 8 16:00:15 2013 +0530

    Added support for network offering creation with VNMC as provider for firewall, port forwarding, source nat

commit 74de210359
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 8 15:06:11 2013 +0530

    Added name attribute for the VNMC lifecycle commands

commit 6ce25ef11d
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 16:44:28 2013 -0800

    Fix licensing

commit 392cd8ed63
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 16:38:19 2013 -0800

    cisco-vnmc: Fix api to use new conventions

commit 6b142bbaab
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:33:33 2013 -0800

    WIP: configure ASA port profile

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 1ae21ea49a
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:33:01 2013 -0800

    WIP rename device to resource to better reflect nature of VNMC

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 84d218f972
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:32:54 2013 -0800

    WIP: fixes for associating ASA1000v to tenant

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit d74c6a9ac2
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:32:45 2013 -0800

    WIP: fixes for associating ASA1000v to tenant

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 9350d10849
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:32:29 2013 -0800

    WIP: admin commands for adding / listing VNMC

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit a8031a0cfe
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:41 2013 -0800

    WIP ASA 1000v listing"

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit f9cc674b9c
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:36 2013 -0800

    WIP : edge firewall

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 6a0964af00
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:30 2013 -0800

    WIP : edge security policy

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit e32295e8cf
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:24 2013 -0800

    WIP : dhcp server policy

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 446a9b8491
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:18 2013 -0800

    WIP : dhcp server policy

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit e35e0eb59b
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:14 2013 -0800

    Move unit test

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 2b43a3e74e
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:08 2013 -0800

    Move unit test

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 11b804a894
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:29:54 2013 -0800

    WIP: XML control of VNMC

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-15 18:58:43 +05:30
Likitha Shetty 8f865c5a90 Dedicate Public IP address range to an account 2013-04-12 23:27:35 +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 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
Prachi Damle fd23b36c11 Integration testcase and the config file needed, that runs with marvin. 2013-04-11 13:23:13 -07:00
Prasanna Santhanam f8bbd88a42 maven+marvin: Fix up the activation property
activation property marvin.config will attempt to deploy a zone again on
running the marvin.test profile. This is unnecessary as marvin.setup
already finishes deploying a zone.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-10 16:16:41 +05:30
Chiradeep Vittal bf56403d82 QuickCloud: default to enabled if not specified in datacenter config 2013-04-09 14:45:27 -07:00
Chiradeep Vittal a806ce43d3 QuickCloud: allow specification of network offering name in datacenter config. The deployDatacenter python script will use this to pick the network offering during creation of the default network in a basic zone 2013-04-09 14:45:26 -07:00
Chiradeep Vittal e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
Jessica Wang 98bc240d2a Revert "Dedicate Public IP range"
This reverts commit d6ed8d7cb5.

Conflicts:

	server/test/com/cloud/configuration/ConfigurationManagerTest.java
2013-04-08 17:15:51 -07:00
Likitha Shetty d6ed8d7cb5 Dedicate Public IP range 2013-04-08 14:46:21 -07:00
Prasanna Santhanam b798c45114 maven+marvin+simulator: Changes to the lifecycle steps
integration test is now run as follows:

Build
$ mvn -Pdeveloper -Dsimulator clean install

DB:
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator

Setup:
$ mvn -Pdeveloper,marvin.setup -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Test:
$ mvn -Pdeveloper,marvin.test -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 19:56:33 +05:30
Prasanna Santhanam 82fd9382b7 marvin+sync: apidiscovery sync and regenerate for marvin
Use codegenerator to sync marvin cloudstackAPIs from a given cloudstack
endpoint. Sometimes you want to synchronize marvin with the new APIs
that you have introduced locally or any alterations you may have made
the API. In such cases you can sync marvin's libraries as follows.

$sudo mvn -Pdeveloper,marvin.sync -Dendpoint=localhost -pl :cloud-marvin

This needs sudo privileges since it will call on pip to upgrade the existing
marvin installation on your machine. The endpoint is where your management
server is running and is exposing the API discovery plugin. A listApis call is
made and the resulting json deserialized back into marvin's library entities.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 19:56:28 +05:30
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 9c755e11e5 marvin-nose: include the plugin as part of marvin install
No need to register the plugin seperately now. The installer will
register with nose's entry_point automatically.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +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
Prasanna Santhanam 3075d0cf56 marvin: argparse enhancement and unit-test-xml-reporting dependency removed
1. deployAndRun will use the more modern argparse module
2. improving logging within the remoteSSHClient, moving to debug and
default logging to INFO
3. removing dependance on the xmlrunner. use nose --with-xunit instead

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +05:30
Prasanna Santhanam 323c3211c8 run the test lifecycle only when config is specified 2013-03-20 11:07:49 +05:30
Prasanna Santhanam 02b3cd7de9 marvin logging: write to tmp to adjust for mac-osx
/var/log is not available on OSX. This breaks the simulator run.
2013-03-20 10:47:15 +05:30
Prasanna Santhanam 792db8b5cc simulator: removing cyclic dependency from simulator
The database creator caused a cyclic dependecny in the simulator which
is removed with this commit. Additionally the simulator profile is now
merged with developer profile and a test for server health is included

Steps to run:
$ mvn -Pdeveloper clean install
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator
$ mvn -pl client jetty:run

To deploy an adv. zone and test the server health:
$ mvn -Pdeveloper,marvin -Dmarvin.config=`find . -name simulator.cfg` -pl :cloud-marvin test

Conflicts:
	pom.xml

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-20 10:36:43 +05:30
Chiradeep Vittal 6a1ecae552 Ensure RAT does not report marvin generated files as noncompliant in developer environment
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-02 16:49:02 +05:30
Chiradeep Vittal f30da781f8 Reduce RAT errors in developer environment due to generated python files
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-27 13:44:50 +05:30
Rohit Yadav 80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Prasanna Santhanam 05437d0e97 maven pom: put apache cloudstack tools together in umbrella pom
minor pom refactor to put all the tools under one placeholder pom.
Also adds a profile for marvin to run deployDataCenter via mvn options.

$mvn -Pdeveloper,marvin -pl :cloud-marvin -Dmarvin.config=<path/to/config>

OR
$cd tools/marvin
$mvn -Pmarvin -pl :cloud-marvin -Dmarvin.config=path/to/config

will deploy the datacenter using the marvin.config property's value

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-15 20:53:41 +05:30
Prasanna Santhanam e06a8569a2 propagate storagetype fix from commit e49b3b to diskOffering
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Sun Dec 9 23:13:24 2012 -0800

    marvin: storagetype reference only when attr present

    reference the storagetype only when present. storagetype is reqd
    only for devcloud style tests

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-31 16:03:43 +05:30
Marcus Sorensen 15906c03ca Summary: add/remove/update default nics feature
Description: Adds API calls updateDefaultNicForVirtualMachine,
addNicToVirtualMachine, and removeNicFromVirtualMachine. These are
intended to allow a user to modify a VM's configuration post
deployment, to adjust the networks to which the VM belongs.

BUG-ID: CLOUDSTACK-645
Submitted-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359494800 -0700
2013-01-30 17:43:21 -07:00
Marcus Sorensen 975021dda1 Summary: adding resizeVolume api call
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.

BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
2013-01-16 17:43:35 -07:00
Prasanna Santhanam bfd02c5db3 traffic_type not traffictype
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-15 19:36:30 +05:30
Prasanna Santhanam 04b14ab03f Marvin: physical network label not carried through in the API
The label associated with the hypervisor nic to isolate traffic types by
Guest/Mgmt/Public/Storage was not passed in the marvin.traffictype
object and sent through to mgmt server resulting in traffic types not
being applied.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-15 19:29:27 +05:30
Marcus Sorensen 0293d3d665 Summary: Allow passing 'storagetype' to DiskOffering.create in marvin base.py
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358185899 -0700
2013-01-14 10:51:39 -07:00
Prasanna Santhanam 8d3cbc82d8 marvin: fixes for handling multiple phy. networks
zones do not qualify for vlans but phy networks should carry the
underlying vlan information. moving the vlan down to physical_network
in configGenerator.py.

also the sandbox example has been corrected to reflect this change
and includes an illustration of using traffic types with labels.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Reported-By: Marcus Sorenson <mlsorenson@apache.org>
2013-01-13 13:42:02 +05:30
John Burwell e4583ced2e S3-backed Secondary Storage 2013-01-02 10:28:47 -08:00
Prasanna Santhanam bab974c3bc marvin : cloudstack-version is not reqd for json load
To build back cloudstack response we don't need to load the
'cloudstack-version' string, only the response
2012-12-26 19:22:17 -08:00
John Burwell 264a0670a8 - [CLOUDSTACK-509] S3-backed Secondary Storage - Adds S3 configuration support to Marvin - Moves configuration of global options to occur creation of zones since the values of global options impact the configuration and zone enablement processes 2012-12-19 16:09:25 -08:00
John Burwell 14f589702a CLOUDSTACK-660: Fixes traffic label configuration in Marvin
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-18 13:25:24 -05:00
Edison Su b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Prasanna Santhanam ceea53cd8f marvin: remoteSSHClient logger handler
send the logs to the console stream
2012-12-13 19:22:49 -08:00
Prasanna Santhanam fb5ea25a4d marvin: remoteSSHclient logs
Adding logging for commands sent, and executed with results returned
frmo the remote host.
2012-12-13 15:58:36 -08:00
Prasanna Santhanam f05cd36634 marvin: assertions with messages for common.py 2012-12-13 15:25:39 -08:00
Prasanna Santhanam fd6be7a37b marvin: establishing some defaults
when logging in just use defaults if no service dict values are provided
2012-12-13 14:09:20 -08:00
Prasanna Santhanam 864ab37e13 marvin lib: changes for accomodating vpc related apis
new apis for the integration lib for VPCOffering, VPC, NetworkACL Apis.
Also some extra checks from for avoiding KeyErrors in the Services dict.
2012-12-12 11:07:28 -08:00
Prasanna Santhanam e49b3b27de marvin: storagetype reference only when attr present
reference the storagetype only when present. storagetype is reqd only for
devcloud style tests
2012-12-09 23:13:24 -08:00
Prasanna Santhanam 7d4e65740b marvin: assertion check when fetching featured templates 2012-12-09 22:15:38 -08:00
Prasanna Santhanam 3ba8dc455f Smoke Tests: incorrect self reference in setUpClass
should be cls.apiClient and not self.apiClient
2012-12-09 22:15:37 -08:00
Prasanna Santhanam 8466ff1e1f Marvin: Provide a userApiClient for executing with user permissions
The getUserApiClient attribute in cloudstackTestClient provides a user level
api client that executes all API calls with permissions of a given user instead
of the default admin
2012-12-09 22:15:30 -08:00
Prasanna Santhanam a7d7f85e40 Marvin doesn't require python 2.7, the tests do
To compile marvin using maven any standard python interpreter above 2.4
is sufficient. The tests under test/integration will need 2.7 to run.

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1354929362 -0800
2012-12-07 17:17:02 -08:00
Prasanna Santhanam d1e49a0500 Marvin: testClient close calls try to close the dbConnection
dbConnections are auto-managed do not need explicit closing

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1354919683 -0800
2012-12-07 14:35:53 -08:00
Prasanna Santhanam 21819dafb5 Summary: Devcloud tests for vm life cycle
Detail: VM Life cycle tests needed minor changes to run them against a
devcloud - basic zone, local storage envrioment.

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1354760111 -0800
2012-12-05 18:15:11 -08:00
Prasanna Santhanam 2c561dd3a8 Summary: Removing ostypeid dependencies from tests
Detail: The listOsTypes API will filter when given the ostype name as
centOS 5.3. There is now no need to hardcode the uuids into the test

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1354228309 -0800
2012-11-29 15:41:56 -08:00
Chip Childers 2ee9253c78 CLOUDSTACK-514: Adding https and api path support to Marvin.
This is the first part of fixing CLOUDSTACK-514, and is hopefully
backward compatible with previous use of Marvin.  I added two new
parameters to the cloudstackConnection module, protocol and path.
Both have been defaulted to the previously *assumed* values.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-19 12:06:18 -05:00
Rohit Yadav 8ea2cc4e57 marvin: raise error so cli can pick it up
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-16 22:18:32 +05:30
Prasanna Santhanam c290bf6cd0 Summary: xml reports library changes
Detail: unittest-xml-reporting 1.4 - the verbose option is available via
settings.py.

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1352448075 +0530
2012-11-09 13:31:15 +05:30
Rohit Yadav d72d3ee22b marvin: check and use logger
Checks and only then calls logger

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-31 23:18:06 +05:30
Prasanna Santhanam 802ddd43ca Summary: Moving the test integration libraries into marvin for CLI work
Detail: Integration tests use these libraries (base,utils,common) for
simplifying the usage of the API. These define the verbs of each
entity's usage (create, delete, add etc). For the CLI to present the
simplified API we'll leverage the integration libraries.

+ Fixes to setup-test-data.sh - kvm and xen each use a different version
of the built-in Cent OS template, 5.5 and 5.3 namely.

At a later point the setup-test-data script needs to be obsoleted.
ostypeids in tests should directly be determined from listOsTypes API
calls

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1351520707 +0530
2012-10-29 20:23:02 +05:30
Prasanna Santhanam 241daa53c6 Summary: Mavenize marvin on master
Detail: Maven will now compile, install and deploy marvin using the
developer profile
    $ mvn -P developer

compile - compiles the cloudstackAPI
package - packages the marvin source distributable
deploy  - installs using pip (reqd python 2.7) the Marvin package in to
site-packages/

BUG-ID : CLOUDSTACK-378
Reported-by: Prasanna Santhanam <tsp@apache.org>
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1351319186 +0530
2012-10-27 11:56:25 +05:30
Prasanna Santhanam 6f2792eb4b Summary: Close the ssh transport from paramiko
Detail: SSH Transport to be explicitly closed in marvin.remoteSSHClient
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1351002168 +0530
2012-10-23 19:52:48 +05:30
Prasanna Santhanam fd5421670d Remove redundant code in try..except block
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1350839262 +0530
2012-10-21 22:39:21 +05:30
Edison Su d1af01fbc8 add marvin project 2012-10-21 00:01:48 -07:00
Prasanna Santhanam 9a90dc227e Distutils install_requires doesn't resolve dependencies
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1350733702 +0530
2012-10-20 17:18:22 +05:30
Prasanna Santhanam 355b152993 Summary: Replace pymysql in marvin with a stable mysql-connector-python
Detail: mysql-connector-python developed by Oracle will replace the MIT
licensed pymysql. mysql-connector-python is developed by Oracle and is
more favourable, faster and actively developed.

With this commit - the dbConnection object is also auto managed by
contextlib. Each transaction requests its own connection rather than
sharing one single connection for all the test runs.

BUG-ID : None
Reviewed-by: timeit comparison of pymysql and mysql-connector-python
Reported-by: dbExceptions and timeouts from Marvin test runs
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1350732083 +0530
2012-10-20 16:57:06 +05:30
Prasanna Santhanam 7460b01893 Summary: provide deployment config access to marvin's testcase
Detail:
Sometimes tests need ssh access to the management server to perform
verification such as:

1. Pings from mgmt_server to agents
2. snapshots exist on secondary storage - mountable from mgmt server

For these the tests will need access to the config of the deployment and
the ip address of the mgmt server.

Egs: integration/component/test_egress.py and integration/component/test_snapshots.py

BUG-ID : CLOUDSTACK-377
Reported-by: Prasanna Santhanam
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1350624903 +0530
2012-10-19 11:06:53 +05:30
Chip Childers 2ed1c53e0e Adding DISCLAIMER.txt to the marvin tool.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-17 12:27:00 -04:00
Chip Childers 6e60a07566 CLOUDSTACK-326: Corrected marvin license file to be full ASLv2 license text
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 16:41:17 -04:00
Chip Childers 6151a29949 CLOUDSTACK-326: Combining Marvin Sandbox README with README.tools.md
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 16:11:17 -04:00
Prasanna Santhanam c86c5d2cc0 Uniting all the READMEs from tools and test
There are various READMEs under Cloudstack. This makes it confusing for
finding the purpose of each directory and tool within the project. All
the necessary information can now be found in the top-level README.tools
that is markdown editable. For the most updated information however it
is best to provide a wiki link to the tool you have added. Each tool
lies in a seperate section, please keep formatting unchanged.
2012-10-12 17:01:20 +05:30
Prasanna Santhanam 780468659f uniting the READMEs
Many READMEs spread over the integration and marvin test related
information can now be found in the single top-level directory
2012-10-12 16:07:03 +05:30
Prasanna Santhanam 6e9d7aa45b property files and build file fixes for simulator db changes 2012-09-17 17:33:26 +05:30
Sebastien Goasguen 2329ee146a Correcting two instances of wiki.c.o to point to cwiki.a.o
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-09-13 19:35:53 +05:30
Prasanna Santhanam 02d33344bd elasticIp added as virtual network in basic zone 2012-09-12 18:48:34 +05:30
Prasanna Santhanam 3eb75b57af IP ranges for public network in an EIP enabled zone 2012-09-12 18:48:33 +05:30
Prasanna Santhanam 9d2cf01717 Changes to accomadate the localstorage setting at zone level 2012-09-12 18:48:33 +05:30
Prasanna Santhanam 8ee8fdcc17 In basic zones enable the sg provider 2012-09-12 18:48:33 +05:30
Prasanna Santhanam cc6dae1eb4 There can be only one physical network in basic zone 2012-09-12 18:48:33 +05:30
Prasanna Santhanam c4f91b2914 Write results to stdout when result log is not specified 2012-09-11 11:06:23 +05:30
Sebastien Goasguen edcceb60de Clean up docs in /tools/marvin:
removed /docs and pointed to new wiki page in README
2012-09-09 10:51:36 +05:30
Prasanna Santhanam 038608b54f Ignore comments in config files during loading 2012-08-09 17:37:43 +05:30
Prasanna Santhanam f72146e96f Changes to simulator setup files
for provider + traffic type changes in marvin
2012-08-09 15:31:58 +05:30
Prasanna Santhanam aa8fee4fac Correcting the example configurations for advanced and basic zone
Zones will now be have to configured with physical networks, their
traffic types and the providers with the devices supporting the service
2012-08-09 15:31:51 +05:30
Prasanna Santhanam 614131a9de support for traffic type and external devices configuration
* traffictypes = 'Guest', 'Management', 'Public', 'Storage'
    - corresponding nic labels are given in the labeldict
* External device providers JuniperSrx, NetScaler and F5 load balancing
can now be configured

* examples are shown in the configGenerator.py script for basic,
advanced and EIP/ELB based zones

Conflicts:

	tools/marvin/marvin/configGenerator.py
	tools/marvin/marvin/deployDataCenter.py
2012-08-09 15:31:28 +05:30
Prasanna Santhanam 6ffafde33a Missing LICENSE headers for sandbox and __init__.py's 2012-08-04 17:29:47 +05:30
Prasanna Santhanam 60cd65382f Removing pymysql and including it as setup dependency 2012-08-04 17:17:11 +05:30
Prasanna Santhanam 7288eca129 failonerror for some marvin targets 2012-07-31 12:17:33 +05:30
Prasanna Santhanam 8a2135e3fa VpcVirtualRouter is not enabled always. 2012-07-30 15:32:38 +05:30
Prasanna Santhanam 046f2d786f License headers for the marvin plugin and the setup checker 2012-07-30 15:32:35 +05:30
Prasanna Santhanam ed7f72b629 Enable VpcVirtualRouter when deploying advanced zone 2012-07-30 15:32:35 +05:30
Prasanna Santhanam 7662426769 All responsibilty for running through nose belongs to the marvin-nose plugin
Conflicts:

	tools/marvin/marvin/NoseTestExecuteEngine.py
2012-07-30 15:32:34 +05:30
Prasanna Santhanam 13857700d3 Plugin-izing the testcase runner
* setup.py is the installer for marvin-nose plugin
* marvin-nose drive all tests using nose with other plugins like xunit, coverage, multiprocess execution etc
* -n option deprecated. All tests driven by nosetests --with-marvin
2012-07-30 15:32:34 +05:30
Prasanna Santhanam ed113ca844 Correcting the imports for HTTPException 2012-07-30 15:32:34 +05:30
Prasanna Santhanam 9af88ad44d Plugin support to pick test cases using marvin.
Using this plugin Nose will drive tests and this also allows using other
nose plugins. Cmd Line plugin support to be added

Conflicts:

	tools/marvin/marvin/NoseTestExecuteEngine.py
2012-07-30 15:32:34 +05:30
Prasanna Santhanam 0ab7a9289f Support added for attrib, multiprocess and Xunit coverage plugins
Conflicts:

	tools/marvin/marvin/NoseTestExecuteEngine.py
2012-07-30 15:32:34 +05:30
Prasanna Santhanam 84b69e6e0a injecting the testclient during Test Loader process
Without this the tests do not have access to the client APIs
2012-07-30 15:32:33 +05:30
Prasanna Santhanam db5687d691 enhancement related to -x to take directory name/path to store xml reports
Conflicts:

	tools/marvin/marvin/TestCaseExecuteEngine.py
2012-07-30 15:32:24 +05:30
Prasanna Santhanam 91b6e09e6d The NoseTestLoader to pick cloudStackTestCase as tests 2012-07-30 15:27:55 +05:30
Prasanna Santhanam 9443734f1d setup.properties for basic zone environments 2012-07-30 15:27:55 +05:30
Prasanna Santhanam aa4ff87812 Post configuration tests to check
- if system VMs are up and running
- if built-in template is downloaded and ready to launch
2012-07-30 15:27:55 +05:30
Prasanna Santhanam 326655d8c6 xml reports for TestCaseEngine
Conflicts:

	tools/marvin/marvin/TestCaseExecuteEngine.py
2012-07-30 15:27:55 +05:30
Prasanna Santhanam 85c5b5656d adding unittest-xml-reporting as a dependency to marvin 2012-07-30 15:27:55 +05:30
Prasanna Santhanam ba33a25c57 Sandbox scripts for generating one host configuration
- marvin/sandbox/advanced
- marvin/sandbox/basic

* supports generating configurations for cloudstack deployment with
properties files. The format of the config, properties files and the
process is explained in the tutorial:

http://wiki.cloudstack.org/display/QA/Testing+with+python#Testingwithpython-DeploymentConfiguration
2012-07-30 15:27:55 +05:30
Edison Su b627f5a85b Simplifying the process of running the simulator.
* ant run-simulator - will seed the simulator jar and start CS
    * ant run-marvin -Dmarvin.config="/path/config/file" - will
    * configure a
    cloudstack as per the given configuration. marvin.config - defaults
to a
    two host simulator in an advanced zone

    You can then connect your debugger over localhost:8787 or use the CS
ui
    at localhost:8080/client for testing.

From: Prasanna Santhanam(Prasanna.Santhanam@citrix.com)
2012-07-16 10:34:49 -07:00
David Nalley 6fe595f3d3 committing some more changes to marvins license headers 2012-07-04 18:50:49 -04:00
David Nalley 54d7a10b99 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-04 18:45:34 -04:00
David Nalley ecf2cd57f9 fixing license headers in marvin 2012-07-04 18:45:08 -04:00
Edison Su 217fdd2497 From: jason.bausewein@tier3.com
Fixed deployDataCenter.py to select the correct network offering based on if security groups are enabled.  Also added default value to configGenerator.py for basic setup.
2012-07-03 12:56:42 -07:00
David Nalley 91fd3b772e Applying patch from Prasanna Santhanam
Marvin sandbox example scripts for generating one host configurations
https://reviews.apache.org/r/5656
2012-07-02 09:08:51 -04:00
Edison Su 8dd4197cd8 From: Jason Bausewein [jason.bausewein@tier3.com]
I would like to add an command line option to choose between advanced or basic networking configuration.  This would allow me or others to choose advanced networking without having to edit the python code.
2012-06-22 13:19:04 -07:00
Edison Su 2f38e1c713 From:Jason Bausewein [jason.bausewein@tier3.com]
I needed to change the case in the sim url so the SimulatorDiscover will detect the simulator hosts
2012-06-22 10:23:03 -07:00
Prasanna Santhanam d4d0950d71 Adding support for file copy to marvin's remoteSSHClient
Signed-off-by: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>
2012-06-10 15:01:50 -04:00
Prasanna Santhanam 09dd71d056 Adding support with xmlrunner for generating XML reports 2012-05-18 12:08:39 +05:30
Prasanna Santhanam 0e22eed41f Files from the demo are now available in the sandbox 2012-05-17 18:12:17 +05:30
Prasanna Santhanam 0c26f359ce Add additional retries to the SSH client by default 2012-05-15 18:12:41 +05:30
Prasanna Santhanam b5ea18d822 MD5 Auth for accounts created on the API 2012-05-14 19:40:44 +05:30
Prasanna Santhanam 0f98f5fe52 Build if you have python 2.7 installed 2012-05-14 19:40:44 +05:30
Prasanna Santhanam 7eaa1cf6f8 Install paramiko as a dependency, don't complain about the requirement 2012-05-14 14:45:24 +05:30
Prasanna Santhanam a0efa70958 support for running tests in a given script 2012-05-11 18:52:41 +05:30
Prasanna Santhanam dba1c01cb5 rename the nose test executor 2012-05-11 18:52:36 +05:30
Prasanna Santhanam dc02d50b17 rename the nose test executor 2012-05-11 18:52:30 +05:30