Commit Graph

573 Commits

Author SHA1 Message Date
Kelven Yang 340e1da4c4 Fix test cases in OSS build caused by CallContext changes 2013-06-20 18:03:08 -07:00
Alex Huang e2edae1711 Merge from master 2013-06-17 19:00:44 -07:00
Alex Huang fa525a7d38 Added outcome 2013-06-17 17:25:01 -07:00
Alex Huang 3a074f31ae Removed a bunch of useless classes. Move configuration into utils package 2013-06-17 17:04:04 -07:00
Alex Huang aad2bc78c1 Completely Isolated job manager from user 2013-06-17 17:04:03 -07:00
Alex Huang ea6ca5ff5c Removed AsyncJobConstant 2013-06-17 17:04:01 -07:00
Alex Huang 2b96665bf4 jobs changes 2013-06-17 17:04:00 -07:00
Alex Huang aff0220d45 Moved files into cloud-engine 2013-06-13 16:34:41 -07:00
Harikrishna Patnala b83b8eb838 CLOUDSTACK-2502: Scalevm and over provisioning should respect each other
During Scale up of VM, memory/cpu calculations should consider the memory/cpu overprovisioning factors which are set per cluster.

CLOUDSTACK-2939:  CPU limit is not getting set for vm after scaleup to a service offering which have cpu cap enabled

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 16:30:56 +05:30
Kelven Yang 39dd4bd26b Manage active job in run numbers 2013-06-12 14:29:44 -07:00
Kelven Yang 35ea8e149d Fix errors in bringing up user VM under new VMsync framework 2013-06-12 12:05:26 -07:00
Kelven Yang f2717207aa Fix several assert revealed bugs 2013-06-12 09:45:06 -07:00
Bharat Kumar 31f0e34539 CLOUDSTACK-2963 Build failure due to validateIpRange test failure
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 18:48:46 +05:30
Bharat Kumar ca13586331 Cloudstack-2511 Multiple_Ip_Ranges: Adding guest ip range in subset/superset to existing CIDR is allowed Cloudstack-2651 [Shared n/w]Add IP range should ask for gateway and netmask
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 16:27:56 +05:30
Alex Huang 1310535be5 some unfinished cleanup on removing the caller and account 2013-06-11 16:45:18 -07:00
Alex Huang 33dfe4f752 Removed all the apis that need the user and account to be passed in. Get them from the call context instead 2013-06-11 14:11:40 -07:00
Alex Huang ad1c82fdda Removed unused stuff from virtualmachinemanager 2013-06-11 13:15:23 -07:00
Jayapal c1ad3b7974 CLOUDSTACK-2604 Fixed deleting secondary ip when no PF rules set
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-10 12:13:08 +05:30
Alex Huang aaa16af211 Merged from master 2013-06-09 17:53:27 -07:00
Alex Huang ebbd4008ad zone creation complete once more 2013-06-07 18:15:55 -07:00
Alex Huang 5e6d2cf559 Fixed the start 2013-06-07 10:11:57 -07:00
Sheng Yang 4a14ea8a4d CLOUDSTACK-1771: Fix ipv6 address for router
Now it won't change(as ipv4 address) after router is destroyed.
2013-06-06 18:04:35 -07:00
Kelven Yang 90df846adb Fix CallContext NDC cleanup problem 2013-06-06 17:52:21 -07:00
Alex Huang 2e1e2babcb More fixes on starting from jobs 2013-06-04 20:10:29 -07:00
Kelven Yang 3327371f97 Add unit test back for async-job after job project structure re-org 2013-06-04 17:16:12 -07:00
Alex Huang dd11254087 further refactored jobs 2013-06-04 13:54:33 -07:00
Kishan Kavala b5148af0c6 CLOUDSTACK-2809: Assign acl_id to VPC tier only when NetworkACL service is supported 2013-06-04 20:08:26 +05:30
Alex Huang 688b047c2a Made it all work on startup 2013-06-03 17:10:28 -07:00
Prasanna Santhanam 22bda5c3c9 ConfigurationServerImplTest: remove long running test
The getBase64KeystoreZillionTimes is not required for the current
implementation that closes the file descriptor cleanly.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 14:48:29 +05:30
Wei Zhou f714d26039 Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling"
This reverts commit 6dad8adf8f.
2013-06-03 07:48:03 +02:00
Wei Zhou 6dad8adf8f CLOUDSTACK-1301: Add VM Disk I/O Throttling 2013-06-01 08:03:02 +02:00
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Alex Huang b8261b8705 Moved UserContext to its proper place as CallContext 2013-05-31 05:05:05 -07:00
Alex Huang 54de6b4868 Revamped UserContext 2013-05-31 04:44:37 -07:00
Laszlo Hornyak 4894187991 test and cleanup for getBase64Keystore
ConfigurationServerImpl.getBase64Keystore did not close the file input stream correctly. This patch adds test and replaces the file read with commons-io FileUtils call.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 11:26:33 +05:30
Alena Prokharchyk 1300fc8128 AccountManager/Service: reduced visibility for methods that are called only from AccountManagerImpl itself 2013-05-30 11:18:32 -07:00
Saksham Srivastava 965c7b9c35 Patch 2: CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host
Patch 2 for https://reviews.apache.org/r/11379/
Created for files server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java, server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java, server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-05-30 01:07:07 -07:00
Saksham Srivastava 17267794ad CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host. <Patch1>
This feature allows a user to deploy VMs only in the resources dedicated to his account or domain.

1. Resources(Zones, Pods, Clusters or hosts) can be dedicated to an account or domain.
   Implemented 12 new APIs to dedicate/list/release resources:
   - dedicateZone, listDedicatedZones, releaseDedicatedZone for a Zone.
   - dedicatePod, listDedicatedPods, releaseDedicatedPod for a Pod.
   - dedicateCluster, listDedicatedClusters, releaseDedicatedCluster for a Cluster
   - dedicateHost, listDedicatedHosts, releaseDedicatedHost for a Host.
2. Once a resource(eg. pod) is dedicated to an account, other resources(eg. clusters/hosts) inside that cannot be further dedicated.
3. Once a resource is dedicated to a domain, other resources inside that can be further dedicated to its sub-domain or account.
4. If any resource (eg.cluster) is dedicated to a account/domain, then resources(eg. Pod) above that cannot be dedicated to different accounts/domain (not belonging to the same domain)
5. To use Explicit dedication, user needs to create an Affinity Group of type 'ExplicitDedication'
6. A VM can be deployed with the above affinity group parameter as an input.
7. A new ExplicitDedicationProcessor has been added which will process the affinity group of type 'Explicit Dedication' for a deployment of a VM that demands dedicated resources.
   This processor implements the AffinityGroupProcessor adapter. This processor will update the avoid list.
8. A VM requesting dedication will be deployed on dedicatd resources if available with the user account.
9. A VM requesting dedication can also be deployed on the dedicated resources available with the parent domains iff no dedicated resources are available with the current user's account or
   domain.
10. A VM (without dedication) can be deployed on shared host but not on dedicated hosts.
11. To modify the dedication, the resource has to be released first.
12. Existing Private zone functionality has been redirected to Explicit dedication of zones.
13. Updated the db upgrade schema script. A new table "dedicated_resources" has been added.
14. Added the right permissions in commands.properties
15. Unit tests:  For the new APIs and Service, added unit tests under : plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/DedicatedApiUnitTest.java
16. Marvin Test: To dedicate host, create affinity group, deploy-vm, check if vm is deployed on the dedicated host.
2013-05-30 01:07:01 -07:00
Prachi Damle 34943adfc6 CLOUDSTACK-2366: Anti-Affinity - DeleteAffinityGroup API should allow for deletion of Afffinity group even when VMs are associated with it.
Changes:
- Allowing group to be deleted even when VMs are associated to it.
2013-05-29 17:59:32 -07:00
Alex Huang cd6aea1015 fixed up one test from merge 2013-05-29 17:06:18 -07:00
Alex Huang 7bdddd0726 merged from master 2013-05-29 15:45:38 -07:00
Murali Reddy cea9e3919a fixing unit tests to comply with bug "CLOUDSTACK-2477: [GSLB]
CloudStack currently allows admin to map LB rule of one account to GSLB
rule of a different account"
2013-05-29 18:54:36 +05:30
Kishan Kavala e3a104aa58 fix networkAclServiceTest failure 2013-05-29 17:14:36 +05:30
Alena Prokharchyk f2c468d00c Removed unused imports and obsolete methods from ConfigurationManager/ConfigurationServer, NetworkManager/NetworkService 2013-05-28 15:40:44 -07:00
Murali Reddy 883333c214 CLOUDSTACK-2700:on network/vpc delete, portable IP should be still
associated with account

Unlike public ip which gets dis-associated (released) with the account
on network/VPC delete, portable IP should continue to be associated with
the account even when the network/VPC with which it is currently
associated in deleted. This fix ensures portable IP are associated to
account even after network/vpc is deleted.
2013-05-27 18:44:41 +05:30
Harikrishna Patnala a34e577d1b CLOUDSTACK-1453: support restore for VM created from ISO
This is to support restore a vm to a new/currently_attached ISO.
In the restorevm API we have an optional parameter templateId to restore the vm to the new template/ISO ID.
2013-05-24 16:41:03 +05:30
Alex Huang 6a1e1e80fe Merged from master 2013-05-23 18:16:32 -07:00
Alex Huang 099778e38e Finally finished how to get virtualmachine manager to work correctly 2013-05-23 17:55:23 -07:00
Alex Huang 3716f1f320 VirtualMachineManager no longer takes generic types 2013-05-23 14:21:00 -07:00
Sheng Yang eb7c321426 PVLAN: CLOUDSTACK-2401: VM Migration support 2013-05-20 16:43:24 -07:00