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

23607 Commits

Author SHA1 Message Date
Daan Hoogland 89041d2351 Merge remote-tracking branch 'origin/hotfix/4.4-7257' into 4.4 2014-08-06 07:36:01 +02:00
amoghvk e73e7c3939 CLOUDSTACK-7257: Missing LXC mappings, reuse KVM mappings 2014-08-05 09:38:57 -07:00
Rohit Yadav 881275c16c README: Fix links for viewing on Github 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit fc7b2baba3)
 2014-08-05 17:31:53 +02:00
Rohit Yadav 7e9269eb2d README: Give CloudStack its much deserved readme file 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d753e765f7)

Conflicts:
	README.md
 2014-08-05 17:31:08 +02:00
Rohit Yadav 9315321dac devcloud: user insert on duplicate update in devcloud.sql 
This commit modifies insert statements to use the insert on duplicate update
syntax to update configuration table name, values in case primary key already
exists

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-04 22:55:34 +02:00
Daan Hoogland 86083216de close statement 2014-08-04 12:30:38 +02:00
Rohit Yadav a68d898682 developer: add commonly used glboal config in developer-prefill.sql 
This commit adds three commonly used config that developers usually set
after fresh deployment. The account cleanup timeout is set to 60s to speed up
BVT runs.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-01 16:44:11 +02:00
Anshul Gangwar cda088470b CLOUDSTACK-7220: fixed building hyper-v agent is broken, commits were not applied in correct order while cherry picking from 4.4-forward to 4.4 2014-08-01 15:50:17 +05:30
Rohit Yadav d79251853b CLOUDSTACK-7211: Add Guest OS mapping before returning VirtualMachineTO object 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 89fabe82b9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 19:04:22 +02:00
Kishan Kavala ccee282a74 CLOUDSTACK-6931: Set hypervisor.type in agent.properties using cloudstack-setup -t option. Default is kvm. 
(cherry picked from commit 89854de18d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 18:50:43 +02:00
Wido den Hollander f956ae976f debian: Update the version to 4.4.1-snapshot 2014-07-30 14:43:22 +02:00
amoghvk d3e0ecd130 CLOUDSTACK-6358: KVM mappings for CentOS 6.x and RHEL 6.x 
(cherry picked from commit c8ca15b95a)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-07-30 13:38:26 +02:00
Jayapal 865cdc08e5 CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate 
(cherry picked from commit 252e58381a)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 13:36:22 +02:00
Nitin Mehta 6d0e43d36b CLOUDSTACK-7000: Fix bugs in ListSnapshotPolicy and updateSnapshotPolicy command 
(cherry picked from commit 63c4f02897)
 2014-07-30 13:33:22 +02:00
Ian Duffy 9d4d018409 CLOUDSTACK-7005 - Failed to start MS with latest 4.4 RPM builds 
(cherry picked from commit f7417d622a)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-07-30 13:33:01 +02:00
Nitin Mehta 6f709f59cc CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command 
(cherry picked from commit fce21439fa)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 13:31:14 +02:00
Ian Duffy 75fd63797a Allow for length of password on VMs to be set via global settings 
(cherry picked from commit 96412e3e58)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-07-30 13:26:29 +02:00
Nitin Mehta 1fbee507ea CLOUDSTACK-6987: Add support for storing metadata for snapshot policy and controlling policy using display flag 
(cherry picked from commit 5cf8edd7ec)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-07-30 13:24:31 +02:00
Anshul Gangwar 8b9166ae0b CLOUDSTACK-6830: Fixed [hyper-v] during VM migration, volumes on zone wide primary 
store requires storage migration resulting in failure of VM migration. This also
improves the hostsformigration api. Firstly we were trying to list all hosts and
then finding suitable storage pools for all volumes and then we were checking
whether vm migration requires storage migration to that host. Now the process is
updated. We are checking for only those volumes which are not in zone wide primary
store. We are verifying by comparing volumes->poolid->clusterid to host clusterid.
If it uses local or clusterids are different then verifying whether host has
suitable storage pools for the volume of the vm to be migrated too.

(cherry picked from commit 64153a4371)
 2014-07-30 13:21:10 +02:00
Jayapal a7f1d002a8 CLOUDSTACK-6923: updated listLBStickinessPolicies API to list using stickinesspolicy id 
(cherry picked from commit b0d726a872)

Conflicts:
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
 2014-07-30 13:19:45 +02:00
Jayapal 970ddd3a57 CLOUDSTACK-6922: Updated events for firewall ingress and egress 
(cherry picked from commit 2214bd2502)
 2014-07-30 13:14:05 +02:00
Daan Hoogland d387460f44 imports 2014-07-30 13:11:57 +02:00
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