7c7bd0934a
pass InsufficientCapacityException across job boundary since some HA logic relies on it. Reviewed-By: Self
2014-02-28 15:35:59 -08:00
537bf7ced1
add job path to help associate an API job to related internal job. Reviewed-By: Self
2014-02-28 15:35:59 -08:00
fed85813e9
use lock table for locking
2014-02-28 15:35:58 -08:00
e6e12e33de
VirtualMachineManager.checkWorkItems() uses wrong time unit
2014-02-28 15:35:58 -08:00
38a1300141
pass NULL host when performing state transition to follow-up with VM power-off report
2014-02-28 15:35:58 -08:00
fa7d9ad1a8
VirtualMachineManager.migrateAway() need to put under management of new sync model
2014-02-28 15:35:58 -08:00
434f8dab72
Remove the hacking way of blocking VM state transition introduced by individual VM snapshot orchestration flow
2014-02-28 15:35:58 -08:00
58c26ee128
return the correct NicProfile after job completion for VPC AddVmToNetwork command
2014-02-28 15:35:58 -08:00
18b5fb5a3c
do not shutdown alien VMs upon host startup. Send StopCommand for out-of-band stopped VM to restore legacy XS/KVM behave
2014-02-28 15:35:58 -08:00
85adaf83c7
check report-missing event for VM in starting state.
2014-02-28 15:35:57 -08:00
13e956a10c
Add a missing initialization call to setup EntityManager in VmMigrateWork
2014-02-28 15:35:57 -08:00
86a63c49bc
propagate job execution runtime exception to API context
2014-02-28 15:35:57 -08:00
206a9ed53f
disable XS full host sync and delta sync when new sync model is enabled
2014-02-28 15:35:57 -08:00
90ea3249a8
disable cluster-scope report from XS resource
2014-02-28 15:35:57 -08:00
5d73217723
process the missing power report of a VM that exists in CloudStack but not in hypervisor
2014-02-28 15:35:57 -08:00
fda7219646
CLOUDSTACK-5928: disable host delta sync when new VM sync is enabled
2014-02-28 15:35:57 -08:00
441be43b8c
CLOUDSTACK-5358: Bring back concurrency control in sync-queue management
2014-02-28 15:35:57 -08:00
d9a4e038a0
Enhanced updateVirtualMachine API with optional parameter "name" - to allow update hostName for the virtual machine
2014-02-28 14:35:37 -08:00
93d2c8c3ed
CLOUDSTACK-6184: set display=true by default for all resource details
2014-02-27 10:55:47 -08:00
bf479e75ca
Renaming acl to iam in the upgrade code
2014-02-26 17:56:38 -08:00
624139d8ef
CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.
2014-02-26 14:42:34 +05:30
f41604fc6c
Renaming AclEntityType --> IAMEntityType
2014-02-25 16:43:17 -08:00
3a7e4103fc
FindBugs findings: fixing equals() methods in 2 classes; commenting out dead variable in 1 class; adding 5 tests to cover the changes in the equals() methods.
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-25 15:18:16 +01:00
d1efdca506
Findbugs: Fix Upgrade430to440.java:119, ES_COMPARING_STRINGS_WITH_EQ,
...
Priority: High
2014-02-24 17:01:04 +01:00
e2ec094722
Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn
2014-02-21 14:51:22 -08:00
0f489732c8
Display flag support for LB/InternalLB/NetworkACL rules
2014-02-21 14:03:10 -08:00
92064e347a
Display flag support for autoscale vmGroup and vmProfile
2014-02-21 11:52:50 -08:00
27a790bdc1
DisplayFlag update support for PF/Firewall/EgressFirewall rules
2014-02-21 11:06:52 -08:00
ac00ab0087
Cleanup all mysql dependencies and set all to provided.
2014-02-21 14:55:11 +01:00
167babd8c8
CLOUDSTACK-6124: During MS maintenance unfinished work items are not cleaned up resulting in them getting repeated for every subsequent maintenance
...
Updating the op_it_work table entry appropriately in db once the unfinished work item is completed.
2014-02-21 16:29:51 +05:30
2f7bfc0c73
Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only
2014-02-20 17:15:42 -08:00
f1139848e5
Slight optimization, don't run checkstyle on container or non-java projects.
2014-02-18 12:24:11 +01:00
97bad4f9b3
Fix checkstyle and license issues
2014-02-14 18:37:47 +01:00
26b32141a8
Findbugs : Fixes for several findings
...
Made a comment on the use of ConcurrentHashMap for _agent
Conflicts:
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2014-02-14 18:37:45 +01:00
f414018a60
adding fix and unit tests for cloud-engine-api scariest
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:44 +01:00
df77c4310a
CLOUDSTACK-6103: Pass VM iso information along with
...
PrepareForMigrationCommand, so that destination hypervisor can
mount pool. This further exposed an issue for KVM where iso
was not getting cleaned up upon successful migration, fixed as well.
2014-02-14 00:34:48 -07:00
8e4d020cf8
remove nic with dhcp and tests
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
2014-02-13 10:39:02 -08:00
3136401d40
CLOUDSTACK-6083 corrected firewall rule cidr load issue
2014-02-13 14:42:38 +05:30
e0de79b170
Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command
2014-02-10 12:05:59 -08:00
306ffa0218
CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
...
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
2014-02-10 10:29:09 +05:30
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
bac2c1e5b4
CLOUDSTACK-6049: Give priority to cache stores where data object is
...
already there instead of randomly picking one in case there are multiple
cache stores in the scope.
2014-02-06 17:19:24 -08:00
621276715a
CLOUDSTACK-6046:CreateVolume from snapshot is failing with S3 as
...
secondary storage and zone-wide primary storage.
2014-02-06 15:36:26 -08:00
cecb216caa
fixBugs finding
...
fm.equals(format) breaks equals contract
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-06 10:32:06 +01:00
86cada3b3c
CLOUDSTACK-2932:
...
Allow deleting of snapshots that have errored out. Simply mark the removed column as there is no physical clean up required. It can land into error state only from allocated/Creating state
which are states before creation on primary storage works
2014-02-05 17:34:48 -08:00
7c0170e3e9
Hook up IAM update for updateTemplatePermission api.
2014-02-05 16:04:13 -08:00
4305d817ba
External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection
2014-02-05 15:56:40 -08:00
9641e1dbee
External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer
2014-02-05 10:36:21 -08:00
adf6026d21
SnapshotDetailsVO doesn't have a display field even though it is required in the searchbuilder in ResourceDetailsDaoBase
...
java.lang.AssertionError: Searching for a field that's not there: display
at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475)
2014-02-05 17:46:33 +01:00
8a9d9798d9
Fix camelcasing inconsistency causing an assertion error.
...
java.lang.AssertionError: Searching for a field that's not there: serviceName
at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475)
at com.cloud.network.dao.MonitoringServiceVO$$EnhancerByCGLIB$$84195222.getServiceName(<generated>)
at com.cloud.network.dao.MonitoringServiceDaoImpl.<init>(MonitoringServiceDaoImpl.java:41)
2014-02-05 17:46:33 +01:00
6523c06869
NetworkManager Exception Fix Due to call to getDhcpServiceProvider()
2014-02-05 17:14:05 +01:00
a24263fe81
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
2014-02-05 15:44:09 +05:30
7f34282dfa
Removed references to secondarystoragevmmanager from code that doesn't use it.
2014-02-05 01:39:15 +00:00
8065ee445f
External UUID control support for VPC and NetworkACLItemp
2014-02-04 15:47:12 -08:00
7cd0ad336b
External UUID control support for AutoscaleVmProfile and AutoscaleVmGroup
2014-02-04 15:47:12 -08:00
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
9b21da65d1
CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after
...
migarting to S3 datastore.
2014-02-04 11:01:51 -08:00
ca1b340cef
findbugs make use of return of string manipulation
2014-02-04 11:21:01 +01:00
022b9b8f80
Add access for domain wide createAffinityGroup
2014-02-03 18:14:56 -08:00
a6d07c873c
Changes to QuerySelector to list the parent group resources with recursive = true access
2014-02-03 17:49:33 -08:00
939b15169c
changes to support the domain wide resources for Network
2014-02-03 17:34:03 -08:00
b35eb04de3
CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root
...
volume with S3 as secondary storage.
2014-02-03 12:16:19 -08:00
9778481d85
findbugs: handling of long values and wrappers
2014-02-03 20:19:11 +01:00
d56c5dfc13
Fix for a potential NPE
2014-01-31 09:37:11 +01:00
580ebb0010
CLOUDSTACK-5989: Trying to start a vm while 'vm snapshot' is in progress results in inconsistency
...
The fix is to fail the start operation if a vm snapshot is in progress
2014-01-31 10:39:43 +05:30
0e2e6995b7
CLOUDSTACK-5997:
...
Template state changes side affects
2014-01-30 17:59:55 -08:00
02bdb28d76
Resource metadata support for autoscale vm group object
2014-01-30 13:04:56 -08:00
d12422bf68
Add policies to domain group for CreateNetwork usecase for a domain wide shared network
2014-01-29 23:56:25 -08:00
fdb25d6f5b
Resource metadata support for autoscaleVmProfile CS object
2014-01-29 14:57:00 -08:00
72812cdf22
Grant public template permission to domain admin and normal user policy.
2014-01-28 17:41:27 -08:00
16a9171f55
Fix trailing whitespace.
2014-01-28 14:53:18 -08:00
a26c81178b
CLOUDSTACK-5971:Templates created from a snapshots can't be copied to
...
other zones.
2014-01-28 14:49:58 -08:00
ebf57654e7
replaced Long instantiations with Autoboxing
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-01-25 15:01:03 +01:00
c53778c333
CLOUDSTACK-5810 updated null checks and preparestmt and resultset close
...
Closing the prepare statement and result set and assigning null to the object after close.
2014-01-23 18:27:03 +05:30
4925b9f6a1
CLOUDSTACK-2031:support for number of ips per nic limit needs to be added for the multiple ip address per nic
2014-01-23 18:14:12 +05:30
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
b5b4607f79
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-22 11:17:39 -07:00
c0da0a884a
CLOUDSTACK-5921:S3 security key is stored in DB unencrypted
2014-01-21 14:34:32 -08:00
90e945fd74
Fixing an issue with expunge logic
2014-01-20 16:25:39 -07:00
569b558b92
CLOUDSTACK-5810 Added upgrade changes for updating accountid and domainid of nic secondary ip
2014-01-20 16:05:03 +05:30
37332ad9d4
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-18 18:07:10 -07:00
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
a9733b5df2
CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations
2014-01-17 11:55:14 -08:00
58a9a9b0cd
only send stop command when agent reports VM running and CS thinks it is stopped.
2014-01-17 11:50:13 -08:00
8a20d89d14
CLOUDSTACK-5895: CreateVolumeFromSnapshot can fail in a multiple pod environment with tagged storagepool
...
Changes:
- After finding the storagepool suitable to create the volume, we should not look for more pods
2014-01-17 11:22:20 -08:00
c8f6ec043d
CLOUDSTACK-5892: Disabled removal of old system Vm templates during upgrades. Updated hyperV template URL and checksum
2014-01-17 17:13:40 +05:30
c0f60651b9
CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. Changed min required version for VR to 4.3
2014-01-17 12:51:16 +05:30
e9c9887ee0
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:20:54 -07:00
3ef560d925
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:15:18 -07:00
7164fc6e73
CLOUDSTACK-5696: Fix sync issue with out-of-band changes
2014-01-15 13:11:02 -08:00
9aaea28d0d
Fix typo
2014-01-15 15:20:48 +01:00
ba96c8cadf
CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory"
...
Bump up RAM size of system offering for SSVM to 512MB
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-01-15 01:45:12 +05:30
68b8891c62
Removed all reminants of the IdentityService. Created the KeysManager to move the management
...
of keys out of management server
2014-01-14 13:11:35 -08:00
fac9f2da0f
Adding messageBus events for adding and removal of an account.
2014-01-13 22:12:39 -08:00
af657b3d71
CLOUDSTACK-5861: networks that failed to implement can not be destroyed
...
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
43f0f901dd
Remove VO and DAO from cloud-engine-schema.
2014-01-10 15:57:39 -08:00
21a44934b4
Removed a duplicate method
2014-01-10 13:36:04 -07:00
fc082832d3
CLOUDSTACK-5853
...
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.
Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.
First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.
Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).
Need to remove matching pool from the avoid set during each select phase.
2014-01-10 11:55:54 -07:00
9486a9652e
CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters.
...
Conflicts:
engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
2014-01-10 19:58:59 +05:30
7ef78aac40
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 22:37:39 -07:00
6944bf9bba
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 22:02:43 -07:00
ae35782ccd
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 21:36:34 -07:00
bc1eec9f70
Fixed a missing package name
2014-01-09 16:48:19 -08:00
ae8560b195
Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse.
2014-01-09 16:12:25 -08:00
1e2e1ea051
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-09 14:29:13 -08:00
0965adb003
CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic
2014-01-09 14:29:12 -08:00
87381d4236
CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging
2014-01-09 14:29:12 -08:00
ad6454d2bf
CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic.
2014-01-09 14:29:12 -08:00
737a382c38
Fix a typo caused problem in attach-volume process
2014-01-09 14:29:12 -08:00
ac0faeb091
Fix auto-merge caused issues
2014-01-09 14:29:12 -08:00
0587382265
CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement
2014-01-09 14:29:12 -08:00
a6f126d24e
Fix a style-check problem after cherry-pick
2014-01-09 14:29:12 -08:00
8c93bd6080
CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations
2014-01-09 14:29:12 -08:00
bf9a554522
CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations
2014-01-09 14:29:12 -08:00
03118c2969
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 14:44:35 -07:00
f012a2655d
CLOUDSTACK-5404: Fix timezone bug in network usage
...
(cherry picked from commit d5277a81e6
2014-01-09 14:07:53 +01:00
f741d99c80
CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now.
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-01-09 15:50:53 +05:30
3223028fd6
CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be
...
used cross-zone.
2014-01-08 17:43:06 -08:00
858b9b1177
CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one
...
zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed.
2014-01-08 17:15:04 -08:00
cbe2560a78
CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)
...
(cherry picked from commit 4bb85cd7f9
2014-01-08 15:38:06 +01:00
00e67f57e7
CLOUDSTACK-5827: [Automation] Destroy VM failed, while deleting account
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-01-08 18:38:59 +05:30
c3d8e207c8
CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table.
2014-01-07 15:07:02 +05:30
6d75c31958
CLOUDSTACK-5002: unable to destroy vm ;VM destroy failed in Stop i-2-59-VM Command due to You gave an invalid object reference. The object may have recently been deleted.
...
This is happening as concurrent operations are happening on the same VM. Earlier this was not seen as all vm operations were synchronized at agent layer. By making execute.in.sequence
global config to false this restriction is no longer there. In the latest code operations to a single vm are synchronized by maintaining a job queue. In some scenarios the destroy vm operation
was not going through this job queue mechanism and so was resulting in failures due to simultaneous operations.
2014-01-07 14:23:26 +05:30
4dcc5671d1
CLOUDSTACK-5812: pass podId information when request for secondary ip address in Basic zone guest network
2014-01-06 17:22:17 -08:00
b15431e574
CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller
2014-01-06 17:09:14 -08:00
647ea6e2d0
listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm
2014-01-06 17:09:14 -08:00
17023c0d60
CLOUDSTACK-5750 Make default value of execute.in.sequence.hypervisor.commands false.
...
Conflicts:
engine/api/src/com/cloud/vm/VirtualMachineManager.java
2014-01-06 18:43:23 +05:30
3ad0e8fb47
CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table.
2014-01-06 11:36:43 +05:30
6ba9754201
CLOUDSTACK-5447 [Automation] Volume migration failing with NullPointerException in vmware and KVM.
...
Instead of injecting object of VolumeOrchestrationService into VmwareResource, we now populate the command object (MigrateVolumeCommand here) with required information. Thus we dont need volume orchestration service to query that information from resource.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-12-31 06:31:43 +05:30
95fa931ff2
CLOUDSTACK-5515: #cpu ,cpuspeed and ram is set to NULL in usage db(usage_vm_instance table) after vm stop and start Fixed populating usage event details in usage db on vm start/upgrade/dynamic_scale
2013-12-30 12:20:33 +05:30
6f800506fd
CLOUDSTACK-5653:S3 object store as Secondary Storage, the template
...
created from different zone is not available for the other zones.
2013-12-26 14:48:21 -08:00
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
30d55cf0c4
CLOUDSTACK-5456: Download root volume when vm is in stopped state fails on hyper-v. Made
...
changes to make sure the volume entry is created in the db with the right image format.
2013-12-26 19:13:31 +05:30
c75f8bcc06
CLOUDSTACK-5420: The agent manager wasn't transitioning the host to maintenance
...
mode if their are no vms running on the host. Made the change to do so.
2013-12-26 11:15:51 +05:30
e659751a8a
CLOUDSTACK-5508. Vmware - When there are multiple secondary stores, the newly added secondary store is not being selected for backing up snapshots.
...
If the snapshot being backed up is a a delta snapshot, pick the image store where the parent snapshot is stored. Otheriwse pick a random image store.
2013-12-24 17:34:19 +05:30
fbba17e68c
Resource metadata support for cloudStack user
2013-12-23 14:25:07 -08:00
79e64aa535
Resource metadata support for Disk Offering
2013-12-23 12:36:13 -08:00
edc1b78d84
Revert "Revert "CLOUDSTACK-5281:""
...
This reverts commit ab37009e90
2013-12-20 17:30:05 -08:00
ab37009e90
Revert "CLOUDSTACK-5281:"
...
This reverts commit 6b62a04eaf
2013-12-20 17:23:33 -08:00
c2baed665b
Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
2013-12-20 17:21:34 -08:00
6b62a04eaf
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 16:58:43 -08:00
f083f91b0b
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
1832cf6660
CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet.
2013-12-20 13:39:13 -08:00
e52a4d9306
CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed
...
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
2013-12-20 12:36:30 -08:00
62bb5d8848
fix checkstyle
2013-12-19 15:05:58 -08:00
0824c78761
CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage)
...
Conflicts:
engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
Conflicts:
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
2013-12-19 14:17:30 -08:00
8caf52c6bc
add xenserver 6.2.0 hotfix support, to optimize vdi copy
...
add xenserver hot fix
Conflicts:
api/src/com/cloud/vm/VirtualMachineName.java
core/src/com/cloud/host/HostInfo.java
core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
deps/XenServerJava/src/com/xensource/xenapi/VDI.java
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
c40d03b417
CS-18582: if EIP is used, extract volume and template returns wrong public ip address. If remote agent is ssvm agent, then looking up public ip address from ssvm table
...
Conflicts:
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java
engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
2013-12-19 14:01:20 -08:00
a3fade86b2
Fix snapshot details dao
2013-12-19 13:35:08 -08:00
29b90e7a5c
CLOUDSTACK-5208: upgrade from 3.0.6 to 4.3 is not throwing any exception if new System VM template is not registered with proper name Commit ae231444bc Commented the exception.
2013-12-19 16:17:37 +05:30
Kelven Yang
Alena Prokharchyk
Prachi Damle
Sanjay Tripathi
wrodrigues
Hugo Trippaers
Koushik Das
Marcus Sorensen
Daan Hoogland
Jayapal
Devdeep Singh
Min Chen
Ian Southam
Nitin Mehta
Soheil Eizadi
Alex Huang
Laszlo Hornyak
Damodar Reddy
Mike Tutkowski
Jayapal
Anthony Xu
Kishan Kavala
Sateesh Chodapuneedi
Murali Reddy
Wei Zhou
Rajani Karuturi
Harikrishna Patnala
Bharat Kumar
Likitha Shetty
Edison Su