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

23585 Commits

Author SHA1 Message Date
Nitin Mehta 745ba5cd49 CLOUDSTACK-6895: 1. Populate firstclass entities as uuids in the context instead of dbids for performance. 
2. Add ctxDetails in the ParamGenericValidationWorker to avoid warning for api validation
3. Add some missing events.
4. Correcting mapping for ResourceObjectType.NetworkACL and ResourceObjectType.NetworkACLItem

(cherry picked from commit 8a9092c3cd)
 2014-07-30 13:10:34 +02:00
Alex Brett f657de5401 Fix for test_01_create_volume to use the correct volume name for KVM 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 280d167316)
 2014-07-30 13:08:59 +02:00
Rajani Karuturi 800e40737d Fixed issues reported by coverity NPEs, unwritten field access and self assignment 
Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit 390e498dc5)

Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2014-07-30 13:08:15 +02:00
Daan Hoogland 3dc0a64b3e try-with-resource to prevent resource leaks 
(cherry picked from commit 39f775c381)
(cherry picked from commit fc52e641d8)

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
 2014-07-30 13:05:50 +02:00
Daan Hoogland 91489501f5 update vlan uris 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java

(cherry picked from commit 44012ddadf)
(cherry picked from commit 0329bebac5)

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
 2014-07-30 13:03:29 +02:00
Nitin Mehta 27c0246e7f CLOUDSTACK-6599: Add the column in Java upgrade path since 4.2 already has the extract template/volume columns 
(cherry picked from commit be765ce868)

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
	setup/db/db/schema-430to440.sql
 2014-07-30 12:59:22 +02:00
Nitin Mehta adfb44ec33 CLOUDSTACK-6597: Updatevm - root admin should be allowed to change instance name 
(cherry picked from commit 18c6ae0796)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 12:52:15 +02:00
Gaurav Aradhye 34f3a5fd44 CLOUDSTACK-6758: [Marvin] Detect failed job and throw exception 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
(cherry picked from commit d9066f8d29)
 2014-07-30 12:31:28 +02:00
santhosh 25a78acee1 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>
(cherry picked from commit 6f3ff06827)

Conflicts:
	tools/marvin/marvin/deployDataCenter.py
 2014-07-30 12:30:51 +02:00
Doug Clark a05007489a 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>
(cherry picked from commit 751f0ac518)
 2014-07-30 12:28:24 +02:00
Gaurav Aradhye 2addc57d89 Fixing issues in regression test suite test_accounts.py 
(cherry picked from commit 02f769c4d5)
 2014-07-30 12:27:51 +02:00
Gaurav Aradhye a40f2315fd CLOUDSTACK-6657: Adding condition for checking error code 530 across test cases 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 8eca37056f)

Conflicts:
	test/integration/smoke/test_network.py
 2014-07-30 12:10:03 +02:00
Nitin Mehta fec3b1f865 CLOUDSTACK-6530: Make Network and Volume implement Displayable interface. Iterate over all first class entities in the context to decide the display property for event display. 
(cherry picked from commit da0545ff86)

Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
 2014-07-30 12:07:54 +02:00
Rajesh Battala 920f39baaf Fixed windows line ending issues 
(cherry picked from commit 648a724dfc)

Conflicts:
	plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
	plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
 2014-07-30 12:04:54 +02:00
Rohit Yadav 51c691f022 marvin: set next release version to 4.4.1 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-29 23:09:39 +02:00
Rohit Yadav fa5195f305 marvin: change module author, description etc to use ACS team and dev ML 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-29 23:01:40 +02:00
Will Stevens ba025c9a7c Merge branch '4.4' into dev 2014-07-29 11:56:09 -04:00
Rohit Yadav 9de4abeb49 schema: add upgrade path stubs from 4.4.0 to 4.4.1 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-28 23:52:47 +02:00
Rohit Yadav 9562f01792 apidoc: add Brocade to list of know categories 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-28 23:52:47 +02:00
Rajesh Battala 095fb09b75 CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in VR/VpcVR to configure VPC entities 
(cherry picked from commit cf41ccaa5b)

Conflicts:
	plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
	plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
	plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
 2014-07-28 23:21:37 +02:00
Gaurav Aradhye 2025f359c4 CLOUDSTACK-7178: Correcting imports in test_escalations* test cases 
(cherry picked from commit 4e45b29689)
 2014-07-28 23:12:58 +02:00
Ashutosh K 5898745299 CLOUDSTACK-7148: Adding missing list method 
(cherry picked from commit dd138ceec5)
 2014-07-28 23:12:58 +02:00
Ashutosh K 1ca9abd6dc CLOUDSTACK-7137: Resolving cleanup issue in test_escalations_securitygroups.py 
(cherry picked from commit 8d8190ea4e)
 2014-07-28 23:12:57 +02:00
Ashutosh K f055ec52d9 CLOUDSTACK-7024: Resolved cleanup issue in test script 
(cherry picked from commit ec49669f1c)
 2014-07-28 23:12:57 +02:00
Ashutosh K 6b66fe92ca CLOUDSTACK-7013: Fixing test script issue in test_add_remove_network.py 
(cherry picked from commit f99a96f38a)
 2014-07-28 23:12:57 +02:00
Ashutosh K 01e7833017 CLOUDSTACK-7020:Fixed test script issue 
(cherry picked from commit b7d445873c)
 2014-07-28 23:12:56 +02:00
Koushik Das 2ca71f4737 CLOUDSTACK-7062: Enabled back the test as not able to repro 
(cherry picked from commit 5e181acbdb)
 2014-07-28 23:12:56 +02:00
Koushik Das e1cfd8dedf Added a simulator based test for VM sync 
(cherry picked from commit a83212afdc)
 2014-07-28 23:12:55 +02:00
Gaurav Aradhye 999daec763 CLOUDSTACK-7062: Tagging test case with BugId 
(cherry picked from commit f5139f7839)
 2014-07-28 23:12:55 +02:00
Bharat Kumar 2b71783482 CLOUDSTACK-7026 mark the test_01_primary_storage_iscsi as test that requires hardware 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
(cherry picked from commit a28d65fc4a)
 2014-07-28 23:12:55 +02:00
SrikanteswaraRao Talluri 16d50b8956 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

(cherry picked from commit a34faae919)
 2014-07-28 23:12:54 +02:00
Girish Shilamkar 8663fb0417 Disable testcases 
(cherry picked from commit bfba6d4a1e)
 2014-07-28 23:12:54 +02:00
Sangeetha 491eb1bb73 This test suite contains test cases relating to access checks for createNetwork(), deploying VM in an isolated network and restartNetwork() for Admin, domain admin and regular users. 
(cherry picked from commit a18a4ea9e8)
 2014-07-28 23:12:53 +02:00
Girish Shilamkar 29287c989d CLOUDSTACK-6984: Re-enable the testcase 
(cherry picked from commit 039878b49a)
 2014-07-28 23:12:53 +02:00
Chandan Purushothama 32a9ab6c05 CLOUDSTACK-6995:Stress Test to test multiple Remote Access VPN Connections to VPC 
(cherry picked from commit defed59b97)
 2014-07-28 23:12:53 +02:00
Girish Shilamkar 8e374c5d6f Re-enabling fixed test case test_primary_storage.py 
(cherry picked from commit 5749abc23a)
 2014-07-28 23:12:52 +02:00
Girish Shilamkar be87c5c5fb Re-enabling fixed test cases 
(cherry picked from commit 5863ab826e)
 2014-07-28 23:12:52 +02:00
Gaurav Aradhye c98064b98d CLOUDSTACK-6984: Resolving simulator issues 
(cherry picked from commit 8de18f144c)
 2014-07-28 23:12:51 +02:00
Girish Shilamkar 1430a6c5c3 CLOUDSTACK-6914: Disabling few failing BVTs 
(cherry picked from commit c7d00d52b2)
 2014-07-28 23:12:51 +02:00
Girish Shilamkar aca8ae06be CLOUDSTACK-6906: Fixing volume resize BVT 
(cherry picked from commit ba270efd4b)
 2014-07-28 23:12:51 +02:00
Gaurav Aradhye dc75e46f90 CLOUDSTACK-6932: Removing redundant file test_escalations.py 
(cherry picked from commit 7e43038215)
 2014-07-28 23:12:50 +02:00
Gaurav Aradhye 7e5bad487c Fixing indetation issue 
(cherry picked from commit 095be48314)
 2014-07-28 23:12:49 +02:00
Gaurav Aradhye b44f66e12f CLOUDSTACK-6887: Code enhancement to ensure better cleanup 
(cherry picked from commit 588e3e37af)
 2014-07-28 23:12:49 +02:00
Gaurav Aradhye 12b6cf1be5 CLOUDSTACK-1466: Automation - Priamary Storage Limits 
(cherry picked from commit a0f19d4bd5)
 2014-07-28 23:12:49 +02:00
Girish Shilamkar f75327239d CLOUDSTACK-6861: Fixing nfs mount path 
(cherry picked from commit a5415d93eb)
 2014-07-28 23:12:48 +02:00
Santhosh Edukulla 45db2348de CLOUDSTACK-6914: Fixed the Issue 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
(cherry picked from commit 54e4c07528)
 2014-07-28 23:12:47 +02:00
VinayV 63feb4519a CLOUDSTACK-6282: Modified IPAddress tests to fix the failures. Modified Instances, snapshots, templates tests to handle KVM Hypervisor 
(cherry picked from commit 89c35abb4d)
 2014-07-28 23:12:47 +02:00
Girish Shilamkar b518d61203 CLOUDSTACK-6888: Read postable IP configuration from config 
(cherry picked from commit 49467f2954)
 2014-07-28 23:12:47 +02:00
Ashutosh K 92a9703c55 CLOUDSTACK-6780: Resolved cleanup issue in portable ip test cases 
(cherry picked from commit 0190c93668)
 2014-07-28 23:12:46 +02:00
Gaurav Aradhye ed77cf84f2 CLOUDSTACK-6764: Marvin - Accomodating networkid parameter while deploying VM in advanced zone and account contains mor than one network 
(cherry picked from commit 50d4963d53)
 2014-07-28 23:12:44 +02:00