7984 Commits

Author SHA1 Message Date
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
179cdea8e9 CLOUDSTACK-5596: reload vm state after vm been force stopped
Conflicts:

	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
2013-12-20 11:26:50 -08:00
Daan Hoogland
7b0c85da3c CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null 2013-12-20 13:46:58 +01: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
02ace3442d 0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to- 2013-12-19 13:35:21 -08:00
Harikrishna Patnala
227567cf6c CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value 2013-12-19 22:56:34 +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
Nitin Mehta
13ba5e45a1 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 18:56:12 -08:00
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 231e7c01f2415c1f25d6a2715b7469fe7fcfe771.
2013-12-18 16:01:37 -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
Kishan Kavala
cc27a740dc CLOUDSTACK-5528 : When VR version is not known set requiresUpgrade flag to true
Conflicts:
	server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-18 18:29:08 +05:30
Jayapal
961834661c CLOUDSTACK-5466:Fixed freeing ip address in removeIpFromNic 2013-12-18 14:49:47 +05:30
Kishan Kavala
d810ab46fe Revert "reverted 3a3fec3cb6bb4f9a008370ea02279d286654b01a because it fails a unit test"
This reverts commit f4ee1a8115cd927ce15feb9af60b18d108dcd6e7.
2013-12-18 14:43:25 +05:30
Jayapal
96309a7867 Fixed issue in getting interface number in IpAssocVpcCommand
Regression from the below commit

commit 494ccd821d711a2957531d1c33274ed293e4d925
Author: ynojima <mail@ynojima.net>
Date:   Wed Nov 6 11:02:56 2013 -0700
    Bugfix: VR has double NICs connected to Public network
2013-12-18 12:06:50 +05:30
Min Chen
e53081fe26 CLOUDSTACK-5534: MySQL exception raised when searching for users with
keyword.
2013-12-17 16:58:22 -08:00
Sheng Yang
e54d1dec9d CLOUDSTACK-5533: Disable VR's DNS functionality if user choose to use external dns
Also fix the regression that external dns won't be used if "dns" service in the
network offering is unset.
2013-12-17 16:06:58 -08:00
Alex Huang
f4ee1a8115 reverted 3a3fec3cb6bb4f9a008370ea02279d286654b01a because it fails a unit test 2013-12-17 15:16:48 -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
Min Chen
729a79e85c Refactor db view based list apis to use new IAM acl search criteria. 2013-12-16 14:31:32 -08:00
Marcus Sorensen
95364a4022 CLOUDSTACK-5531
Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM.
2013-12-16 14:32:51 -07: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
Murali Reddy
12adbffbea CLOUDSTACK-5517: NPE observed during "release portable IPs" as part of
account cleanup

ensure proper portable ip address are released  as part of account
cleanup
2013-12-16 19:36:23 +05:30
Kishan Kavala
e2915c6ce5 CLOUDSTACK-5145 : Added permission checks while deleting network ACLs 2013-12-16 18:12:44 +05:30
Kishan Kavala
3a3fec3cb6 CLOUDSTACK-5145 : Added permission checks while deleting network ACLs
Conflicts:
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
2013-12-16 18:02:43 +05:30
Likitha Shetty
7cac5aa9fc CLOUDSTACK-5514. Response of listAccounts API call includes removed users 2013-12-16 15:53:08 +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
Prachi Damle
3f092d14cc Adding the AclEntityType attribute to APICommand annotation 2013-12-13 16:04:25 -08:00
Jayapal
bd54ed8071 CLOUDSTACK-5417 Updating egress firewall rules CiDR on external network restart 2013-12-13 14:45:44 +05:30
Min Chen
d2922b9254 Separate ListAccounts cmd to use two different views. 2013-12-12 17:52:45 -08:00
Min Chen
312ff76f69 Separate listZones cmd to use two different views, also renamed previous
listZonesByCmd to listZonesCmd.
2013-12-12 17:40:30 -08:00
Min Chen
a6d03cd826 Separate IpAddress related cmds to use two different views. 2013-12-12 17:20:34 -08:00
Min Chen
add277a4aa Separate network and VPC related cmd to use two different views. 2013-12-12 16:53:59 -08:00
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
Prachi Damle
d2c74bcf14 Changes to RoleBasedEntityAccessChecker to replace Role by Policy 2013-12-12 16:30:56 -08:00
Prachi Damle
1a985227b5 Changes to SecurityChecker 2013-12-12 16:30:53 -08:00
Nitin Mehta
b084cc469a CLOUDSTACK-5283:
Not able to list snapshots when few snapshots are in "CreatedOnPrimary" state. Dont throw an exception when snapshot doesnt have an entry in the snapshot store ref for the snapshot in Image store because that fails to list all snapshots and also it can a perfect use case when the backup flag is not turned on.
2013-12-12 13:18:56 -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
7833dd592c JUnit test for NetworkACLManagerImpl#applyNetworkACL
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 15:01:51 +01:00
Kishan Kavala
fa38a7a409 Upgrade router template by accountName and domainId instead of accountId
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-12-12 18:28:30 +05:30
Min Chen
67b97539ac Separate ListTemplatePermissions and ListIsoPermissions commands to use
two different views.
2013-12-11 17:41:10 -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
b385cb4f7a Fixed test case failures in network acl 2013-12-11 14:20:11 +05:30
Jayapal
27ee78fe0a CLOUDSTACK-5244 Fixed issue with applying acl items of acl to private gateway 2013-12-11 11:02:15 +05:30