Commit Graph

769 Commits

Author SHA1 Message Date
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
Alex Huang aaa16af211 Merged from master 2013-06-09 17:53:27 -07:00
Wei Zhou d2e6bf5fa4 CLOUDSTACK-2865: fix error in prepareStop 2013-06-05 16:43:31 +02:00
Wei Zhou 15265479f6 CLOUDSTACK-2856: collectVmDiskStatistics before reboot/stop/migrate 2013-06-05 14:28:43 +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
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
Saksham Srivastava 62413eec10 CLOUDSTACK-2130: Fix resource_name for old NIC ID
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-05-30 15:24:33 +08:00
Alex Huang 7bdddd0726 merged from master 2013-05-29 15:45:38 -07:00
Nitin Mehta 8d1189c2ae CLOUDSTACK-2060
Global config to turn off dynamically scale vm functionality
2013-05-29 19:02:06 +05:30
Min Chen 6e55776795 CLOUDSTACK-2331: Failed to display exception object information in case of CloudRuntimeException. 2013-05-28 16:01:33 -07:00
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
Nitin Mehta 23baacba62 CLOUDSTACK-2669 - Adding resource limit and count logic for scale vm 2013-05-24 16:06:26 +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 92ad6abab0 PVLAN: Fix NPE when VM are in allocated state
If vlan is not assigned for VM, nic.getBroadcastUri() would be null. Then just
ignore it.
2013-05-21 14:51:35 -07:00
Sheng Yang eb7c321426 PVLAN: CLOUDSTACK-2401: VM Migration support 2013-05-20 16:43:24 -07:00
Devdeep Singh f5c8e386e5 CLOUDSTACK-2379: Fix for issue destroy vm causing NPE. Made the following changes.
1. Made a fix to make sure a null object is added to the exception.
2. Also fixed the marvin test cases for the feature. Account cleanup will remove the vms deployed for the account. There is no need to explicitly delete the vms for the account.
3. Fixed the assertion checks for the vm created for an account. If there are multiple vms for an account, the test script needs to compare the ids with the correct instance.
2013-05-20 18:26:50 +05:30
Alex Huang 05cb7342ae merge from master complete 2013-05-19 20:04:28 -07:00
Alex Huang 5145c3cbf1 Removed the generics from VirtualMachineGurur 2013-05-19 09:12:20 -07:00
Alex Huang e33bc08a8b Removed plug and unplug method as they're not appropriate for VirtualMachineGuru 2013-05-18 15:44:48 -07:00
Alex Huang 1c78396ae2 Completely removed the generic type from VirtualMachineProfile 2013-05-18 10:05:09 -07:00
Prachi Damle 1851f7f7f6 CLOUDSTACK-2365: Anti-Affinity - As admin , we are allowed to deploy a Vm in an affinity group that belongs to different user.
CLOUDSTACK-2349: Anti-Affinity - As admin user , using updateVMAffinityGroup() , we are allowed to update the affinity group of a Vm (that belongs to a regular user) to be set to admin's affinity group.

Changes:
- Even for root-admin make sure that the affinity group and the VM belong to same account
2013-05-17 15:33:01 -07:00
Nitin Mehta 4eb310e926 iCLOUDSTACK-2321
Fix the response of scaleVMCmd
Add Scale System vm command
2013-05-17 17:43:43 +05:30
Prachi Damle a2eb7bab1e CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
- Changes merged from planner_reserve branch
- Exposing deploymentplanner as an optional parameter while creating a service offering
- changes to DeploymentPlanningManagerImpl to make sure host reserve-release happens between conflicting planner usages.
2013-05-16 15:02:17 -07:00
Vijayendra Bhamidipati 15be97772e PVLAN : Implementing PVLAN deployment capability for VMware deployments in cloudstack. 2013-05-16 14:50:16 -07:00
Mice Xia e26442f7d0 instead of '==', use equals() to compare two strings in cloud-server 2013-05-16 16:18:53 +08:00
Mice Xia 6d57393629 instead of using '==', use equals() to test Long value equality 2013-05-16 16:00:02 +08:00
Saksham Srivastava e260817318 CLOUDSTACK-2130: UpdateDefaultNicForVirtualMachine api should also create usage events for updating new default network
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-05-16 14:22:36 +08:00
Sheng Yang 2d2c0c48cd Merge branch 'pvlan'
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
Alex Huang cbdc4063c8 Isolated the job queue work in its own project 2013-05-15 10:14:39 -07:00
Alex Huang d4039743d2 Merged master to vmsync 2013-05-13 17:33:53 -07:00
Nitin Mehta e107776d75 build master 2013-05-12 13:14:33 +05:30
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Likitha Shetty dfad178a9e Bug CLOUDSTACK-1390: Allow Root/Domain admin to move a User VM to another user under a different domain
Add unit tests
2013-05-10 12:18:43 +05:30
Hari Patanala 75a2457af6 CLOUDSTACK-658 - Adding scale vm support for vmware with unit tests
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-05-10 09:32:08 +05:30
Mice Xia 600f140df6 fix CLOUDSTACK-2277 Add approriate message for the user informing about the absence of vm-tools when adding nics to vm on vmware 2013-05-09 14:27:13 +08:00
Mice Xia 6ef615e40d fix bug CLOUDSTACK-2341 remove network from VM is not removing PF/LB/static nat rules for the VM 2013-05-09 11:04:30 +08:00
Kelven Yang a8a09ba287 hook-up new sync with VirtualMachineGuru(s) 2013-05-06 10:01:46 -07:00
Harikrishna Patnala 38b4f84f17 CLOUDSTACK-2146: system vm scaleup failed ;{ "scalevirtualmachineresponse" : {"errorcode":530,"cserrorcode":9999,"errortext":"Failed to scale vm"} }
Only response generation for system vm scale up failed so fixed by changing the response object.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-03 16:49:08 +05:30
Sheng Yang 40386fc4cb PVLAN: Add network label parameter to PvlanSetupCommand
We need it to find the real bridge/switch to program on the OVS.
2013-05-01 13:23:09 -07:00
Sheng Yang 142f3b30f4 PVLAN: Remove bridge parameter in PvlanSetupCommand
Bridge is hypervisor dependent, shouldn't appear in PvlanSetupCommand.
2013-05-01 13:23:08 -07:00
Sheng Yang b64039bafd Implement PVLAN on Xen
Start/stop vm/dhcp server are done. Not done with VM migration.

A new command(PvlanSetupCommand) is sent for setting up PVLAN for vms. Currently
it's focus on OVS implementation. Need to be more abstruct and add vSwitch part.
2013-05-01 13:23:08 -07:00
Sheng Yang 9c9e2ec9cc PVLAN: Add pvlan in createNetworkCommand 2013-05-01 13:23:08 -07:00
Harikrishna Patnala 1cb9bd531f CLOUDSTACK-2180: restoreVirtualMachine returns no password if the template is password enabled
New password is generated as part of restore vm(passwd enabled template) and send new password on VR

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-01 12:29:08 +05:30
Nitin Mehta c338cb7dd0 =updatenetwork changes 2013-04-28 18:13:22 +05:30