Commit Graph

6854 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 8f00c19192 Finally, we moved AsyncJobManagerImpl out of server package 2013-06-17 17:04:05 -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
Prachi Damle fb31a39efe CLOUDSTACK-2900: Ubuntu 13.04 - Migrate Virtual Router fail - Unable to find the VM by id=
Changes:
- Have to search the vm_instance table to find the instance
2013-06-17 16:59:32 -07:00
Jessica Wang 3e852cc29b CLOUDSTACK-3016: remove zonetype parameter from listNetworks API. 2013-06-17 16:26:09 -07:00
Alena Prokharchyk 5d0a1cee13 CLOUDSTACK-2883: create default network offering with internal lb support (if doesn't exist already) 2013-06-17 16:13:19 -07:00
Kelven Yang eaf30b8355 Fix assertion issue found in DedicatedResourceDaoImpl.java 2013-06-17 16:11:55 -07:00
Jessica Wang 880029844b CLOUDSTACK-3016: remove zonetype parameter from listTemplates, listIsos API. 2013-06-17 16:08:38 -07:00
Jessica Wang cb35ec6f4d CLOUDSTACK-3016: remove zonetype parameter from listSystemVMs API. 2013-06-17 15:58:33 -07:00
Min Chen 4c26dd6ae5 CLOUDSTACK-2956:createStoragePools API should ignore passed clusterId
and podId parameters in creating zone scoped primary storage
2013-06-17 15:57:52 -07:00
Jessica Wang 56d390d54e CLOUDSTACK-3016: remove zonetype parameter from listPods API. 2013-06-17 15:51:07 -07:00
Jessica Wang 9d0d02222b CLOUDSTACK-3016: remove zonetype parameter from listClusters API. 2013-06-17 15:28:39 -07:00
Jessica Wang 9e7356c686 CLOUDSTACK-3016: remove zonetype parameter from listSnapshots API. 2013-06-17 15:00:44 -07:00
Laszlo Hornyak 202cd15290 NPE fix
- fixes an NPE in case the pool.scope = null
- replaces null checks around toString with ObjectUtils.toString call

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:19:43 +01:00
Laszlo Hornyak c88d8fb3a2 use commons-lang StringUtils
commons-lang is already a transitive dependency of the utils project, which allows removing some duplicated functionality.
This patch replaces StringUtils.join(String, Object...) with it's commons-lang counterpart.
It also replaces calls to String join(Iterable<? extends Object>, String) in cases where an array is already exist and it is only wrapped into a List.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:17:22 +01:00
Alena Prokharchyk 952fa2464d LOUDSTACK-2914: handle situation when serviceProvider map is empty 2013-06-17 10:55:33 -07:00
Alena Prokharchyk fc16e29f99 CLOUDSTACK-2914: default lb scheme to Public when the service LB is enabled, and scheme is not specified explicitly 2013-06-17 10:10:43 -07:00
Hugo Trippaers b0ea02e65a Allow DSA public keys.
DSA can't be used for encryption with the bouncycastle library, so make
sure this situation is properly handled.
2013-06-17 10:04:59 -07:00
Likitha Shetty 770cf02ccf Global config to disable an account from acquiring public ips and guest vlans from the system if the account
has dedicated resources and the dedicated resources have all been consumed - use.system.public.ips and use.system.guest.vlans
Both configs are configurable at the account level too.
2013-06-17 17:54:36 +05:30
Jessica Wang 8925d39b78 CLOUDSTACK-3016: remove zonetype parameter from listVirtualMachines API. 2013-06-14 16:51:20 -07:00
Jessica Wang b4a692d80f CLOUDSTACK-3016: remove zonetype parameter from listVolumes API. 2013-06-14 16:39:04 -07:00
Jessica Wang ea0de9eaf4 CLOUDSTACK-3016: remove zonetype parameter from listStoragePools API. 2013-06-14 16:33:27 -07:00
Jessica Wang cb37d4cb63 CLOUDSTACK-3016: remove zonetype parameter from listHosts API. 2013-06-14 16:14:45 -07:00
Mice Xia 7663684981 fix CLOUDSTACK-2989 normal user are allowed to create isolated network offerings with vlan assignments
1) only root admin can list network offering with specifyVlan=true
2) only root admin can create network with specifyVlan=true
2013-06-14 14:58:24 +08:00
Mice Xia 5e56e43e31 fix CLOUDSTACK-2930, exception while applying ACL rule with protocol as ALL.
1) change UI, disable startport and endport when protocol=All
2) validate parameters for API createNetworkACL
2013-06-14 13:19:07 +08:00
Alex Huang aff0220d45 Moved files into cloud-engine 2013-06-13 16:34:41 -07:00
Sheng Yang 5a8a2a259e CLOUDSTACK-2792: Send "saved_password" to BACKUP router when reset password for user VM
Otherwise when MASTER failed, the user VM would get password reset again after
reboot.

But this fix still have issues if MASTER is failure before VM boot up, but in
that case, password of user VM won't change and user would request password
change again, then it would be fine.
2013-06-13 16:05:15 -07:00
Sheng Yang fbe6b273e3 CLOUDSTACK-1170: Redundant Router: Ensure MACs are same on other than first public nic 2013-06-13 16:05:15 -07:00
Alex Huang 3ef77bc85a Complete the move of the virtualmachinemanager to cloud-engine 2013-06-13 13:50:59 -07:00
Alex Huang fbe76f0b0f removed some unused files 2013-06-13 13:48:41 -07:00
Kelven Yang d52e0c2ebd Add out-of-band sync for powner on events 2013-06-13 10:05:59 -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
Jayapal b72c79b370 CLOUDSTACK-2934 Fixed not showing uuid in list firewall rules response
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 14:37:34 +05:30
Vijayendra Bhamidipati ff0a524bd6 CLOUDSTACK-2969: Exception when creating vlan ip range
Description:

	Putting in null pointer check when creating ip range.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-13 11:07:12 +05:30
Kelven Yang 0f26d5a050 Add skeleton to support out-of-band sync and recovery from left-over transitional VM states 2013-06-12 17:14:54 -07:00
Kelven Yang 2892469cf4 Fix recent changes in DeploymentPlanner 2013-06-12 15:30:24 -07:00
Kelven Yang 39dd4bd26b Manage active job in run numbers 2013-06-12 14:29:44 -07:00
Alex Huang e440bc7423 More changes 2013-06-12 13:59:29 -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 03a9445fda Workaroud StartUserVM DeploymentPlan serialization issue to make it across job boundary 2013-06-12 09:45:06 -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
Nitin Mehta 2aafc39f3d CLOUDSTACK-2957
deployVm API size attribute should be capped by the storage.max.volume.size as it is in createVolume.
2013-06-12 17:01:41 +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
Wei Zhou 51a3a5a9b5 CLOUDSTACK-2945: ignore collect disk statistics if vm is not running on KVM or XenServer 2013-06-12 11:57:17 +02:00