Mike Tutkowski
6944bf9bba
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 22:02:43 -07:00
Mike Tutkowski
ae35782ccd
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 21:36:34 -07:00
Alex Huang
bc1eec9f70
Fixed a missing package name
2014-01-09 16:48:19 -08:00
Alex Huang
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
Kelven Yang
1e2e1ea051
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-09 14:29:13 -08:00
Kelven Yang
0965adb003
CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic
2014-01-09 14:29:12 -08:00
Kelven Yang
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
Kelven Yang
ad6454d2bf
CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic.
2014-01-09 14:29:12 -08:00
Kelven Yang
737a382c38
Fix a typo caused problem in attach-volume process
2014-01-09 14:29:12 -08:00
Kelven Yang
ac0faeb091
Fix auto-merge caused issues
2014-01-09 14:29:12 -08:00
Kelven Yang
0587382265
CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement
2014-01-09 14:29:12 -08:00
Kelven Yang
a6f126d24e
Fix a style-check problem after cherry-pick
2014-01-09 14:29:12 -08:00
Kelven Yang
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
Kelven Yang
bf9a554522
CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations
2014-01-09 14:29:12 -08:00
Mike Tutkowski
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
Wei Zhou
f012a2655d
CLOUDSTACK-5404: Fix timezone bug in network usage
...
(cherry picked from commit d5277a81e6 )
Conflicts:
engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
2014-01-09 14:07:53 +01:00
Rajani Karuturi
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
Min Chen
3223028fd6
CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be
...
used cross-zone.
2014-01-08 17:43:06 -08:00
Min Chen
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
Wei Zhou
cbe2560a78
CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)
...
(cherry picked from commit 4bb85cd7f9 )
Conflicts:
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2014-01-08 15:38:06 +01:00
Harikrishna Patnala
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
Sanjay Tripathi
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
Koushik Das
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
Alena Prokharchyk
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
Alena Prokharchyk
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
Alena Prokharchyk
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
Bharat Kumar
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
Sanjay Tripathi
3ad0e8fb47
CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table.
2014-01-06 11:36:43 +05:30
Sateesh Chodapuneedi
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
Harikrishna Patnala
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
Min Chen
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
Min Chen
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
Devdeep Singh
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
Devdeep Singh
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
Likitha Shetty
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
Alena Prokharchyk
fbba17e68c
Resource metadata support for cloudStack user
2013-12-23 14:25:07 -08:00
Alena Prokharchyk
79e64aa535
Resource metadata support for Disk Offering
2013-12-23 12:36:13 -08:00
Nitin Mehta
edc1b78d84
Revert "Revert "CLOUDSTACK-5281:""
...
This reverts commit ab37009e90 .
2013-12-20 17:30:05 -08:00
Alex Huang
ab37009e90
Revert "CLOUDSTACK-5281:"
...
This reverts commit 6b62a04eaf .
2013-12-20 17:23:33 -08:00
Alex Huang
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
Nitin Mehta
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
Nitin Mehta
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
Alena Prokharchyk
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
Edison Su
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
Edison Su
62bb5d8848
fix checkstyle
2013-12-19 15:05:58 -08:00
Edison Su
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
Edison Su
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
Edison Su
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
edison su
a3fade86b2
Fix snapshot details dao
2013-12-19 13:35:08 -08:00
Kishan Kavala
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
Harikrishna Patnala
707da55fe3
CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value Fixed both custom.diskoffering.size.max and custom.diskoffering.size.min to ensure input values while deploying the VM and creating volume APIs.
...
Moved both parameters to VolumeOrchestrationService using ConfigDepot
2013-12-19 16:03:27 +05:30
Koushik Das
f2fab9d5b1
CLOUDSTACK-5458: cpu speed is not getting updated in vm_instance table after service offeirngs change
...
Removed cpu, ram and cpu speed fields from the vm_instance table as these are not used
2013-12-19 14:15:39 +05:30
Nitin Mehta
1c0b8db01b
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
Kelven Yang
3c965d0685
CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations
2013-12-18 16:14:07 -08:00
Min Chen
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2 .
2013-12-18 16:01:37 -08:00
Min Chen
bb91b739a8
CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store.
2013-12-18 15:44:00 -08:00
Nitin Mehta
231e7c01f2
CLOUDSTACK-4941:
...
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
Prachi Damle
ce774e184e
Fixing the management server startup
2013-12-18 14:14:55 -08:00
Antonio Fornie
55a6df4501
Resources leaks, refactoring and testing
...
Removing resource leaks from UsageSanityChecker and
refactoring it (encapsulation, removal of copy and paste, constants...)
Modularize static method for closing Statments in TransactionLegacy
and reusing this new method from other classes (Upgrade2214to30)
Create Unit and Integration Tests for UsageSanityChecker
Add DBUnit cases and integration profile for nitegration tests as
a base for future DB tests
2013-12-18 10:55:04 +01:00
Prachi Damle
6d6d11f7a4
CLOUDSTACK-4852: Since upgrade to 4.2 only users at the zone-attached domain level can manipulate VMs
...
Changes:
- Removing the trailing spaces in the file
2013-12-17 14:55:59 -08:00
Prachi Damle
78e4dd8566
CLOUDSTACK-4852: Since upgrade to 4.2 only users at the zone-attached domain level can manipulate VMs
...
Changes:
- The vmprofile owner passed in to the planner should be the VM's account and not the caller
- Do not do the access check for Root Admin
Conflicts:
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
2013-12-17 14:55:56 -08:00
Kelven Yang
719271b1d9
Fix tab and trailing spaces
2013-12-16 15:15:30 -08:00
Kelven Yang
9d3827e6fe
CLOUDSTACK-669: refactor VM work job dispatcher to allow volume/snapshot manager to participate serialized job handling
2013-12-16 15:15:30 -08:00
Min Chen
841dcb0e8e
Handle special scopeId = -1 case for current domain or current account
...
in AclPolicyPermission table.
2013-12-16 10:08:28 -08:00
Murali Reddy
c6c2995231
CLOUDSTACK-4616: When system Vms fail to start when host is down , link
...
local Ip addresses do not get released resulting in all the link local
Ip addresses being consumed eventually.
fix ensure Nics with reservation strategy 'Start' should go through
release phase in the Nic life cycle so that release is performed before
Nic is removed to avoid resource leaks.
2013-12-16 19:05:35 +05:30
Min Chen
46d1e1afb2
CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is
...
brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached".
2013-12-13 22:04:29 -08:00
Rajani Karuturi
b54ac9a635
CLOUDSTACK-5483 : Failed to start management server when db
...
encryption is enabled When db encryption is enabled, the server expects all
secure,hidden fields in encrypted form. moved the insert statements which has
dafault values to java and populated encrypted values if encryption is
enabled.
2013-12-13 17:44:24 +05:30
Jayapal
bd54ed8071
CLOUDSTACK-5417 Updating egress firewall rules CiDR on external network restart
2013-12-13 14:45:44 +05:30
Alena Prokharchyk
9df10718e4
Resource metadata support for S2SVpnConnection
...
Conflicts:
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
setup/db/db/schema-421to430.sql
2013-12-12 16:39:02 -08:00
Prachi Damle
7c6f1c14c2
ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and
2013-12-12 16:31:00 -08:00
Alex Huang
cf0a11e45a
pull merges
2013-12-12 13:00:26 -08:00
Alex Huang
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
Alena Prokharchyk
9a21afb50b
Resource metadata support for customer gateway
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-12-12 10:16:30 -08:00
Alena Prokharchyk
cf84733f8b
Resource metadata support for Site2SiteVpnGateway
...
Conflicts:
setup/db/db/schema-421to430.sql
2013-12-12 10:15:36 -08:00
Antonio Fornie
e08f64e6ae
Fix several Resource Leak issues related to not closed PStmts and ResultSets
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 13:24:22 +01:00
Kelven Yang
26c1ba296c
CLOUDSTACK-669: put user vm work under new vmsync model
2013-12-11 16:29:59 -08:00
Min Chen
df1c34bf2b
CLOUDSTACK-5451:Restart MS after migrating NFS image store to S3,
...
previous Ready template is not ready anymore.
2013-12-11 14:18:06 -08:00
Min Chen
010b007ee4
CLOUDSTACK-5414: With NFS Image Store migrated to S3 an error is thrown
...
in creation of Virtual Router.
2013-12-11 14:17:43 -08:00
Jayapal
5c12250dea
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:19:03 +05:30
tuna
d910b42339
fix bean error
2013-12-10 11:30:55 +07:00
tuna
5e23f00b1a
add Apache Licensed and add check native
2013-12-10 10:37:29 +07:00
tuna
f355359b23
fix issues
2013-12-10 10:37:28 +07:00
tuna
dc151115be
AutoScaling without NetScaler
2013-12-10 10:35:55 +07:00
tuna
4de09ee654
add Apache Licensed
2013-12-10 08:37:37 +07:00
Murali Reddy
be67f5d17a
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.
2013-12-10 06:20:58 +05:30
Nitin Mehta
e79350d256
CLOUDSTACK-3664:
...
scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check
2013-12-09 15:40:17 -08:00
Min Chen
6730fa2b47
Fill in implementation of AclService.getGrantedDomains,
...
getGrantedAccounts and getGrantedResources.
2013-12-09 14:08:54 -08:00
Min Chen
288a81180c
Populate default group, policy, account mapping.
2013-12-09 11:29:39 -08:00
tuna
7efab20300
fix staticNat after rebase
2013-12-09 23:33:15 +07:00
tuna
4d0602175c
refactor ovsProvider to new resource
2013-12-09 23:33:15 +07:00
tuna
d935d3865a
tuna
2013-12-09 23:33:14 +07:00
Kelven Yang
aa72b76aec
CLOUDSTACK-669: put system vm work under new vmsync model
2013-12-06 16:53:11 -08:00
Min Chen
a416f6c3c3
Fix API build error based on new DB schema, now only
...
RoleBasedEntityAccessChecker needs to be fixed.
2013-12-06 15:09:00 -08:00
Prachi Damle
eb7cd06e19
CLOUDSTACK-5401: VM migration during host maintenance fails if pool.storage.capacity.disablethreshold is lowered
...
Changes:
- During Vm migration while finding a new host within the cluster, we need to set the storagepool Id to the deployment plan too.
- This will indicate the planner that the volumes are ready and no need to find new pool
- This in turn will prevent the threshold check done during the pool allocation. This step is not needed since there is no need to allocate pools newly.
- Thus the migration wont fail because th threshold check fails.
2013-12-06 11:18:28 -08:00
Prachi Damle
5475312612
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 11:18:26 -08:00
Alex Ough
88f64b2b93
Changed 'MigrateCommand' to use the global setting value of 'execute.in.sequence.hypervisor.commands'
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-12-06 09:41:50 +05:30
Nitin Mehta
98ee087d31
CLOUDSTACK-4880:
...
check for host cpu capability while dynamic scaling a vm on the same host
2013-12-05 14:31:27 -08:00
Syed Ahmed
ee7380ace2
CLOUDSTACK-5296: Add certificate chain support for netscaler
...
This patch adds support for trust chains in the netscaler.
I initially planned on using the 10.1 API's "bundle" feature but during
my testing I found that was not working. So I am doing the chain linking
myself. Also NS can have only one entity of a certificate ie lets say
two different users try to add the same certificate on the netscaler
only one of them will go through. The other one says resouce already
exists even though they have different files.
This can be a problem in trust chains where the chain can be shared
between multiple accounts/certificates. So, I am using the figerprint as
an identifier of a certificate and making sure that we delete it only
when no one references it.
2013-12-05 15:35:28 +05:30
Anthony Xu
04b48ae04e
XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster
2013-12-05 01:41:14 -08:00
David Grizzanti
22422b9ddd
CLOUDSTACK-5022: NullPointerException when invalid zone is passed into UsageEventUtils
2013-12-05 15:10:18 +05:30
Min Chen
c3f480e9b9
Updated db schema based on latest FS. Still need to fix old code in
...
AclServiceImpl, RoleBasedEntityAccessChecker and QueryManagerImpl to
make all build.
2013-12-04 18:44:30 -08:00
Nitin Mehta
b0a1528c5a
CLOUDSTACK-5349:
...
Volume create usage event and resource count werent getting registered. Check its type rather than it is UserVm since the code is coming from VirtualMachineManager.
2013-12-04 11:01:33 -08:00
Alena Prokharchyk
bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
Bharat Kumar
68406ba29d
CLOUDSTACK-5161 enable scaling of a vm using custom offering
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 17:53:33 +05:30
Wei Zhou
81c07f1791
allow delete snapshot with ERROR state
2013-11-28 10:48:07 +01:00
Alena Prokharchyk
426f564944
Resource metadata support for NetworkACLItem
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
2013-11-27 14:38:12 -08:00
Alena Prokharchyk
7af387c894
Resource metadata support for NetworkACLList
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-11-26 17:12:12 -08:00
Nitin Mehta
414d415dba
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Adding functions to resourcelimitmanager and doing it for the volumes at the moment.
2013-11-26 16:21:45 -08:00
Alena Prokharchyk
5d974a234c
Resource metadata support for VPC Private Gateway
2013-11-26 12:48:15 -08:00
Nitin Mehta
6bea532efa
CLOUDSTACK-5206: Ability to control the external id of first
...
class objects. Putting in the generic methods and trying it
for objects like vm, volume. This is the first cut
2013-11-26 09:52:17 -08:00
Harikrishna Patnala
b2f0a0bce2
CLOUDSTACK-4737: handling usage events for dynamic compute offering
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-26 17:07:30 +05:30
Bharat Kumar
ef40e156ed
CLOUDSTACK-5162 Usage details are not getting populated when using dynamic offerings.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-26 14:32:30 +05:30
Prachi Damle
cf69731a52
Suring startup load the API permissions from commands.properties and @APICommand annotations
2013-11-25 17:01:56 -08:00
Alena Prokharchyk
c37e8b7e8c
Resource metadata - fixed the bug in removeResourceDetail API - when "key" parameter was passed in, used to remove the details matching the key, for all the resources, not just the one defined by resource_id
2013-11-25 15:32:52 -08:00
Prachi Damle
f231cec5b7
Loading api permissions from commands.properties during startup
2013-11-25 10:59:12 -08:00
Alena Prokharchyk
fad0cfcc18
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
Conflicts:
api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
2013-11-22 09:39:54 -08:00
Alena Prokharchyk
e8ec75a2b5
Removed unused agent lb timer
2013-11-21 14:29:40 -08:00
Alena Prokharchyk
602d4ef0cf
Resource metadata - support for VPC
2013-11-21 14:29:39 -08:00
Alex Huang
de6bf7470c
One more merge conflict
2013-11-21 08:16:48 -08:00
Alex Huang
433a631916
Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code.
2013-11-21 07:56:47 -08:00
Hugo Trippaers
3a414a850f
Add the upgrade path to all versions
2013-11-21 16:38:08 +01:00
Alex Huang
170f32f171
Broke up some long strings
2013-11-21 07:25:01 -08:00
Hugo Trippaers
cf715ff491
Bump 4.3.0 to 4.4.0 in master
2013-11-21 16:01:15 +01:00
Wido den Hollander
036fffcd7c
Add upgrade path from 4.3 to 4.4
2013-11-21 15:48:01 +01:00
Alex Huang
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
Alex Huang
eaa250fd3c
Formatted again after all the tab expansions and eol removals
2013-11-21 04:47:01 -08:00
Alex Huang
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
Alex Huang
e4b22d0fca
Replace all tabs, particularly the ones in the comments
2013-11-21 03:39:58 -08:00
Alex Huang
62e9273581
Removed trailing spaces
2013-11-21 03:12:05 -08:00
Kelven Yang
278ef81a83
side-by-side VM sync management at manager level
2013-11-20 17:59:38 -08:00
Min Chen
7ed030115e
Updated DB schema and DAO layer classes according to new FS.
2013-11-20 17:32:09 -08:00
Prachi Damle
e0d2423f06
Refactoring account_type for Domain_Admin and Normal_User types
2013-11-20 16:53:59 -08:00
Wido den Hollander
1edaa36cc6
CLOUDSTACK-1302: Allow a cache mode per disk offering
...
Per disk offering the setting none, writeback or writethrough can be set
This allows for both safety and performance for writes.
2013-11-20 17:11:10 +01:00
Alex Huang
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
Alex Huang
465626f6d1
Fixed issues with execute in sequence
2013-11-19 17:20:58 -08:00
Syed Ahmed
481af07fb1
Adding protocol parameter to loadbalancer response
2013-11-19 22:12:44 +05:30
Hugo Trippaers
bb8f8fb20b
Expose getPrimaryDataStore(String uuid) through the DatastoreManager interface so it can be used clients.
2013-11-18 14:27:06 +01:00
Kishan Kavala
a9413707c9
Fix listRouter by clusterId and upgradeRouterTemplate by clusterId
2013-11-18 13:05:34 +05:30
Edison Su
1292b76c63
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
2013-11-14 15:55:39 -08:00
Alena Prokharchyk
4a8e9f8b8d
Resource Metadata: added implementation for Remote Access VPN
2013-11-13 14:26:16 -08:00
Min Chen
8b7b7a041d
Delay in displaying VM migrate dialog due to get vm snapshot size for a
...
storage pool.
2013-11-11 14:40:16 -08:00
Harikrishna Patnala
53b0bf6733
Template/ISO download fails cause the object to disappear from UI in 4.2
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-11 10:58:43 +05:30
Likitha Shetty
a35425eec6
CLOUDSTACK-5122. System VMs are getting recreated with old template after upgrading to 4.2.
...
In VMware during VM start the existing disk information is used to configure the VMs. So even if a new disk is created using the new template VM continues to use the old disk.
Once the old root disk is marked for destroy force expunge it and sync the new disk into the VM folder before VM start
2013-11-10 23:31:56 +05:30
Dave Brosius
3fd95fe231
set the state field, not unused local
...
Signed-off-by: Dave Brosius <dbrosius@mebigfatguy.com>
2013-11-09 14:00:19 +01:00
Laszlo Hornyak
b33a8371bc
license headers added
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-09 09:06:01 +01:00
Edison Su
4815b024bf
Add quiesce vm for vmware during vm snapshot
2013-11-08 15:47:11 -08:00
Laszlo Hornyak
6f3688d13d
Fill the creationMonitors based on priority
...
If not priotity, append to the end of the list.
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-08 21:51:04 +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
Edison Su
c233492bfc
Add quiencevm option on createsnapshotcmd
2013-11-07 14:57:05 -08:00
Chris Suich
aef633f203
Updated VMSnapshotDetails* to match *Details* pattern (e.g. UserVMDetails*)
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-11-07 14:28:19 -08:00
Alena Prokharchyk
99acb97854
CLOUDSTACK-5089: fixed VPCDao to set the accountId field correctly
2013-11-07 13:38:13 -08:00
Laszlo Hornyak
465dee0159
Removing coded documentation
...
This is the output of the program, the developer documentation may be a better place
-----
When developing against the CloudStack Orchestration Platform, you must following the following rules:
API Rule: Always be prepared to handle RuntimeExceptions.
When writing APIs, you must follow these rules:
API Rule: You may think you're the greatest developer in the world but every change to the API must be reviewed and approved.
API Rule: Every API must have unit tests written against it. And not it's unit tests
API Rule:
-----
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-07 21:18:52 +01:00
Laszlo Hornyak
336eb48f9b
fixed Rules
...
it was no longer working, it must be fixed for those who want to read it.
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-07 21:18:52 +01:00
Hugo Trippaers
f6f4a93145
Fix CID 1116743 Resource leak
2013-11-07 16:23:20 +01: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
Hugo Trippaers
b736cbd27a
Fix CID 1127024 Various resource leaks
2013-11-07 14:57:40 +01:00
Jayapal
416206595e
CLOUDSTACK-4736 Fixed issue in default service selection
2013-11-07 17:11:03 +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
Kelven Yang
191dc80fa4
VM power state for job oritented sync processing
2013-11-05 19:00:37 -08:00
Nitin Mehta
7a042e2330
CLOUDSTACK-5038:
...
used cpu is getting bumped up when the over provisioning factor > 1. This was because we didnt record the overprovisioning factors of the vms which got deployed pre 4.2
Upgrade path will fix that by populating the cpu/mem overprovisioning factors for each of the vms in user_vm_details table using the global overprovisioning factor.
Reviewed by : bharat kumar <bharat.kumar@citrix.com>
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-11-05 16:35:52 -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
Likitha Shetty
2f45940493
CLOUDSTACK-5028. Vmware instance fails to start when the chain_info of any volume that belongs to the VM is longer than 255 characters.
...
If the VM has snapshots then the chain_info of a volume can be longer than 255 characters.
Increasing the column length of chain_info in VolumeVO to match the maximum length of type text(db schema type)
2013-11-05 13:24:37 +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
Min Chen
ce3638bb03
Merge branch 'master' into rbac.
2013-11-04 15:49:29 -08:00
Min Chen
eb9cfffd24
Fix NPE due to race condition during system vm launch.
2013-11-04 14:27:04 -08:00
Min Chen
9a62239a92
CLOUDSTACK-5017: Throw CloudRuntimeException in case of template/volume
...
download when ssvm is not ready so that caller can remove some leftover
entries in template_store_ref and volume_store_ref.
2013-11-04 12:32:05 -08:00
Hugo Trippaers
54a3d8048b
Get rid of a few errors and warnings in the engine storage integration-test sources
2013-11-04 20:01:13 +01:00
Rajesh Battala
989c6e6914
Modified cloud-early-config to configure, when the VR boots up in HyperV Environment
...
Implemented commands that are required for VR to bootup and Vm deployment to work
Modified hyperv agent code, to deploy VR with Boot Args, boot args passed to VR using KVP Exchange Component.
Fix for VR to boot up and get configured with boot args, Fixed issue in VolumeOrchestrator
Implemented SetFirewallRulesCommand in HyperV Resource
Implemented VR network commands to provide the necessary services from VR
Fixed hyperv localstorage path encode url issue. encode is converting space to '+'
2013-11-04 18:48:53 +05:30
Koushik Das
269a4ef11e
CLOUDSTACK-4855: Throttle based on the # of outstanding requests to the directly managed HV host (direct agents)
...
Cloudstack sends requests to directly managed HV hosts (direct agents) using the direct agent thread pool. The size of the pool is determined by global config direct.agent.pool.size defaulted to 500.
Currently there is no restriction on the number of threads a direct agent can use from this shared thread pool to send requests to the host. This is fine as long as the host is responding to requests
in a reasonable amount of time. But if there is a considerable delay in getting response, the thread remain blocked for that much time. As more commands are send to the slow host threads keep getting
blocked. This can eventually lead to a situation where requests to healthy hosts cannot be processed as there are not enough free threads.
The problem being addressed here is to localize the impact of few bad hosts, so that entire management server is not affected.
One such way is to throttle based on the # of outstanding requests on per host basis. The outstanding requests to a host will be a % of direct agent pool size. This is configurable based on
direct.agent.thread.cap. The default value is 0.1 or 10%, a value of 1 would mean the old behavior where there is no upper cap. This will ensure that the impacted host will be bound by a upper cap on the number of threads it can use to process requests and not the entire pool.
2013-11-04 14:52:26 +05:30
Alena Prokharchyk
2ff791b0b8
CLOUDSTACK-5025: volumes.display_volume field should be set to 1 by default. DB used to handle this, but VO was missing the default field assignment. Fixed th
...
e VO and db upgrade to update all existing volumes with 1 value
2013-11-01 22:48:11 -07:00
Darren Shepherd
c1bae7984a
Revert "Commit 1460196496 changed db.properties"
...
This reverts commit a3cec3802c .
2013-11-01 22:25:53 -07:00
Min Chen
24af28290e
CLOUDSTACK-5017: use LocalHostEndPoint in copying from S3 to cache store
...
during ssvm launch.
2013-11-01 18:07:00 -07:00
Min Chen
6eecb0b3b5
CLOUDSTACK-5017: If SSVM is unavailable DownloadCommands will be routed
...
to mgmt server.
2013-11-01 18:07:00 -07:00
Edison Su
918bc74050
fix compile
2013-11-01 16:16:03 -07:00
Edison Su
143fbc37a6
fix build
2013-11-01 16:02:24 -07:00
Edison Su
7c99b88926
Don't use cast to PrimarydataStoreTO on the resource code
2013-11-01 15:13:16 -07:00
Min Chen
2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00
Edison Su
c5bec6b336
add quiescevm in createvmsnapshotcmd
2013-10-31 16:45:05 -07:00
Edison Su
b704d5b8d3
add quiesceVm vm helper function
2013-10-31 16:24:48 -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
Alena Prokharchyk
9c773fbd68
DestroyNetwork: fixed regression bug - the call always returns false after finishing the transaction. Return true instead.
2013-10-31 15:25:57 -07:00
Darren Shepherd
afaf6370dd
Fix change that broke db.properties.override
2013-10-31 09:21:34 -07:00
Hugo Trippaers
a3cec3802c
Commit 1460196496 changed db.properties
...
loading, this also affects the database creator. This make the database
creator use the new loading completely instead of partially.
2013-10-31 15:08:25 +01: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
Darren Shepherd
1460196496
Centralize loading of db.properties to one place
...
There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed
2013-10-30 17:03:13 -07: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
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
2cac1aaa0f
Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud)
2013-10-28 15:03:57 -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
e86b612750
ResourceDetails - added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2013-10-28 12:53:53 -07:00
Alena Prokharchyk
d0090a0c24
Resource details (metadata) - added support for Storage pool details
2013-10-28 12:53:53 -07:00
Edison Su
92f97248a8
fix inject hypervisorHelperImpl
2013-10-28 12:09:14 -07:00
Mike Tutkowski
858ce76665
Extend support of CloudStack-managed storage to KVM
2013-10-27 22:30:03 -06:00
Laszlo Hornyak
7902315287
build fix
...
Failing VMSnapshotStrategyTest was missing db.properties
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-26 17:34:00 +02:00
Edison Su
70b2c0150d
rebase to spring changes
2013-10-25 18:15:36 -07:00
Edison Su
51a8086cf6
Merge branch 'pluggable_vm_snapshot'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/resources/storageContext.xml
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
2013-10-25 16:47:17 -07:00
Edison Su
a6ce66e55a
move a lot of code into vmsnapshot strategy
...
fix compile
fix compile
add vm_snapshot_details table in db
add vmsnapshot test cases
2013-10-25 15:09:04 -07:00
Alena Prokharchyk
300f626d42
Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase
2013-10-25 14:21:20 -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
Bharat Kumar
e4a1ff818f
CLOUDSTACK-4947 VM creation fails if the global config apply.allocation.algorithm.to.pods is set to true."
2013-10-25 15:07:00 +05:30
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
Alena Prokharchyk
765832a5cf
CLOUDSTACK-4649: added support to removeResourceDetail to remove details for UserVm/Templates
...
Conflicts:
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-24 10:34:21 -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
Darren Shepherd
f3e968b983
Update StorageStrategyFactory to not sort, but just iterate and find the first
2013-10-23 16:36:31 -07:00
Darren Shepherd
891b85d516
Add missing licenses
2013-10-23 15:20:08 -07:00
Darren Shepherd
b134692697
Fix compilation errors in engine/storage/integration-test
2013-10-23 14:44:16 -07:00
Darren Shepherd
c9101966e0
Added StorageStrategyFactory to centralize and deduplicate some logic
2013-10-23 12:40:41 -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
Laszlo Hornyak
b4e972da03
Integer instantation removed
...
Two Integer object was created for each comparison, just in order to compare the two values.
This is replaced with Integer.compare()
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-23 20:50:00 +02:00
Darren Shepherd
df728fcf41
Include new DAO added since spring-modularization branch
2013-10-23 11:23:52 -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
Darren Shepherd
edeaf98117
Cleaner and more type safe Transaction API for checked exceptions
2013-10-23 10:02:43 -07:00
Wei Zhou
69b131fa15
CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only
...
(cherry picked from commit a94acc5a43 )
2013-10-23 17:04:02 +02:00
Anthony Xu
6640f4d928
CLOUDSTACK-4649:
...
vm sync tracks the pv driver version for xenserver
Anthony
2013-10-22 17:55:35 -07:00
Anthony Xu
e33ae74067
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
2013-10-22 17:54:51 -07:00
Alena Prokharchyk
d79135f4e6
CLOUDSTACK-4649: allow to update template details with addResourceDetails API
...
Conflicts:
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 14:01:54 -07: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
dhoogland
c0c46268ac
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
2013-10-22 12:44:23 +02:00
Nitin Mehta
17dd9a832b
CLOUDSTACK-3737:
...
Delete the uploaded volume once its copied successfully to the primary storage.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-21 14:54:42 -07:00
Wei Zhou
db890bc71e
fix a bug in findAllChildren of domains
2013-10-21 14:02:53 +02:00
Koushik Das
0c1800f70f
CLOUDSTACK-4681: data disk with local disk offering are geting created on shared storage
...
The cluster and zone wide storage pool allocators returned shared pools even for volumes meant to be on local storage pool.
If the VM uses local disk then cluster and zone storage allocators should not handle it and return null or empty list.
Also fixed the deployment planner to avoid a cluster if
a. avoid set returned by storage pool allocators is empty OR
b. all local or shared pools in a cluster are in avoid state
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
2013-10-18 17:10:17 +05:30
Min Chen
ec3302afd6
CLOUDSTACK-3472: [Object_Store_Refactor] System VMs are not coming up in
...
initial attempt, but they are coming up after multiple attempts.
2013-10-17 15:59:10 -07:00
Darren Shepherd
711ad386d1
Random cleanup
2013-10-16 16:18:49 -07:00
Nitin Mehta
fc6c1ec812
CLOUDSTACK-4882:
...
list Clusters/pods/zones API not accounting for reserved in the used capacity percentage.
Fix listCapacity cmd for reserved as well
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-16 15:02:18 -07:00
Darren Shepherd
f62e28c1ec
New Transaction API
...
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment. The existing Transaction class was renamed
to TransactionLegacy. All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Kishan Kavala
81f1a0b831
CLOUDSTACK-4095 : Remove region_id from Transaction. Read from db.properties whenever required
...
Conflicts:
framework/db/src/com/cloud/utils/db/GenericDaoBase.java
2013-10-16 19:28:42 +05:30
Prasanna Santhanam
76dbb64cf9
License header was missed in StrategyPriority and Test
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-15 10:59:28 +05:30
Min Chen
f451a8113e
CLOUDSTACK-4859:Add global config to disable storage migration during HA
2013-10-14 22:12:56 -07:00
Min Chen
ac02987db2
Add upgrade path from 4.2.1 to 4.3.0.
2013-10-14 21:56:34 -07:00
Chris Suich
aad1cda7e0
Added categorized sorting to SnapshotStrategy and DataMotionStrategy
2013-10-14 15:20:42 -07:00
Chris Suich
350c94474b
Updates to revertSnapshot API Added revertSnapshot API action to UI
2013-10-14 15:19:51 -07:00
Marcus Sorensen
4e0e7410e9
Store agent hostname in attache, print it in logs wherever possible. This
...
was discussed on the mailing list as a useful debugging tool, currently
the log prints the DB id of the agent, which makes admins have to look
it up to know where the Command was run.
2013-10-14 11:46:01 -06:00
Nitin Mehta
fa0c685bcb
CLOUDSTACK-4854:
...
Add support for adding network details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-10 19:18:39 -07:00
Alena Prokharchyk
c4084a7c34
Fixes for resource details code: 1) Fixed the NPE happening when the resource detail couldn't be located by the key passed through API 2) Added ResourceDetails interface, made all resource details VO objects to implement it.
2013-10-10 11:13:47 -07:00
Prachi Damle
5c7db71bbb
Duplicate getter-setter after merge
2013-10-10 00:47:36 -07:00
Prachi Damle
ec4fa61ae3
Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker
2013-10-10 00:46:06 -07:00
Prachi Damle
0b1aaf514f
More logic to Role based checker
2013-10-10 00:43:56 -07:00
Harikrishna Patnala
bb7493775c
CLOUDSTACK-4707: "sourcetemplateid" field is not getting set for derived templates Template created from a volume or snapshot did not have the sourcetemplateid field set in vm_template table.
2013-10-10 12:20:40 +05:30
Min Chen
2b4703b6e6
Change ListVMsCmd to use new role and entity permission information.
2013-10-09 21:56:52 -07:00
Min Chen
9cd1a95327
Fix search criteria to support searching both specific entityType and *.
2013-10-08 14:50:46 -07:00
Min Chen
11fe1f527a
Add role permission for normal user role.
2013-10-08 11:08:54 -07:00
Min Chen
b87b9e5c64
Add Scope to acl_role_permission, remove parent_role_id from acl_role
...
table, and create PermissionScope and AclEntityType enum types.
2013-10-07 16:09:26 -07:00
Nitin Mehta
6e80bb001c
CLOUDSTACK-4824:
...
Add support for adding zone details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-07 15:48:43 -07:00