7922 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Harikrishna Patnala
5036097659 CLOUDSTACK-5419: missing parameters in configuration table and to remove unused parameters
Signed-off-by: Koushik Das <koushik@apache.org>
2013-12-10 16:49:44 +05:30
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
0b0e2627d6 fix duration 2013-12-10 10:36:30 +07:00
tuna
fca6d56681 remove private changes 2013-12-10 10:36:30 +07:00
tuna
dc151115be AutoScaling without NetScaler 2013-12-10 10:35:55 +07:00
Will Stevens
c60a256ebd fixed egress rules for palo alto plugin and cleaned up extra api calls on master
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-12-09 18:26:57 -08: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
Prachi Damle
4a9da03760 CLOUDSTACK-5426 Cannot deploy instance having multiple volumes that use different storage tags for storage pools in same cluster
Fixing the Imports missing
2013-12-09 15:37:15 -08:00
Prachi Damle
5618a44ed0 CLOUDSTACK-5426: Cannot deploy instance having multiple volumes that use different storage tags for storage pools in same cluster
Changes:
- We need to reset the avoid set to its original state while calling the storage pool allocators for each volume.
- This will prevent affecting allocation of the disks due to the avoid set output of the prior disk allocations.

Conflicts:

	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
2013-12-09 15:37:13 -08:00
tuna
61e80f030a remove unused code 2013-12-09 23:33:15 +07:00
tuna
015ab6af8a fix rebase master 2013-12-09 23:33:14 +07:00
tuna
9f82757eb9 tuna 2013-12-09 23:33:14 +07:00
tuna
3df8b912fc add kvm support & LB service 2013-12-09 23:33:14 +07:00
tuna
d935d3865a tuna 2013-12-09 23:33:14 +07:00
Kishan Kavala
587f587621 CLOUDSTACK-5145 : Added permission checks while listing network ACLs and acl Items. Users will be able to list items that they have access to.
Conflicts:
	api/src/com/cloud/network/vpc/NetworkACLService.java
	api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-09 21:57:47 +05:30
yichi.lu
f194adb2de Remove the comparison between GuestOSCategoryVO.CATEGORY_NONE and guestOSCategory.getName() to make OS category of None to be a valid option.
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-09 15:48:34 +01:00