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

6438 Commits

Author SHA1 Message Date
Koushik Das 0232048f90 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
 2013-04-15 17:05:59 +05:30
Murali Reddy bc3e184b72 CLOUDSTACK-312: enable L4-L7 network services in the shared network in 
the advanced zone

Squashed commit of the following:

commit 3021cb917b2446f6a04f6cbb01bc56ebc5484bff
Merge: 77c6991 886fe01
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Sun Apr 14 17:22:05 2013 +0530

    Merge branch 'master' into sharednetworkservices

commit 77c69918be
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 9 17:16:57 2013 +0530

    Trying to fit both isolated and shared network life cycle with single state
    machine may need addtional work. So set network state for shared network explicitly now.

commit 365ed73a0c
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 2 17:14:11 2013 +0530

    - associateIpAddress API to associate a public IP with shared network
    - shared network with services to go through the implement and shutwdon
      phases
 2013-04-14 17:50:15 +05:30
Pascal Borreli 20614598bf Fixed typos 
Signed-off-by: Milamber <milamber@apache.org>
 2013-04-13 13:28:32 +00:00
Min Chen 4b1a9f146c Fix CLOUDSTACK-1987: Deleted service offering still shows for domain users. Also extend this fix for Disk offering as well. 2013-04-12 13:47:45 -07:00
Chiradeep Vittal 7b4e1953d8 QuickCloud: accidental commit, removing 2013-04-12 12:08:13 -07:00
Likitha Shetty 8f865c5a90 Dedicate Public IP address range to an account 2013-04-12 23:27:35 +05:30
Murali Reddy 85b1519fe5 GlobalLoadBalancerResponse should contain the service type details and 
GSLB rule is defaulted to have source IP as sticky method
 2013-04-12 19:27:46 +05:30
Ryan Dietrich 38df62865d CLOUDSTACK-1989: Without this fix you can't query service offerings 
that don't have a domain id set (null).

Tested via: Called "listServiceOfferings" using a simple perl script,
once with an ID, and once without an ID specified.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-04-12 14:03:28 +01:00
Hugo Trippaers accfccd83e Summary: Add support for nested hypervisors to the VmWare resource. 
Add a flag VmDetailConstants.NESTED_VIRTUALIZATION_FLAG
Add an advanced config uption VmwareEnableNestedVirtualization

Depending on the settings of the flags and the capabilities of the target hypervisor the nested virtualization option will be set on guest VMs. It's a global setting intended only for developers to support cloud-in-a-cloud deployments.
 2013-04-12 13:49:42 +02:00
Murali Reddy c0419791ed CLOUDSTACK-1934: NPE with listSupportedNetworkServices 
For 'connectivity' network service current set of providers (MidoNet,
NiciraNcp) not necessarily part of OSS builds. So handle the case where
there are no providers for a service
 2013-04-12 16:47:50 +05:30
Bharat Kumar 580731ccc0 CLOUDSTACK-1534 Disable/Enable-unmanaged/manage cluster is setting CPU overcommit and memory overcommit ratio to 1 (defalut value). 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-12 15:30:02 +05:30
Mice Xia cbcb83b086 fix CLOUDSTACK-1894 User is not able to deploy VMs in a project[permission denied to access the guest network) 2013-04-12 15:39:36 +08:00
Prachi Damle c1a85401ae Single AffinityGroupProcessor could process multiple groups of same type. 2013-04-11 17:29:42 -07:00
Kelven Yang 370a7fdfd6 CLOUDSTACK-1884: fix the unit test issue 2013-04-11 17:23:49 -07:00
Prachi Damle 4958070b90 Reopening CLOUDSTACK-1884. Adding back the unit test, but still excluded due to component loading issue. 2013-04-11 15:43:54 -07:00
Prachi Damle 69f49e76cf Excluding this unit test for a while, since it fails because ComponentContext.initComponentsLifeCycle(); is failing when DB is unavailable 2013-04-11 14:50:35 -07:00
Prachi Damle bfed74c411 Fixing rat. Merge with master missed the header change 2013-04-11 13:37:03 -07:00
Prachi Damle 6137d327a8 Fixes to unit-test dues to changes in master 2013-04-11 13:23:48 -07:00
Prachi Damle eea0ed5c4e Fixes for issues found while testing after the merge 2013-04-11 13:23:46 -07:00
Prachi Damle bbf7900732 Adding pretty toString() to AffinityGroup 2013-04-11 13:23:43 -07:00
Prachi Damle fc248cb99c ACl on affinity group 2013-04-11 13:23:41 -07:00
Prachi Damle 7201eb9ee4 CLOUDSTACK-1968: affinity_groups: Column 'deployment planner' cannot be null when creating a service offering 
Added default value to all constructors..
 2013-04-11 13:23:37 -07:00
Prachi Damle d38bf8a10c More log statements to debug 2013-04-11 13:23:27 -07:00
Prachi Damle 0f565f2167 Fixes to de-couple the AffinityGroupResponse from UserVmResponse, since ApiDiscoveryService breaks, if we nest two response objects into each other. 2013-04-11 13:23:25 -07:00
Prachi Damle 3403b54773 Added AffinityGroup View in order to include VM details while listing AffinityGroups. 2013-04-11 13:23:23 -07:00
Prachi Damle 09a6eb735d Changes to return affinity groups information during listVMsCmd 2013-04-11 13:23:20 -07:00
Prachi Damle 0b3850c14f Added cleanup of affinitygroups when a VM is expunging and when the account is deleted. 2013-04-11 13:23:18 -07:00
Prachi Damle b633dde744 Adding a unit test for the new affinity groups API 2013-04-11 13:23:11 -07:00
Prachi Damle ee45437036 Build failure fixes after rebase. 2013-04-11 13:23:08 -07:00
Prachi Damle c7c899f62d Fixes after functional tests 
Conflicts:

	client/tomcatconf/commands.properties.in
 2013-04-11 13:23:04 -07:00
Prachi Damle bb9bdf0173 Changes to make affinity group types configurable. 2013-04-11 13:23:01 -07:00
Prachi Damle 708157d33f API changes to expose the commands 2013-04-11 13:22:59 -07:00
Prachi Damle c8ae2a9d25 API to list planners and set the planner in Service offering 
Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-11 13:22:56 -07:00
Prachi Damle e9300d2676 DAO constructor should be lightweight to make Spring DI faster. 2013-04-11 13:22:51 -07:00
Prachi Damle bf9221a370 Separated out host anti-affinity as a plugin. 2013-04-11 13:22:45 -07:00
Prachi Damle fe2a86871f Changes to add AffinityGroupprocessor, deployVM changes 2013-04-11 13:22:42 -07:00
Prachi Damle 1aed5bf9c2 ListAffinityGroups API changes 2013-04-11 13:22:38 -07:00
Prachi Damle 50f53c86f5 DeleteAffinityGroup API changes 2013-04-11 13:22:34 -07:00
Prachi Damle 1e205a3d0b More API changes 2013-04-11 13:22:30 -07:00
Marcus Sorensen ca8ac08cf3 CLOUDSTACK-2003: When accounts and domains are deleted, cleanup can fail, 
leaving instances in eternal expunged state. This happens when a domain is
deleted while a deleted account is cleaning up. The cleanup looks for the domain
of the account and we hit a null pointer. Adding null pointer check.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1365695448 -0600
 2013-04-11 09:50:48 -06:00
Hugo Trippaers 5cd3608529 Remove the chmod solution and replace with an explicit call to 
/bin/bash. This way the file will only need read permissions.
 2013-04-11 11:30:45 +02:00
Jayapal a4a059c043 CLOUDSTACK-779 Egress firewall rules support for Juniper SRX 2013-04-10 10:54:04 -07:00
Prachi Damle ee0a91d111 Fixed the issue - VM deployment for local service offering for Root and with data disk(shared), was deploying data disk to local disk too. Currently there is no way to let the planner know multiple pool information, hence letting the planner search for a pool always during VM deployment. 2013-04-10 10:47:50 -07:00
Jayapal c8f2003138 CLOUDSTACK-1862 Added vm ip address info in the list PF rules response 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-10 14:26:36 +05:30
Mice Xia b646e43a1a use hypervisor capabilities to control if vm snapshot is enabled for hypervisors 2013-04-10 12:36:42 +08:00
Mice Xia bd7a38957a 1)use vmsnapshot.create.wait to control vmsnapshot timeout 2)remove global configuration vmsnapshot.expunge.interval and vmsnapshot.expunge.workers since vmsnapshot expunge is synchronous 2013-04-10 11:35:58 +08:00
Vijayendra Bhamidipati d4e2aa32c6 CLOUDSTACK-1675: VMSnapshot: ListVMSnapshotsCmd should not display Domain ID in the Error Message 
Description:
	Replace domain db id by uuid in exception message.

Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
 2013-04-10 11:35:58 +08:00
Kelven Yang 913f73ab6b Apply patch https://reviews.apache.org/r/10137/ 2013-04-09 17:29:21 -07:00
Chiradeep Vittal 2e6c65fd34 QuickCloud: sanitize logs for normal running of agents outside systemvm 2013-04-09 14:45:27 -07:00
Chiradeep Vittal 271d232d62 QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package 
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
 2013-04-09 14:45:27 -07:00