3ecc52a4f3
Re-absorb delta in master into vmsync
2013-07-03 17:58:38 -07:00
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
306d0907bc
Fixing migration of a virtual machine with storage in the new framework. Made changes to queue a VmWorkJob for migration. The work gets picked up by job dispatcher which carries out migration of the vm with storage.
2013-07-04 04:52:19 +05:30
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
d8560281a4
CLOUDSTACK-3347: fixed project deletion for project's owned template
...
Conflicts:
server/src/com/cloud/template/TemplateAdapterBase.java
2013-07-03 13:48:06 -07:00
bec53fb59a
VMSync: Separating jobs from api
2013-07-03 11:22:40 -07:00
31df729008
CLOUDSTACK-3184: updateVirtualMachine api gives java NPE.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 19:39:02 +05:30
c49674300a
Adding license header to server/test/com/cloud/network/security/SecurityGroupManagerImplTest.java
2013-07-03 10:05:29 -04:00
141fbc7ef7
cidr compare fixme addressed
2013-07-03 09:28:49 -04:00
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
4e823e3a3e
Workaround for NPE
2013-07-03 14:59:03 +02:00
d425fa76f7
CLOUDSTACK-3335:[Object_Store_Refactor][Automation]CopyTemplate failed
...
with Unexpected exception.
2013-07-02 18:01:47 -07:00
8780fef05a
CLOUDSTACK-3047 java.lang.NullPointerException encountered when executing capacityChecker thread.
...
Changes:
- Added null check around clusterId, since its possible to have null clusterId for storagepool and host records
2013-07-02 16:36:58 -07:00
9a3067fb87
CLOUDSTACK-3314: templates downloaded to S3 should show up in
...
listTemplates when zoneId is provided.
2013-07-02 15:47:49 -07:00
8a0470ee0f
CLOUDSTACK-3207: added resourceLimit/resourceCount to the Project API response
...
Conflicts:
setup/db/db/schema-410to420.sql
2013-07-02 15:34:08 -07:00
05f4680735
CLOUDSTACK-3314: ListTemplates only show one entry for cross-zone
...
templates.
2013-07-02 13:54:40 -07:00
d660bc7e8d
CLOUDSTACK-3089 [ZWPS] NPE while cancelling the Storage Maintenance
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-02 11:51:16 -07:00
2bc4cbf9fb
CLOUDSTACK-2571 Zone Wide Primary Storage blocker issues while Enabling in Maintenance State
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-02 11:49:16 -07:00
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
54c2133590
CLOUDSTACK-2984: createNetwork call - when vlan is specified, check that its not coming from the physical network vnet range as this range is used for dynamic vlan allocation during the network implementation stage
2013-07-01 16:17:43 -07:00
37f12a31a3
CLOUDSTACK-236: log uuid instead of actual db id, in the updateNetworkOffering method
2013-07-01 15:13:19 -07:00
1762be05a9
CLOUDSTACK-2084: API - when account type is ACCOUNT_TYPE_PROJECT, make listVlanIpRanges API to return accountName.
2013-07-01 14:22:06 -07:00
1c67e34c82
CLOUDSTACK-3287: [GSLB] API "updateGlobalLoadBalancerRule" is not
...
recognised by CloudStack
added api to managementServerImpl and ensure glsb config is applied to
gslb service providers
2013-07-02 00:07:58 +05:30
57bafc8fe9
Another merge from master. This is just getting laborious
2013-07-01 11:29:57 -07:00
3cddc36b29
Fixed a problem with the jobcontext being null if it came from the admin port
2013-07-01 11:19:19 -07:00
301c91c099
CLOUDSTACK-3189: Primary storage usage is not getting decremented after deleting the DATA volumes.
...
When a volume is created the resource usage for it gets incremented. If it is deleted without being
attached to a volume, the decrement doesn't take place. Fixed the delete volume code to decrement
resource usage for a volume in allocated state too.
2013-07-01 23:41:10 +05:30
639592f3b7
readibilty of log- and exception messages
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-01 20:17:11 +05:30
ffd5f1a777
CLOUDSTACK-2288: NPE while creating volume from snapshot when the primary storage is in maintenance state.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-01 20:17:11 +05:30
e07a8b3f51
CLOUDSTACK-3282:[GSLB] Unable to add multiple LB rules to same GSLB rule
...
-fixing regression due to adding GSLB monitor for GSLB service
-code to add/delete GSLB monitor and GSLB service-monitor binding is
made idempotenet so as to succeed if the resource exists.
2013-07-01 19:07:00 +05:30
4c0425f918
CLOUDSTACK-2813 - Some deployment failures do not release the resources.
...
Applying the short term fix of force cleaning up if the answer recieved from startcommand is not valid
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-30 14:53:32 +05:30
49ded7e4a3
the plugin better not touch database
2013-06-29 15:09:43 +05:30
de38cd815f
Fix typo in class name
...
AsyncRpcConext -> AsyncRpcContext
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
87c401aaaf
CLOUDSTACK-3144: [Automation] Deletion of templates failing. Fails to
...
find image store housing template.
2013-06-28 17:57:42 -07:00
2c31f38c05
CLOUDSTACK-3145:StorageManager-Scavenger NPEs when cleaning up
...
templates.
2013-06-28 17:54:48 -07:00
99227f7b3e
SolidFire plug-in and related changes
...
SolidFire plug-in
SolidFire plug-in related
2013-06-28 16:59:21 -06:00
02ab2eb384
Revert "Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries"
...
This reverts commit 7f2f25d640
2013-06-28 14:58:32 -07:00
78922589bb
CLOUDSTACK-2385: template download fails with Unexpected failure in Vmware.
...
Description:
Putting in fix to allow download of guest VM templates that are available
across zones.
2013-06-28 23:08:36 +05:30
1c924e5ab5
Assertion failure in updatephysicalnetwork Test.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
974245991c
Cloudstack-2732 [Multiple_IP_Ranges] Deleting guest IP range is not throwing any error message to user while the ip addresses are being used
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
6b0df2566d
Cloudstack-3106 Delete all ips except ipAlias. Cloudstack-3119 Shared network removal doesn't cleanup corresponding IP ranges
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
7f2f25d640
Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:54 +05:30
3096261c05
Updated to show same value in log msg SetFirewallRulesCommand and accessdetails for egress default policy
2013-06-28 19:05:54 +05:30
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
6da29c4cde
CLOUDSTACK-650: Rename ExternalLBUsageMgr to more generic ExternalDeviceUsageManager since it contains firewall usage also. Most of the functionality is already fixed in CLOUDSTACK-1289
2013-06-28 12:08:33 +05:30
7713c5cdbc
CLOUDSTACK-3239: Delete Traffic Monitor directly without going through maintenance state
2013-06-28 11:12:55 +05:30
4bbc65b34c
CLOUDSTACK-3246: Unable to use portable ips if the portable ip range is deleted and readded atleast once. Fixed the query used to look for available portable ips.
2013-06-28 03:32:31 +05:30
3160a0c2da
Add template zone related information into TemplateZoneResponse.
2013-06-27 14:34:00 -07:00
c8692f2e4a
CLOUDSTACK-3245: non admin user not able to register template
...
Reviewed-by: Alena Prokharchyk
2013-06-27 14:09:52 -07:00
0d78868180
CLOUDSTACK-3064: Able to create an instance from different account of the same domain without
...
using affinity group even if the zone is dedicated to an account. The check to make sure that
explicit resources are not picked up for non-explicit deployment was present only at the domain
level for zones. Added a check at account level too.
2013-06-28 00:32:17 +05:30
4361418e41
Removed Dead Code from Management Server Hyper-V 2012 Support
...
Update ImageFormat enum to include VHDX format introduced with Hyper-V
Server 2012.
Remove existing Hyper-V plugin, because it does not work and is dead
code.
Remove references to existing Hyper-V plugin from config files.
Remove Hypervisor.HypervisorType.Hyperv special cases from manager code
that are unused or unsupported.
Specifically, there is no CIFS secondary storage class
"CifsSecondaryStorageResource". Also, the Hyper-V plugin's
ServerResource is contacted by the management server and not the other
way around.
Add Hyperv-V support to ListHypervisorsCmd API call
Signed-off-by: Edison Su <sudison@gmail.com>
2013-06-27 11:46:02 -07:00
Alex Huang
Devdeep Singh
Alena Prokharchyk
Sanjay Tripathi
Chip Childers
Daan Hoogland
Nitin Mehta
Hugo Trippaers
Min Chen
Prachi Damle
Rajesh Battala
Murali Reddy
Jessica Wang
Daan Hoogland
Edison Su
Prasanna Santhanam
Mike Tutkowski
Vijayendra Bhamidipati
Bharat Kumar
Jayapal
Kishan Kavala
Harikrishna Patnala
Saksham Srivastava
Donal Lafferty