Commit Graph

2757 Commits

Author SHA1 Message Date
Kelven Yang 22a1b8c3fc CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic 2014-01-03 17:20:24 -08:00
edison db25228b23 CLOUDSTACK-5329: fix NPE in storage migration for zone-wide primary storage, and also the serization error. 2014-01-03 16:44:21 -08:00
Sanjay Tripathi ce48b0bd55 Revert "CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage"
This reverts commit 23841e3369.
2014-01-01 11:23:57 +05:30
edison 23841e3369 CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage 2013-12-31 14:03:44 -08:00
Mike Tutkowski 8eb430f602 CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2013-12-28 00:12:11 -07:00
Kelven Yang dc303fda6e CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations 2013-12-27 16:40:50 -08:00
Mike Tutkowski 574fc3a4f8 CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2013-12-27 13:12:12 -07:00
Murali Reddy 2715fd4dd9 CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router
restart, firewall rules dropped from iptables post restart

on VR restart, not all public IP's associated with the network are sent
with IpAssocCmd to VR. This fix will ensure all the ip's associated with
the network irrespective of the account are sent as part of
IpAssocCommand
2013-12-27 13:35:42 +05:30
Min Chen 35ba14d88d CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
migration to S3.
2013-12-26 11:12:00 -08:00
Alena Prokharchyk 632346d6a5 CLOUDSTACK-5390: when calculate index (page #) in NetworkManager, rely on fact that getStartIndex() returned by API, returns pageSize*(page-1). So to get index(page), you need to do the reverse calculation 2013-12-23 16:53:46 -08:00
edison 15403a1f29 add xenserver 6.2.0 hotfix support, to optimize vdi copy
add xenserver hot fix
2013-12-18 18:22:52 -08:00
Nitin Mehta dc0f8ebdf1 CLOUDSTACK-4941:
During HA call different planners which skip some heurestics
2013-12-17 18:32:46 -08:00
Bharat Kumar 9118bbf934 CLOUDSTACK-5495 Unable to stop VM. adding the changes to make the global config execute.in.sequence.hypervisor.commands configurable for stopvm command.
Signed-off-by: Koushik Das <koushik@apache.org>
2013-12-17 17:43:19 +05:30
Alena Prokharchyk 326313e02e Resource metadata support for S2SVpnConnection 2013-12-12 14:57:44 -08:00
Alena Prokharchyk 888a599a41 Resource metadata support for customer gateway 2013-12-12 13:56:38 -08:00
Kishan Kavala 6a63fb4461 Upgrade router template by accountName and domainId instead of accountId 2013-12-12 18:18:21 +05:30
Syed Ahmed fb89a2d8f6 CLOUDSTACK-5296: Add certificate chain support for netscaler.
adds support for trust chains in the netscaler
2013-12-12 12:13:43 +05:30
Nitin Mehta 326a46d0ac Revert "CLOUDSTACK-4904: Unable to see a derieved template if the"
This reverts commit 4907a8f6fa.
2013-12-11 21:53:33 -08:00
Harikrishna Patnala 4907a8f6fa CLOUDSTACK-4904: Unable to see a derieved template if the
parent template is deleted
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-12-11 10:32:27 -08:00
Murali Reddy 79cb891efc CLOUDSTACK-5431: permit 'http' as service type for GSLB rule
Conflicts:
	api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
	api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
2013-12-11 15:40:51 +05:30
Murali Reddy 4fb54ca32d CLOUDSTACK-5428: support NetScaler to be configured exclusively for GSLB
service and not used for LB

Fix adds a boolean flag to addNetscalerLoadBalancer api, which
will mark added NetScaler for exclusive GSLB service. A netscaler marked
as exclusive gslb service provider is not picked for any guest network's
lb provider.

Conflicts:
	engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
	plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java
	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-421to430.sql
2013-12-11 15:36:22 +05:30
Jayapal 3caef2b1d5 CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX
1. Egress default policy rules is send to the firewall provider. It is up to the
    provider to configure the rules.
   2. The default policy rules are send for both allow and deny default policy.
   3. On network shutdown rules for delete are send.
   4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required.
2013-12-10 14:43:13 +05:30
Alena Prokharchyk 93fd323357 Resource metadata support for Site2SiteVpnGateway 2013-12-09 17:37:37 -08:00
Kishan Kavala 33ff20e1c3 CLOUDSTACK-5145 : Added permission checks while listing network ACLs and acl Items. Users will be able to list items that they have access to. 2013-12-09 19:49:29 +05:30
Fang Wang 3f526fb052 cloudstack-4308 Add API listCapabilities for KVMSnapshotEnabled so that UI can use it for recurring snapshot.
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
	api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
	server/src/com/cloud/server/ManagementServerImpl.java
2013-12-06 15:40:48 -08:00
Prachi Damle d3520a5d18 CLOUDSTACK-5399: Add option to createVolume API to specify a VM, to place the volume appropriately and attach immediately
Fixing merge problem
2013-12-06 13:18:43 -08:00
Prachi Damle 3a6adb3c58 CLOUDSTACK-5399: Add option to createVolume API to specify a VM, to place the volume appropriately and attach immediately
Changes:

    - Added 'virtualmachineid' parameter to the createVolume API to specify a VM for the volume. The Vm should be in 'Running' or 'Stopped' state.
    - This parameter is used only when createVolume API is called using snapshotid parameter
    - When this parameter is set, the volume is created from the snapshot in the pod/cluster of the VM. Also the volume is then attached to the VM in the same request
    - If attach Volume fails but create has succeeded, the API errors out but the Volume created remains available. User may attach the same volume later
    - When Vm is provided, but if no storage pool is available in the VM's pod/cluster then the volume is not created and API fails.
2013-12-06 13:18:37 -08:00
Frank.Zhang ef6038f1b3 commit 8edaf63c4e
Author: Frank.Zhang <frank.zhang@citrix.com>
Date:   Thu Oct 10 14:45:03 2013 -0700

    CLOUDSTACK-4850
        [UCS] using template instead of cloning profile
2013-12-05 17:25:57 -08:00
edison su dd34ae97fd Revert "Remove uncessary changes."
This reverts commit fcab2b776a.
2013-12-05 13:14:11 -08:00
Alena Prokharchyk b315ca1895 CLOUDSTACK-5261: support for alert publishing via Root admin web api
listAlerts: introduced new parameter "name" to the alertResponse

Added new Admin API - generateAlert. Available to ROOT admin only

listAlerts: implemented search by alert name
2013-12-03 17:08:23 -08:00
edison su fcab2b776a Remove uncessary changes. 2013-12-03 13:16:51 -08:00
edison su 78c77ec905 0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to- 2013-12-03 13:16:50 -08:00
Bharat Kumar 089c7bc9f8 CLOUDSTACK-5161 use a map to specify the custom parameters instead of having one parameter each 2013-12-03 16:53:58 +05:30
Bharat Kumar 72e0354661 CLOUDSTACK-5161 enable scaling and upgrading of a vm using custom offering
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 18:32:16 +05:30
Alena Prokharchyk 4edc3989bb Resource metadata support for NetworkACLItem 2013-11-27 14:37:28 -08:00
Jayapal 20cf42a54c CLOUDSTACK-5285 Corrected the API description 2013-11-27 10:54:22 +05:30
Alena Prokharchyk c9b0a8b1f4 Resource metadata support for NetworkACLList 2013-11-26 17:22:32 -08:00
Alena Prokharchyk 1fe8efc85f Resource metadata support for VPC Private Gateway 2013-11-26 12:48:41 -08:00
Alena Prokharchyk f5c29c0f1a ListPortFowardingRules: added networkId to the list of optional parameters to list by 2013-11-25 15:30:55 -08:00
Edison Su 70fed9f387 Add a new method on datastoredriver: getCapabilities, which will be called by liststoragepoolcmd. UI can make decision based on the capabilities of the storage.
And also add a new table: snapshotdetails

Conflicts:
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
2013-11-22 16:20:41 -08:00
Alena Prokharchyk 43119bcbdd Added new paramerer "start" to createVPC command. When false is passed in, VPC won't be started (its VPC VR won't get implemented) till the point when the first netwotrk gets implemented in the VPC.
The parameter is optional and true by default to preserve the original behavior
2013-11-22 09:40:12 -08:00
Alena Prokharchyk cb14dad75b Resource metadata - support for VPC
Conflicts:
	api/src/com/cloud/server/ResourceTag.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-11-21 12:59:49 -08:00
Kelven Yang 5a44de282b CLOUDSTACK-669: side-by-side VM sync management at manager level 2013-11-20 18:22:38 -08:00
Kelven Yang 7be9b121cf CLOUDSTACK-669: Add host level side-by-side VM state report for graceful sync model migration 2013-11-20 18:17:29 -08:00
Syed Ahmed 041089afe2 Adding protocol parameter to loadbalancer response 2013-11-20 11:22:37 +05:30
Kishan Kavala 8457538161 Fix listRouter by clusterId and upgradeRouterTemplate by clusterId 2013-11-18 13:15:42 +05:30
Harikrishna Patnala 52de0dc2ca CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot
CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot

CLOUDSTACK-5163: missing parameters in configuration table
2013-11-15 14:32:03 +05:30
Alena Prokharchyk 0837697f9b Resource Metadata: added implementation for Remote Access VPN 2013-11-13 14:27:06 -08:00
Alena Prokharchyk 2b6ca5af0f listRemoteAccessVpns: implemented search by networkId and id 2013-11-13 14:26:58 -08:00
Alena Prokharchyk 09cfcd619e listFirewallRules - added optional networkId parameter allowing to search for firewall rules by guest network id 2013-11-12 17:17:21 -08:00
Mike Tutkowski bb8794203e CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2013-11-12 16:52:12 -07:00
Alena Prokharchyk 8c61117369 Added resource metadata support for PF rules 2013-11-12 11:03:10 -08:00
Laszlo Hornyak b33a8371bc license headers added
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-09 09:06:01 +01:00
Alena Prokharchyk 8bd1eaa210 ResourceMetaData: added support for userIpAddress (publicIp) metadata 2013-11-08 10:48:43 -08:00
Rajesh Battala 19e9849d86 Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.
Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests
2013-11-08 20:21:18 +05:30
Syed 0076307863 Squashed merge of Ssl Termination feature
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support

This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.

The following are the new API's that this patch adds

uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer

Unit tests are also included in the patch.
2013-11-08 16:49:16 +05:30
Sebastien Goasguen b36ed1289a CLOUDSTACK-4998 additional bug fixed 2013-11-08 10:39:49 +01:00
Edison Su 0997ccac22 fix compile 2013-11-07 16:56:41 -08:00
Edison Su c233492bfc Add quiencevm option on createsnapshotcmd 2013-11-07 14:57:05 -08:00
Kishan Kavala 3f5b8f7063 CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router 2013-11-07 19:49:05 +05:30
Bharat Kumar 7095ea2b5e CLOUDSTACK-4738 Dynamic compute offering.
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-07 12:41:20 +05:30
Mike Tutkowski 10c513a259 CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2013-11-06 21:02:39 -07:00
Hugo Trippaers a7201a81b2 The VPC offering has the option internaly to specify the compute offering (service offering), expose this via the api.
Added a field to the command for serviceOfferingId and changed the internal interface to accept the service offering as parameter

Applied automated code cleanup
2013-11-06 22:13:00 +01:00
Will Stevens 8f8ad3f38e Squashed commit of the Palo Alto Networks firewall integration plugin.
This patch adds a network plugin to support Palo Alto Networks firewall (their appliance and their VM series firewall).

More information in the FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Palo+Alto+Firewall+Integration

Features supported are:
- List/Add/Delete Palo Alto service provider
- List/Add/Delete Palo Alto network service offering
- List/Add/Delete Palo Alto network with above service offering
- Add instance to the new network (creates the public IP and private gateway/cidr on the PA as well as the source nat rule)
- List/Add/Delete Ingress Firewall rule
- List/Add/Delete Egress Firewall rule
- List/Add/Delete Port Forwarding rule
- List/Add/Delete Static Nat rule
- Supports Palo Alto Networks 'Log Forwarding' profile globally per device (additional docs to come)
- Supports Palo Alto Networks 'Security Profile Groups' functionality globally per device (additional docs to come)

Knowns limitations:
- Only supports one public IP range in CloudStack.
- Currently not verifying SSL certificates when creating a connection between CloudStack and the Palo Alto Networks firewall.
- Currently not tracking usage on Public IPs.

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-11-06 10:08:22 -08:00
Hugo Trippaers 3c139ea84b Probably accidentally committed with commit 191dc80fa4 2013-11-06 10:54:30 +01:00
Kelven Yang 191dc80fa4 VM power state for job oritented sync processing 2013-11-05 19:00:37 -08:00
Jayapal b464a20a52 CLOUDSTACK-4736: Monitoring services in VR 2013-11-05 23:39:33 +05:30
Harikrishna Patnala a286dec098 CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-05 16:12:36 +05:30
Prachi Damle 4be7947281 CLOUDSTACK-4948: DeploymentPlanner: Logic to check if cluster can be avoided, needs to consider if VM is using local storage and/or shared storage
Changes:
- Consider if VM requires the local storage or shared storage or both for its disks.
- Accordingly all pools in the cluster should consider local or shared or both pools

Conflicts:

	server/src/com/cloud/agent/manager/allocator/HostAllocator.java
2013-11-04 16:45:02 -08:00
Alena Prokharchyk 7a26894eb0 Changes to @Parameter - added RoleType[] authorized() field. The field defines who is authorized to put the parameter to the call. If the person is not authorized, the parameter will be ignored.
Also fixed CLOUDSTACK-5024 - added storageId to the list of the request parameters (available to the Root admin only)
2013-11-01 22:48:11 -07:00
Edison Su 31ec4191c0 Fix compile 2013-11-01 15:30:20 -07:00
Edison Su 7c99b88926 Don't use cast to PrimarydataStoreTO on the resource code 2013-11-01 15:13:16 -07:00
Pedro Marques 6b5fab2f5c OpenContrail network plugin
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-11-01 17:46:52 +01:00
Edison Su c5bec6b336 add quiescevm in createvmsnapshotcmd 2013-10-31 16:45:05 -07:00
Alena Prokharchyk 78b1ac4126 CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page
Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
	utils/src/com/cloud/utils/db/GenericDaoBase.java
2013-10-31 15:25:57 -07:00
Sheng Yang 3205cd42b5 CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.

Test case also included.

The test case would create 2 vpcs and using VPN to connect them.
2013-10-30 19:30:22 -07:00
Sebastien Goasguen ee5a3964aa CLOUDSTACK-4998: fix assignvm response string 2013-10-30 04:09:04 -04:00
Alena Prokharchyk 591dcd1d1c ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user 2013-10-29 09:18:11 -07:00
Rajani Karuturi 9300d4a3ba Added an api call to import all the ldap users to the same domains(ou's) in cloudstack
TODO:
    1. error handling of no domains present, nested hierarchy
    2. handling the case when the api call fails for a specific user/users
    3. test cases for LdapUserManager

Signed-off-by: Ian Duffy <ian@ianduffy.ie>
2013-10-29 09:04:33 +00:00
Min Chen 6be228a438 CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary
storage to S3.
2013-10-28 21:01:31 -07:00
Alena Prokharchyk 5caeab782d ResourceDetails -
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
2013-10-28 14:45:52 -07:00
Alena Prokharchyk d0090a0c24 Resource details (metadata) - added support for Storage pool details 2013-10-28 12:53:53 -07:00
Mike Tutkowski 858ce76665 Extend support of CloudStack-managed storage to KVM 2013-10-27 22:30:03 -06:00
Min Chen 28f9952c6e CLOUDSTACK-4816: Removed unused field from S3TO to avoid confusion in
the log.
2013-10-25 21:20:09 -07:00
Darren Shepherd 9f7b4884a7 Make commands.properties optional for non-ACS code
Currently any new API extension to CloudStack must edit
commands.properties to add the appropriate ACLs.  This generally works
fine for ACS as we control the contents of that file and distribute
all the code ourself.  The hang up comes when somebody develops code
outside of ACS and want to add their code to an existing ACS
installation.  The Spring work that has been done has made this much
easier, but you are still required to manually edit
commands.properties.  This change introduces the following logic.

First check commands.properties for ACL info.  If ACL info exists, use
that to authorize the command.  If no ACL information exists (ie
null), then look at the @APICommand annotation.  The defaults of
@APICommand will provide no ACL info.  If the @APICommand annotation
provides no ACL info, use that.
2013-10-25 16:31:55 -07:00
Alena Prokharchyk aa9f8e64ae Resource details: added way of generic access of resource DAO based on the resourceType passed in (was hardcoded before) 2013-10-25 11:57:17 -07:00
Alena Prokharchyk 0fb4d9d5a2 Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors. 2013-10-25 10:56:19 -07:00
Sheng Yang 1528725949 CLOUDSTACK-754: Enable Remote Access VPN for VPC
With integration smoke test case.
2013-10-24 17:34:41 -07:00
Alena Prokharchyk 24725f8e21 ResourceDetails:
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
2013-10-24 15:54:49 -07:00
Wei Zhou 059e3beb28 CLOUDSTACK-4505: add ExpungeVM command to expunge a destroyed VM on demand 2013-10-24 11:52:00 +02:00
Darren Shepherd 63e46ad1d0 Make system CallContext load user on demand
Before every thread would hit the database once at the start to
load the system account and user.  The loaded objects are almost never
used.  This change optimizes the behavior and lazy loads the system
user and account object.
2013-10-23 23:09:58 -07:00
Alena Prokharchyk 2bb716efd8 ResourceMetaData (Resource details) fixes:
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
2013-10-23 17:39:16 -07:00
Alena Prokharchyk e52e7a5634 CLOUDSTACK-4874: rever the previous commits. Service offering details are already being returned in "serviceofferingdetails" field of the service offering response 2013-10-23 17:17:14 -07:00
Darren Shepherd 891b85d516 Add missing licenses 2013-10-23 15:20:08 -07:00
Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-10-23 12:31:53 -07:00
Chris Suich 0ed7ebd7e7 Squashed & merged commit of the following:
commit c9ee0d12e191e803fb341f3f96e95ca434a36f6c
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Wed Oct 23 16:55:10 2013 +0200

    CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only
    (cherry picked from commit a94acc5a43)

commit fe1586c71377bc6d219db2dcf088c40b65dd1fc4
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Tue Oct 22 11:20:27 2013 -0700

    CLOUDSTACK-4649:
            vm sync tracks the pv driver version for xenserver

     Anthony

commit 56a218f66eda540b4b4b04030ee71fc6863f8532
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Mon Oct 21 16:10:07 2013 -0700

    CLOUDSTACK-4649:
        xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
    this patch tracks PV driver versions in vm details and template details.

    Anthony

commit 4e85d28c678a6f96b5b70d8d33fc60f9d1ea3df6
Author: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Date:   Mon Oct 21 21:17:33 2013 +0200

    removed unused static field

    - s_httpClientManager was not used

    Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>

commit d4121fa26023db236f7396cea455ef090672ae9a
Author: Chris Suich <chris.suich@netapp.com>
Date:   Tue Oct 22 10:45:22 2013 -0400

    Updated DataMotionServiceImpl and ApiResponseHelper based on review feedback.

commit aaf026e1e4204d405bcda2ae4f1a01b1d0f7e7cb
Author: Chris Suich <chris.suich@netapp.com>
Date:   Thu Oct 17 14:27:12 2013 -0400

    Added context to strategy sorting error responses
    Added TODOs for DRYing out pickStrategy() overloading

commit a221f4aa3fb2ddc255bc35cf753f98f88f5bf44e
Author: Chris Suich <chris.suich@netapp.com>
Date:   Wed Oct 16 09:57:28 2013 -0400

    Updated inefficient strategy sorting/selection
    Removed unnecessary canRevertSnapshot from PrimaryDataStoreDriver
    Other general cleaup and fixes from reviews

commit 7d58949c6a1b7e853e891b59387a9620e8cd7a91
Author: Chris Suich <chris.suich@netapp.com>
Date:   Mon Oct 14 14:01:22 2013 -0400

    Added volume snapshot revert capability to SnapshotResponse
    Updated UI to hide/show snapshot revert action per snapshot

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-23 12:21:43 -07:00
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor'
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
Laszlo Hornyak 847274f31f Some StringBuffers replaced by StringBuilders
StringBuffers replaced by StringBuilders to avoid unnecesary synchronization overhead.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-22 23:35:08 +02:00
Alena Prokharchyk 3ec14c4baf CLOUDSTACK-4649: addResourceDetail - added support for userVm resource. Now "hypervisortoolsversion" get stored in user_vm_details table, and being returned as a part of listVirtualMachines call ("details" parameter)
Conflicts:
	api/src/org/apache/cloudstack/api/response/UserVmResponse.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
	server/src/com/cloud/api/query/vo/UserVmJoinVO.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 13:50:43 -07:00