Commit Graph

610 Commits

Author SHA1 Message Date
Alex Huang
3ecc52a4f3 Re-absorb delta in master into vmsync 2013-07-03 17:58:38 -07:00
Alex Huang
43ab9506ab Moved HostAllocator and PodAllocator from server to api package, where they are supposed to be. In the process, I had to change the VO objects used by these two itnerfaces to interface equivalent. This makes sense because there's really no reasons why allocators require write access to the database. One of the files have been reformatted because it contained a bunch of tabs instead of spaces for indentation. 2013-07-03 17:48:53 -07:00
Alex Huang
8d21f49ec9 Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged 2013-07-03 15:01:23 -07:00
Chip Childers
c49674300a Adding license header to server/test/com/cloud/network/security/SecurityGroupManagerImplTest.java 2013-07-03 10:05:29 -04:00
Daan Hoogland
141fbc7ef7 cidr compare fixme addressed 2013-07-03 09:28:49 -04:00
Nitin Mehta
90a15bfff6 CLOUDSTACK-2107
If the scaling up fails on the host the vm is running on try to migrate it to other hosts in the cluster and try scaling.
CLOUDSTACK-3349
For deciding the host in the cluster try the new deployment manager now
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-03 18:40:22 +05:30
Murali Reddy
2f3764ef94 CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites
involved in the GSLB

add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
2013-07-02 17:55:58 +05:30
Alex Huang
57bafc8fe9 Another merge from master. This is just getting laborious 2013-07-01 11:29:57 -07:00
Mike Tutkowski
99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Bharat Kumar
1c924e5ab5 Assertion failure in updatephysicalnetwork Test.
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Murali Reddy
0f40cfbea8 CLOUDSTACK-2045: [Multiple IPs Per Nic] This feature is not working well
in case of networks with external devices after GC

add an exception for networks that use external networking devices and has
secondary guest IP's allocated. On network GC, when network goes through
implement phase a new vlan is allocated, based on the acquired VLAN id cidr
of the network is decided in case of external networking case. While NIC
uses reservation strategy 'Start' which ensures that new primary ip is
allocated for the NiC from the new CIDR. Secondary IP's have hardcoded
IP's in  network rules. So prevent network GC.
2013-06-28 12:26:20 +05:30
Alex Huang
e22e58b583 Added RAT 2013-06-25 04:18:40 -07:00
Alex Huang
7b7db0560c merge is complete 2013-06-24 16:50:31 -07:00
Alex Huang
c0febea950 finished up the conversion to using outcome 2013-06-24 10:16:35 -07:00
Jayapal
6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Kelven Yang
340e1da4c4 Fix test cases in OSS build caused by CallContext changes 2013-06-20 18:03:08 -07:00
Edison Su
97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Harikrishna Patnala
7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Edison Su
9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Alena Prokharchyk
d66e9c7b51 CLOUDSTACK-2843: Provideded an ability to turn off the synchronization being done on the CS agent side,
for number of commands participating in Vm deployment process, as parallel deployment is supported on the hypervisor side.
The behavior is controlled by global config varirables:

"execute.in.sequence.hypervisor.commands" (false by default) sets/resets the synchronization for commands:
=========================
StartCommand
StopCommand
CreateCommand
CopyVolumeCommand

"execute.in.sequence.network.element.commands" (false by default) sets/resets the synchronization for commands:
==========================
DhcpEntryCommand
SavePasswordCommand
UserDataCommand
VmDataCommand

As a part of the fix, increased the global lock timeout to 30 mins in several VR scripts:
===========================
edithosts.sh
savepassword.sh
userdata.sh

to support situations when multiple concurrent calls to the script are being made.
2013-06-19 10:12:13 -07:00
Likitha Shetty
1af928570c CLOUDSTACK-3062. Dedication of a guest vlan range that extends 2 ranges dedicated to different accounts removes an old dedication 2013-06-19 16:59:14 +05:30
Wei Zhou
882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02: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
Edison Su
f41c800d88 merge to master 2013-06-14 19:06:33 -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
Min Chen
18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -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