Commit Graph

8070 Commits

Author SHA1 Message Date
Jayapal 961834661c CLOUDSTACK-5466:Fixed freeing ip address in removeIpFromNic 2013-12-18 14:49:47 +05:30
Kishan Kavala d810ab46fe Revert "reverted 3a3fec3cb6 because it fails a unit test"
This reverts commit f4ee1a8115.
2013-12-18 14:43:25 +05:30
Jayapal 96309a7867 Fixed issue in getting interface number in IpAssocVpcCommand
Regression from the below commit

commit 494ccd821d
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 3a3fec3cb6 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
Min Chen 8f21eca922 Separate Template/ISO related APIs to use two different views. 2013-12-10 12:23:39 -08:00
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
Min Chen d252d95c26 Separate all vm related user APIs to have two different views. 2013-12-09 17:30: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
Min Chen 6730fa2b47 Fill in implementation of AclService.getGrantedDomains,
getGrantedAccounts and getGrantedResources.
2013-12-09 14:08:54 -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
Alex Ough 100dc368c2 CLOUDSTACK-3190 2013-12-09 12:16:21 +05:30
Kelven Yang aa72b76aec CLOUDSTACK-669: put system vm work under new vmsync model 2013-12-06 16:53:11 -08:00
Alena Prokharchyk 96eeceba8b CLOUDSTACK-5390: obey page/pageSize parameters in listNetworks call 2013-12-06 16:48:04 -08:00
Fang Wang 15338e42a8 cloudstack-4308 Add API listCapabilities for KVMSnapshotEnabled so that UI can use it for recurring snapshot.
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
	api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
	server/src/com/cloud/server/ManagementServerImpl.java

Conflicts:
	api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
2013-12-06 16:05:57 -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 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
Prachi Damle 60cca0f65e CLOUDSTACK-5140: A stopped vm cant start after disable threshold has been reached on the storage pool
Changes:
- Do not do the stoarge capacity check for a VM having READY Volumes that are already present on the storagepool.

Conflicts:

	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
2013-12-06 11:18:23 -08:00
Anthony Xu 70c9781e9c XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster
fixed typo
2013-12-06 01:20:30 -08:00
Nitin Mehta ed1f3d9ed6 CLOUDSTACK-5391:
check for host cpu capability while stop starting a vm on the same host. Also changed the FirstFitAllocator to use the same method.
2013-12-05 15:37:01 -08:00
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
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
Alena Prokharchyk f1973340d3 CLOUDSTACK-5152: when deployVm with SG, verify that vm and sg belong to the same account. Do this verification even when the call is done by the ROOT admin
Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java
2013-12-04 11:55:27 -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
Likitha Shetty f37057a215 CLOUDSTACK-5172. Detaching VM volume is not allowed if there are VM snapshots because any changes to the disk layout will break the semantics of VM-based snapshot 2013-12-04 20:19:17 +05:30
Bharat Kumar e5cfe94818 CLOUDSTACK-5160 add a map to specify the custom compute parameters in the deployvm api.
Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-04 11:28:45 +05:30
Devdeep Singh 5a96307fbf Changes for allowing migration of a vm on hyperv. Migration was blocked in cloudstack for hyperv.
Enabled it. Also updated the agent code to allow hyperv migration.
2013-12-04 10:29:36 +05:30
Nitin Mehta 03c78247cc CLOUDSTACK-3364:
change updateIsoPermissions API to accept isextractable paramter from normal user
2013-12-03 14:55:39 -08:00
Murali Reddy d97345f0a2 fixing copy paste error in getting alert type in alert manager 2013-12-03 16:16:10 +05:30
lafferty d2bf5c9d5e bug CLOUDSTACK-5339 2013-12-03 15:56:00 +05:30
Nitin Mehta d5e497859f CLOUDSTACK-4881:
changeServiceForVirtualMachine API should be used to scale up a stopped vm only
2013-12-02 17:27:13 -08:00
Jayapal cd6e6a4d3c CLOUDSTACK-1762 Fixed assigning network or broadcast ip to nic 2013-12-02 11:05:41 +05:30
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 abd4a826e9 Revert "CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer"
This reverts commit 5cc47f77c5.
2013-11-29 10:52:51 +01:00
Wei Zhou 5cc47f77c5 CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer 2013-11-29 10:39:04 +01:00
Hugo Trippaers 36201b9776 Fix issue with sourceCidr not being passed to the VRouter on start.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-11-29 13:20:12 +05:30
Likitha Shetty 6bda2739c8 CLOUDSTACK-5302. listHosts API response - value of cpuallocated is always 0% 2013-11-28 15:52:42 +05:30
Wei Zhou 221aea5730 CLOUDSTACK-5299: set hypervisor_type of volumes from image format if not set. 2013-11-28 10:47:21 +01:00
Abhinandan Prateek ab39b658ad added valid values for system.vm.default.hypervisor in desc 2013-11-28 09:24:32 +05:30
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
Wei Zhou f17f35eeb8 CLOUDSTACK-5293: fix issue when collect vm disk statistics from iso 2013-11-27 14:38:25 +01:00
wilderrodrigues 226b193488 Fix for Coverity issues CID_1116744, CID_1116718 and CID_1116682, all related to resource leak
Signed-off-by: Daan Hoogland <daan@onecht.net>
2013-11-27 14:20:29 +01:00
wilderrodrigues 2774b62d64 Fixing bugs from Coverity related to Dereferenced Null after check and as return value.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2013-11-27 11:18:00 +01: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
Wei Zhou 9be402cb06 CLOUDSTACK-2940: Allowing Replacement of realhostip.com with a customized domain for SSVM
(cherry picked from commit e23b10319f)

    Conflicts:

        plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
        server/src/com/cloud/storage/upload/UploadMonitorImpl.java
2013-11-26 15:01:23 +01:00
Wei Zhou e0fbc3f147 CLOUDSTACK-5272: return unlimit if max.account.* or max.project.* is set to negative
(cherry picked from commit 888ddd724a)
2013-11-26 14:43:23 +01:00
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
Nitin Mehta a1ca4f1d56 CLOUDSTACK-5221:
In order to keep backward compatibility, listisos should return an empty response than an error when id of a removed iso is passed.
2013-11-25 13:47:42 -08:00
Prachi Damle f231cec5b7 Loading api permissions from commands.properties during startup 2013-11-25 10:59:12 -08:00
Anshul Gangwar 102331c62e CLOUDSTACK-4959: added the connection and socket timeout parameters for SMTP and sending message in new thread so that HA doesn't get blocked beacause of hang in sending email alert 2013-11-25 15:52:33 +05:30
Min Chen 015d06e7fc Separate all volume related APIs to two Cmd classes based on two
response views.
2013-11-22 18:48:20 -08:00
Min Chen 11c0c263f2 QueryChecker interface and ACL search criteria to be used for query api
for entities with db views created.
2013-11-22 16:36:38 -08:00
Min Chen 6227ba6356 CLOUDSTACK-5246:Xenserver - Hourly Snapshots - Creating snapshot from
ROOT volume fails with NullPointer Exception due to new jobs framework
merge.
2013-11-22 10:56:27 -08:00
Prachi Damle 9d0d96225d more of account_type refactoring 2013-11-21 16:03:19 -08:00
Alena Prokharchyk 7df7abf327 Added missing @Inject to the ipAddressManager
Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java
2013-11-21 14:29:39 -08:00
Alena Prokharchyk 602d4ef0cf Resource metadata - support for VPC 2013-11-21 14:29:39 -08:00
Min Chen 81a794a5d3 Change two static response views to Full and Restricted. 2013-11-21 10:32:08 -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
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
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
Murali Reddy 899e9f0d60 CS-16962: [API] [EIP/ELB enabled Zone] Need to display EIP address as
"Public IP Address" for system VMs

In system VM response object return EIP as public IP in case of basic
zone with EIP service.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
2013-11-21 15:20:28 +05:30
Likitha Shetty 6aafb9c50d CLOUDSTACK-5227. Cannot pass Japanese characters as parameter values to an API.
During API check for control characters use pattern matching to avoid identifying all non-printable characters as control characters.
2013-11-21 13:40:06 +05:30
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
Likitha Shetty 90fb76a72c CLOUDSTACK-5069. Added global config 'vmware.vcenter.session.timeout' to make the vCenter session timeout value configurable. 2013-11-20 16:12:22 +05:30
fjkdf 8321ea4d78 add mgt.server.vendor global configuration, in case different vendor wants to identify its identity 2013-11-19 17:55:58 -08:00
Alex Huang 465626f6d1 Fixed issues with execute in sequence 2013-11-19 17:20:58 -08:00
Min Chen 91e176cb0d Fix a bug in listVm logic to use revokedIds and grantedIds. 2013-11-19 16:41:40 -08:00
Syed Ahmed 481af07fb1 Adding protocol parameter to loadbalancer response 2013-11-19 22:12:44 +05:30
Hugo Trippaers 1ece5f0c28 StoragePoolResponse.getId() returns a String with an UUID 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
Harikrishna Patnala c29cd9d3c7 CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot
CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot

CLOUDSTACK-5163: missing parameters in configuration table
2013-11-15 12:19:31 +05:30
Prasanna Santhanam bf22f6dfe9 Revert "CLOUDSTACK-5176:"
ConfigurationParameterScope class is missing. Possibly an unadded new
file in the git commit.

This reverts commit 1762dbbb17.
2013-11-15 10:20:26 +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
Nitin Mehta 1762dbbb17 CLOUDSTACK-5176:
Added the cluster scope to vmware.reserve factors
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-11-14 15:44:13 -08:00
Darren Shepherd 1f7ef652cf Make com.cloud.network.vpn.RemoteAccessVpnService an extensible type 2013-11-14 15:31:33 -08:00
Anthony Xu ac649b43e6 XS host free memory might change, if user manually changes dom0 memory,
this patch makes CS update latest XS host free memory on host connect process.
2013-11-14 12:07:29 -08:00
Anthony Xu 9c739ef93d Revert "Revert "XS host free memory might change, if user manually changes dom0 memory,""
This reverts commit 74153e4a79.
2013-11-14 11:58:55 -08:00
Wei Zhou 59453ea6be remove duplicated scheduled tasks from VpcVirtualNetworkApplianceManagerImpl
(cherry picked from commit e444a03819)
2013-11-14 19:00:24 +01:00
Anthony Xu 74153e4a79 Revert "XS host free memory might change, if user manually changes dom0 memory,"
This reverts commit a1d09ae16f.
2013-11-13 15:38:42 -08:00
Alena Prokharchyk 4a8e9f8b8d Resource Metadata: added implementation for Remote Access VPN 2013-11-13 14:26:16 -08:00
Alena Prokharchyk 96b9ebafc0 listRemoteAccessVpns: implemented search by networkId and id 2013-11-13 14:26:15 -08:00
Anthony Xu a1d09ae16f XS host free memory might change, if user manually changes dom0 memory,
this patch makes CS update latest XS host free memory on host connect process.
2013-11-13 10:59:36 -08:00
Murali Reddy 0068da7198 CLOUDSTACK-5142: Guest IP address for F5 is not being selected from the
defined IP Range in Shared Network

ensure that for shared network, acuqire guest ip should return IP from
the 'startip'-'endip' range of the network.
2013-11-13 18:21:55 +05:30
Kelven Yang 07c4aec64b Newly added VR monitoring service has broken VMware basic network mode. 2013-11-12 23:49:45 -08:00
Kelven Yang fc9adec72e CLOUDSTACK-669: Add host level side-by-side VM state report for graceful sync model migration 2013-11-12 18:32:51 -08:00
Alena Prokharchyk d905c10214 listFirewallRules - added optional networkId parameter allowing to search for firewall rules by guest network id 2013-11-12 17:17:48 -08:00
Laszlo Hornyak f091b6ae1d Add assumtion on OpenJDK for tests that build on JCE
This patch adds an assumption that OpenJDK is used in some of the tests.
OpenJDK detection utility also added. By specifying -Dcloudstack.jce.enabled=true in the test parameters the OpenJDK detection can be overridden.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-12 22:06:12 +01:00
Alena Prokharchyk 9f8f74c4ed Added resource metadata support for PF rules 2013-11-12 10:55:27 -08:00
Bharat Kumar 5e14e1692d CLOUDSTACK-5063 Disk offering tied to a compute offering should not shown in disk offering section 2013-11-12 15:15:35 +05:30
Laszlo Hornyak bd67ccdd6d few cleanups in CertServiceTest and CertService
Tests:
- all tests are @Test rather than having one test to call them, so they can be run one by one
- tests that expect exception from a method fail if there is none
- no longer extends TestCase so that the original method names could be kept as test

Implementation:
- include root cause in exceptions when possible - helps at troubleshuting
- close readers

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-12 08:13:59 +01:00
Alena Prokharchyk 268c27b4f2 ListPortFowardingRules: added networkId to the list of optional parameters to list by 2013-11-11 16:17:43 -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
Daan Hoogland fb8c58a3cf retrieving network might fail if it exists in a different datacentre 2013-11-11 10:32:06 +01: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
Sheng Yang fd2e8c9ac4 Redundant Router: Fix priority records in db 2013-11-08 18:27:31 -08:00
Sheng Yang 333be7de4d Fix redundant router failed to start
ResourceUnavailableException won't be catched by VirtualNetworkApplianceManager
after Alex's refactor, because VirtualMachineManager.start() would cover the
exceptions as well. So changed the calling to advanceStart() instead.
2013-11-08 17:41:47 -08: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
Wei Zhou 57ba367f3c CLOUDSTACK-5042: change cloud.keystore to cloudmanagementserver.keystore and install it (cherry picked from commit de448ec479) 2013-11-08 09:00:29 +01:00
Wei Zhou edf04a33c1 remove network limitation of nics on systemvms (cherry picked from commit 0227e0013a) 2013-11-08 09:00:24 +01:00
Wei Zhou 958312de4c CLOUDSTACK-5042: fix NPE error as BroadcastUri is NULL in shared network after upgrade from 2.2.14 (Cherry-picked from commit 09e7ab9750) 2013-11-08 09:00:15 +01:00
Prachi Damle cb6d8d0190 CLOUDSTACK-5045 [Automation][BVT] Affinity group type is missing "create affinity group page" and failed to create Affinity group
Changes:
- Changes to Unit tests needed after this fix.
2013-11-07 21:40:39 -08:00
Prachi Damle 1047a5398d CLOUDSTACK-5045 - [Automation][BVT] Affinity group type is missing "create affinity group page" and failed to create Affinity group
Changes:
- Refer the injected list of AffinityGroupProcessor
2013-11-07 21:39:17 -08:00
Min Chen dc3d279272 CLOUDSTACK-4833:[Automation][BVT] Template and ISO test cases failing
from BVT suite, during LIST api call.
2013-11-07 15:19:19 -08:00
Edison Su c233492bfc Add quiencevm option on createsnapshotcmd 2013-11-07 14:57:05 -08:00
Kishan Kavala 3f5b8f7063 CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router 2013-11-07 19:49:05 +05:30
Hugo Trippaers 85f38b3e07 Fix CID 1127051 DLS: Dead local store
Fix CID 1127050 WMI: Inefficient Map iterator
2013-11-07 15:01:21 +01:00
Hugo Trippaers 831eeeb422 Fix CID 1127031 Inefficient Map iterator 2013-11-07 14:59:43 +01:00
Hugo Trippaers f00bfea61e Fix CID 1127030, 1127029 Questionable Boxing of primitive value
Fix CID 1127028 Fix Inefficient Map Iterator
Fix bug.
2013-11-07 14:59:03 +01:00
Hugo Trippaers 9631df8d0e Fix CID 1127021 Operands don't affect results
int can never be bigger than maxint.

Auto unboxing of Integer, not need for intValue()
2013-11-07 13:34:48 +01:00
Hugo Trippaers f611c24dd5 Fix CID 1127027 Dereference before null check
template can't be null at this point as it has already been dereferenced
2013-11-07 13:34:48 +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
Alena Prokharchyk 6d7674982a CLOUDSTACK-4979: fix hostName for VmWare vms to follow the same logic 2013-11-06 16:16:25 -08:00
Alena Prokharchyk fac22936f6 CLOUDSTACK-4979: if no hostName is passed to deployVm call, automatically generated hostName follows the pattern <instance.id global config>-<randomly generated uuid>.
Example: VM-a6c6457e-e4d0-486f-a392-9239be9b36f5
2013-11-06 15:46:57 -08:00
Hugo Trippaers a7201a81b2 The VPC offering has the option internaly to specify the compute offering (service offering), expose this via the api.
Added a field to the command for serviceOfferingId and changed the internal interface to accept the service offering as parameter

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

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

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

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

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-11-06 10:08:22 -08:00
Sateesh Chodapuneedi 40a7839323 CLOUDSTACK-5061 - Cloudstack doesn't consider storage overprovisioning factor when using thin Provisioning over VMWare VMFS datastores
Fix is use the storage overprovisioning factor (global configuration parameter "storage.overprovisioning.factor") to calculate total provisioning capacity for storage space allocation over VMFS based storage pools as well.
There are two level of thin provisioning provided in VMware, storage level and file-level (VMDK) thin provisioning. in CloudStack, all volumes are provisioned with thin VMDK format, so at hypervisor level, we ALWAYS do thin provisioning. If storage vendor has the ability to provide storage level thin provisioning in addition to VMDK thin provisioning, it is also allowed since it is transparent to Cloudstack.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-11-06 17:47:40 +05:30
Likitha Shetty f03dcdab19 [CLOUDSTACK-5051] Revert "CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes."
This reverts commit 3a91500173.

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java
2013-11-06 19:07:33 +05:30
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 3a91500173 CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes. 2013-11-05 15:59:03 +05:30
Prachi Damle 3cc823903a CLOUDSTACK-4755: cloudstack 4.x does not allow memory upgrade
Changes:
- Set total capacity of a host if it has changed in the CapacityChecker thread
- Fix bug while setting the reserved/used cpu/mem capacity - only one of them used to get set
2013-11-04 16:45:11 -08:00
Prachi Damle 863a84a15d 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:
	- Changes due to VirtualMachineProfile changes done in master
2013-11-04 16:45:06 -08:00
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 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 29aa4ae8da Get rid of some errors and warnings in the server and usage sources 2013-11-04 20:01:14 +01:00
Donal Lafferty f9f196a46a A plugin for Hyper-V control is available for CloudStack. The plugin implements basic VM control; however, its
architecture allows additional functionality to be easily added.  Incorporating the plugin in CloudStack will allow
the community to participate in improving the features available with Hyper-V. The plugin uses a Director Connect
Agent architecture described here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Progress
Add ability to pass kvp data via the key cloudstack-vm-userdata
Rearrange code to make it clearer what .NET objects are being used.
Test failures are easier to deal with if test key is not deleted.
Acquire management/pod ip for control ip when VR deploys in HyperV
Fixed deletion on VM's on hyperv host when mgmt server gets restarted due to HA
Implementation for attach iso command. Attaches an iso to a given vm.
2013-11-04 18:48:53 +05:30
Alena Prokharchyk 7a26894eb0 Changes to @Parameter - added RoleType[] authorized() field. The field defines who is authorized to put the parameter to the call. If the person is not authorized, the parameter will be ignored.
Also fixed CLOUDSTACK-5024 - added storageId to the list of the request parameters (available to the Root admin only)
2013-11-01 22:48:11 -07:00
Min Chen 6eecb0b3b5 CLOUDSTACK-5017: If SSVM is unavailable DownloadCommands will be routed
to mgmt server.
2013-11-01 18:07:00 -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
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
Rajani Karuturi b436a82392 added group and domain params to importLdapUsers api call
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
2013-10-31 22:06:32 +00:00
Mike Tutkowski 449b5daa70 VMware changes related to managed storage 2013-10-31 08:30:50 -06:00
Wei Zhou 4495d456ed CLOUDSTACK-4830: fix build error 2013-10-31 11:50:01 +01:00
Wei Zhou 382391f270 CLOUDSTACK-4987: only shared network and isolated network with same account can be assigned to a VM
(cherry picked from commit 743eed8771)
2013-10-31 11:37:31 +01:00
Wei Zhou 5109498783 CLOUDSTACK-4830: allow create account and user by domain admin
(cherry picked from commit 0d12e3eb9d)
2013-10-31 11:36:54 +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
Will Stevens  8871cdc03a Add support for multiple networks in the 'per account' source nat type setting in external network devices
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-10-30 10:16:00 -07:00
ynojima a6b6fa65fa CLOUDSTACK-4932: bugfix : listNetworks API doesn't return VLAN ID (VNI)
Signed-off-by: ynojima <mail@ynojima.net>
Signed-off-by: Toshiaki Hatano <haeena@haeena.net>
2013-10-31 00:37:04 +09:00
ynojima 089026f6af CLOUDSTACK-4984: decrement MAX_VXLAN_VNI to be aligned with Linux kernel
Linux vxlan interface doesn't accept VNI:16777215 now.

Signed-off-by: Toshiaki Hatano <haeena@haeena.net>
2013-10-31 00:13:54 +09:00
Marcus Sorensen 4a9f05bda0 CLOUDSTACK-4967
1) vxlan will use bridge scheme 'brvx-<vni>'. Multiple physical networks can host guest
traffic type with vxlan isolation, so long as they don't use the same VNI range.

2) Guest traffic labels can be physical interface if bridge by given name is not found.
Normally we take traffic label name, find the matching bridge, then resolve that to a
physical interface. Then we create guest bridges on that interface. Now we can just
specify the interface.
2013-10-29 15:34:39 -06:00
Alena Prokharchyk e7685f816a CLOUDSTACK-4988: when listTemplates call is executed by regular user, but templateFilter=community is passed in, return public templates of subdomains 2013-10-29 10:58:53 -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
Rajani Karuturi 9300d4a3ba Added an api call to import all the ldap users to the same domains(ou's) in cloudstack
TODO:
    1. error handling of no domains present, nested hierarchy
    2. handling the case when the api call fails for a specific user/users
    3. test cases for LdapUserManager

Signed-off-by: Ian Duffy <ian@ianduffy.ie>
2013-10-29 09:04:33 +00:00
Likitha Shetty cc4b612bf6 CLOUDSTACK-4985. NPE while deleting old root volumes of a restored VM during storage garbage collection.
In case of VMware, once the state of the old root volume has been updated to destroyed force expunge it from primary storage to avoid the garbage collector from trying to delete the new root volume
2013-10-29 11:31:45 +05:30
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
Sheng Yang 271a7dff9e Fix VPC issue due to VpcVirtualNetworkApplianceManagerImpl.java is not registered
It should be registered rather than VirtualNetworkApplianceManageImpl.java,
since it would cover the isolated network case as well.
2013-10-28 17:55:51 -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
Mike Tutkowski 858ce76665 Extend support of CloudStack-managed storage to KVM 2013-10-27 22:30:03 -06:00
Laszlo Hornyak c72f65dc17 Remove test dependency on mysql driver
The dependency is no longer needed.
2013-10-26 17:47:35 +02:00
Min Chen 694ec684a3 Add back initialization of _maxVolumeSizeInGb in VolumeApiServiceImpl. 2013-10-25 21:24:08 -07:00
Edison Su 465c9ec5c3 Merge remote-tracking branch 'origin/master' 2013-10-25 18:24:29 -07: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
Darren Shepherd ad74948480 Move LockMasterListener initialization to system context
This reverts commit d178b25daa and moves
the initialization to the system context, which really where it should have
been from the beginning.
2013-10-25 15:11:47 -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
Laszlo Hornyak 56f1277339 fix master build
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-25 23:54:10 +02:00
Alena Prokharchyk 300f626d42 Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase 2013-10-25 14:21:20 -07:00
Alena Prokharchyk aa9f8e64ae Resource details: added way of generic access of resource DAO based on the resourceType passed in (was hardcoded before) 2013-10-25 11:57:17 -07:00
Alena Prokharchyk 0fb4d9d5a2 Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors. 2013-10-25 10:56:19 -07:00
Darren Shepherd a77435dab5 Add missing extensible type registries
The following types were not setup to discover extensions

com.cloud.network.element.FirewallServiceProvider
com.cloud.network.element.PortForwardingServiceProvider
com.cloud.network.element.StaticNatServiceProvider
com.cloud.network.element.NetworkACLServiceProvider
com.cloud.network.element.LoadBalancingServiceProvider
com.cloud.network.element.Site2SiteVpnServiceProvider
2013-10-24 20:20:55 -07:00
Sheng Yang 1528725949 CLOUDSTACK-754: Enable Remote Access VPN for VPC
With integration smoke test case.
2013-10-24 17:34:41 -07:00
Alena Prokharchyk 24725f8e21 ResourceDetails:
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
2013-10-24 15:54:49 -07:00
Darren Shepherd d178b25daa Move LockMasterListener initialization to earlier in the code
This is not perfect fix but should address 99% of the issues.  The only
time an issue could happen is if something in the bootstrap or system
context tried to lock a row.  Which shouldn't happen at the moment.  If
we find that to be an issue, the LockMasterListener could move to system
context and be inject here.
2013-10-24 15:35:21 -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
Wei Zhou 059e3beb28 CLOUDSTACK-4505: add ExpungeVM command to expunge a destroyed VM on demand 2013-10-24 11:52:00 +02:00
Alena Prokharchyk 2bb716efd8 ResourceMetaData (Resource details) fixes:
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
2013-10-23 17:39:16 -07:00
Alena Prokharchyk e52e7a5634 CLOUDSTACK-4874: rever the previous commits. Service offering details are already being returned in "serviceofferingdetails" field of the service offering response 2013-10-23 17:17:14 -07:00
Anthony Xu b747549597 CLOUDSTACK-4649:
get VM details from DB

Anthony
2013-10-23 16:02:44 -07:00
Darren Shepherd 891b85d516 Add missing licenses 2013-10-23 15:20:08 -07:00
John Kinsella 45e4d4fc3b Summary: Updated sudoers approved commands for cloud user
Detail: Previously the cloud user has full password-less sudo access.
This commit changes that to only allow access to a specific list of
commands. Been tested in production on ACS 4.0 and 4.2 mangement servers.

BUG-ID: CLOUDSTACK-967
Bugfix-for:
Reviewed-by:
Reported-by:
Signed-off-by: John Kinsella <jlk@stratosec.co> 1382560936 -0700
2013-10-23 13:42: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 4b530c874f Safe properties loader
- new utility method introduced in PropertiesUtil to load properties objects from files
- RegionManagerImpl modified to use the utility method
- Tests added for both

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-23 20:50:00 +02: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 80509f9ba2 Update to new Transaction API 2013-10-23 11:03:47 -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
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
Alena Prokharchyk 8685661339 CLOUDSTACK-4743: durning the accountCleanup, never attempt to release the public ips when the guest networks of the account failed to cleanup 2013-10-22 09:48:46 -07:00
dhoogland c0c46268ac CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled 2013-10-22 12:44:23 +02:00
alex@alexhitchins.com 7eb05fa221 Bug 4071 - Fixed Typo In Default Text 2013-10-22 05:27:06 -04:00
Alena Prokharchyk 25d6e6ec66 CLOUDSTACK-4894: DestroyVirtualMachine API - added "expunge" admin-only parameter. When passed as true, the vm gets expunged immediately (false by default to preserve the initial command behavior)
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
2013-10-21 11:11:42 -07:00
Wei Zhou 90521a3e15 allow Domain Admin to list usage records in the domain 2013-10-21 14:30:17 +02:00
Wei Zhou cd72e2afee fix a bug in listServiceOffering with vmId 2013-10-21 14:05:53 +02:00
Hugo Trippaers 7623c4527a Fix wome warning due to conflicting xml libraries 2013-10-21 09:45:31 +01:00
Murali Reddy a3b1a49c30 CLOUDSTACK-3911: [PortableIP] there is no check while adding a zone
public range to see whether the same VLAN exists in portable IP range.

added check to enusre a VLAN id used for a public IP range is not used
for portable ip range

Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-10-18 17:34:03 +05:30
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
Damodar Reddy a92095a4a6 CLOUDSTACK-4811:Fixed zone creation wizard is allowing to accept wrong sub net mask which is cauing wrong cidr value for a given ip range
Signed-off-by: Jayapal <jayapal@apache.org>
2013-10-18 15:51:51 +05:30
Murali Reddy aaa99cd9de CLOUDSTACK-4596: CloudStack is currently allowing same ip range to be
defined in different VLANs across public and portable ranges

added checks to restric same ip range to be configure as both public ip
range and portable ip range
2013-10-18 15:38:41 +05:30
Sheng Yang 85dc65c7f7 CLOUDSTACK-4786: Reset Redundant Router priority after all the routers are stopped
This patch would reset the priority in such condition:
1. All redundant routers are stopped, e.g. due to network GC
2. User start one VM in the network
3. The routers would be brought up with reseted priority(100 & 99).

This would resolve the issue of network GC result in lower limit of redundant router priority reached.
2013-10-17 20:00:48 -07:00
Sheng Yang c3df348264 CLOUDSTACK-4836: Fix VPN user are not programmed after restart network
Also refactor VPN code.
2013-10-17 17:55:52 -07:00
Sheng Yang ab124a17fa Remove Network Parameter for VPN service provider
It's unnecessary since RemoteAccessVpnVO already have network ID binding with it.
2013-10-17 17:55:47 -07:00
Darren Shepherd 9cbb309d6b Refactor missed classes 2013-10-17 16:00:11 -07:00
Alena Prokharchyk aa570783e8 Added resource tag support for Zone 2013-10-17 15:26:28 -07:00
Min Chen 25acfbad78 CLOUDSTACK-4816:provide configurable option to choose single vs
multipart upload to S3 object storage based on object size.
2013-10-17 10:28:59 -07:00
Koushik Das 9fc471dddd CLOUDSTACK-4551: Migrating the data volume from NFS to local storage ,underlying disk offering is not changed.
Even though the volume may get migrated from shared to local storage, it is not possible to update the disk offering.
The fix is to disallow migration from shared to local store.
2013-10-17 15:56:33 +05:30
Koushik Das e58bef22c1 CLOUDSTACK-4682: VMs are getting deployed with shared service offering and local compute offering
VM deployment is fine, issue is in attach volume where all possible scenarios are not handled.
The following needs to be logic of attached volume:
1. if data volume scope is zone then allow attach (this is already there)
2. if data volume scope is cluster
   a. if root volume scope is host, allow if both are in same cluster (already there)
   b. if root volume scope is zone, allow if vm and data volume in same cluster (fixed as part of this commit)
3. if data volume scope is host allow if vm and data volume in same host (fixed as part of this commit)
2013-10-17 15:27:25 +05:30
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
Murali Reddy df3b099449 CLOUDSTACK-4717: associate IP does not work on shared networks with out
source nat service

relax the restriction that the source nat service should be avaiable in
the network inorder to associate a public ip to the network
2013-10-16 18:46:37 +05:30
Alena Prokharchyk 818e6f98fd CLOUDSTACK-4874: added resource tags to the Service offering object. Tags can be created by using createTag API command; you can list service offerings by tags when pass "resourceTag" parameter to the listServiceOfferings call 2013-10-15 17:08:55 -07:00
Min Chen f451a8113e CLOUDSTACK-4859:Add global config to disable storage migration during HA 2013-10-14 22:12:56 -07:00
Min Chen 68952514ce CLOUDSTACK-4862:Admin cannot delete shared network scoped to user
account.
2013-10-14 16:37:38 -07:00
Chris Suich aad1cda7e0 Added categorized sorting to SnapshotStrategy and DataMotionStrategy 2013-10-14 15:20:42 -07:00
Chris Suich e514da2c48 Removed setters from *JoinVO classes 2013-10-14 15:20:17 -07:00
Chris Suich 350c94474b Updates to revertSnapshot API Added revertSnapshot API action to UI 2013-10-14 15:19:51 -07:00
Laszlo Hornyak 5f497b9a75 Removed unused methods from ApiResponseSerializer
getGetMethod and getGetMethodName were not used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-12 19:42:50 +02:00
Min Chen 21dc2bef2a Fix getEntityOwnerId for CreateAclGroupCmd and CreateAclRoleCmd. 2013-10-11 20:56:46 -07:00
Min Chen 00ad19601b Fix a bug in building acl condition, now we get previous default list
behavior for admin,domain admin and user.
2013-10-10 23:02:49 -07: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 90cc0d8f01 VolumeResponse: added storageId to the response (returned to admin only) as this parameter is being passed in migrateVolume/updateVolume API requests, so have to return it in the response as well 2013-10-10 16:51:47 -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 0b1aaf514f More logic to Role based checker 2013-10-10 00:43:56 -07:00
Min Chen 2b4703b6e6 Change ListVMsCmd to use new role and entity permission information. 2013-10-09 21:56:52 -07:00
Alena Prokharchyk a5a6f58eb8 Resource details:
1) Fixed the way we build the response for resource details
2) Fixed the response name - should be generic "resourcedetail". The type is being carried in resourceType response parameter
3) Throw unsupported excpetion if unsupported resourceType is passed in. Before, user vm was returned
2013-10-09 18:22:49 -07:00
Min Chen f59e47b263 Clean up ListVMsCmd implementation to not using Criteria class. 2013-10-08 15:11:56 -07:00
Min Chen 8428f49e46 Change method name. 2013-10-08 15:11:07 -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
Min Chen 4499a7bfa0 Merge branch 'rbac' of https://git-wip-us.apache.org/repos/asf/cloudstack into rbac 2013-10-07 14:32:29 -07:00
Prachi Damle 579806440b Add permission flag to acl_entity_permission 2013-10-07 14:30:15 -07:00
Min Chen 7342c97fa9 Populate acl_group_account_map table in creating an account. 2013-10-07 13:20:49 -07:00
Prachi Damle 2bbe6f5937 APIChecker helper methods implemented 2013-10-07 12:33:24 -07:00
Min Chen ddd4f80911 Revert "Revert "Fix a bug in generating account response, passed wrong parameter to get""
This reverts commit 283ec27934.
2013-10-07 12:00:51 -07:00
Min Chen 440f03e548 Revert "Fix a listAccount regression due to root admin role refactoring."
This reverts commit d79cb380e1.
2013-10-07 12:00:38 -07:00
Min Chen d79cb380e1 Fix a listAccount regression due to root admin role refactoring. 2013-10-07 11:53:38 -07:00
Chris Suich 4c2e40ac37 Added storage_provider_name to storage_pool_view
Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-07 11:51:32 -07:00
Min Chen 283ec27934 Revert "Fix a bug in generating account response, passed wrong parameter to get"
This reverts commit b633950a68.
2013-10-07 11:47:01 -07:00
Darren Shepherd cf4a612cdb Add license header 2013-10-05 12:18:34 -07:00
Min Chen f1895ea39a CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable. 2013-10-04 18:21:25 -07:00
Nitin Mehta a6852a340d CLOUDSTACK-3101:
fix listDiskOffering to not display offerings to the normal users with forDisplay=false. But display them to ROOT Admin irrespective of the flag.
Added display flag in the updateVolume/offeirng commands
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-04 18:19:07 -07:00
Darren Shepherd b3c178480b Check for null just in case
This code was recently switched from using HashMap to ConcurrentHashMap.
ConcurrentHashMap does not accept null keys and will through a NPE.  Adding
a null check just in case somebody passes null.
2013-10-04 17:05:15 -07:00
Nitin Mehta f8976a41ce CLOUDSTACK-3101:
fix listVolumes to not display volumes to the normal users with forDisplay=false. But display volumes to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-04 16:16:28 -07:00
Mike Tutkowski bced4c7e8b Add support for hypervisor snapshots to CloudStack-managed storage (for XenServer and VMware) 2013-10-04 15:41:20 -06:00
Chris Suich 180cfa19e8 Refactor Storage Related Resource Code
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.

High level changes:
-Added uuid to NfsTO, SwiftTO & S3TO to cut down on the requirement of
PrimaryDataStoreTO and ImageStoreTO which don't really serve much of a
purpose
-Initial work towards enable reverting VM volume from snapshots
-Added hypervisor commands for introducing and forgetting new hypervisor
objects (snapshots, templates & volumes)

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-04 13:06:42 -07:00
Laszlo Hornyak c9f41d4046 unit test for KVMFencer
A few cases covered with unit tests.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 11:38:33 -07:00
Laszlo Hornyak bd8536739c remove txn attribute from DB
txn attribute was never actually used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 10:15:39 -07:00
Nitin Mehta cb7ae26f35 =Comment the test for now to unblock everyone. Will file a bug and fix it 2013-10-04 09:43:37 -07:00
Nitin Mehta 73f6843840 CLOUDSTACK-4803:
Return "path" parameter as a result of all Volume calls. But to the admin only
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-03 18:00:42 -07:00
Darren Shepherd c9a9a3b7b3 Make SnapshotStrategy and DataMotionStrategy discovered and registered 2013-10-03 17:03:28 -07:00
Nitin Mehta 2229e3e242 CLOUDSTACK-4803:
fix listVirtualMachines to not display vms to the normal users with forDisplay=false. But displayvms to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-03 15:10:55 -07:00
Min Chen b633950a68 Fix a bug in generating account response, passed wrong parameter to get
account resource limit.
2013-10-02 17:46:00 -07:00
Min Chen d84d62a1e0 Separate Admin and User command and response for ListVMsCmd. 2013-10-02 17:45:14 -07:00
Nitin Mehta 765f56a02c =Comment the test for now to unblock everyone. Will file a bug and fix it 2013-10-02 15:48:36 -07:00
Darren Shepherd 8cf00de51d Configuration to enable Spring Modularization
All of the code changes for the Spring Modularization will work in
a modularized context or a non-modularized context.  This commit
is the final commit to turn modularization on.  Revert this commit
to disable the modularization and go back to monolithic Spring
configuration.
2013-10-02 15:43:11 -07:00
Darren Shepherd 67186429e1 Spring Modularization
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Nitin Mehta 8466fad6ca CLOUDSTACK-4785:
Adding list details for UserVm.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:53:07 -07:00
Nitin Mehta 85b5c6e353 CLOUDSTACK-4785:
Add support for adding user vm details and removing them.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:16:45 -07:00
Darren Shepherd aed5e9dc2a Add Manage Context framework
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
Prachi Damle bb271926fb WIP AccessChecker plugin 2013-10-01 18:11:30 -07:00
Alena Prokharchyk 3e7d0efb90 AddResourceDetail: enabled support for adding details for user vm (user_vm_details db table) 2013-10-01 09:28:35 -07:00
Min Chen 5583506c0c Add entity permission grant and revoke API. 2013-09-30 17:03:34 -07:00
Alena Prokharchyk b253d95de9 UpdateVirtualMachine: code cleanup - got rid of warnings and unused code from the method; extracted part of the code to its separate method. 2013-09-30 15:34:56 -07:00
Min Chen de0904ba63 Modify AccountResponse to return groups that account belongs to. 2013-09-30 14:14:38 -07:00
Darren Shepherd cba8e40e4b Add license headers to fix build 2013-09-30 09:51:45 -07:00
Darren Shepherd efbfae723e Switch to setter injection for extensibility
Various classes are using member injection to inject extensible objects.
Really those object should come from an AdapterList that is injected in.
This patch switches the code to use setter injection that will later allow
spring to inject an AdapterList or something similar to allow
extensibility.
2013-09-30 09:45:07 -07:00
Darren Shepherd 692535f928 Cleanup DefaultUserAuthenticator and removed masking _name variable
DefaultUserAuthenticator maskes the _name varible in ComponentLifecycleBase
making the setName() method not work as expected.  This patch cleans up the
code such that getName() will be getClass().getSimpleName() unless
overridden in the Spring configuration.
2013-09-30 09:33:33 -07:00
Laszlo Hornyak c61997f022 basic test for ApiDispatcher
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-30 13:08:15 +02:00
Alena Prokharchyk 43770e0cb2 CLOUDSTACK-4744: enhanced root admin API updateVolume with state/storageId parameters as a part of "Better control over first party objects" feature.
Also fixed existing bugs for the API:

* corrected action event to be VOLUME.UPDATE (was VOLUME.ATTACH)
* all parameters to update, should be optional - fixed that. If nothing is specified, the db object will remain with its original fields
2013-09-28 21:44:47 -07:00
Alex Huang b60eef3e82 Added comments and finished off the work 2013-09-28 07:53:28 -07:00
Alex Huang e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Alex Huang e2988902c9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:25 -07:00
Alex Huang a964cf549e Continue to merge SearchCriteria2 and GenericSearchBuilder 2013-09-28 07:53:24 -07:00
Alex Huang af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00
Min Chen 0be374a796 Add All Apis for ACL Group. 2013-09-27 18:16:18 -07:00
Min Chen ed22dfef1b Add transaction handling in AclServiceImpl, and parent role support in
createAclRole.
2013-09-27 10:14:13 -07:00
Min Chen 97fd99b09a Add all Apis for AclRole. 2013-09-26 17:48:29 -07:00
Sheng Yang dad47682cb CLOUDSTACK-4745: Add StaticNatRule through firewall manager
This would fix CreateIpForwardingCmd API on 4.2+.
2013-09-26 14:00:32 -07:00
Min Chen fce2aad23d WIP For APIs related to ACL Roles. 2013-09-26 11:22:43 -07:00
ynojima a45ee749ac CLOUDSTACK-2328: Linux native VXLAN support on KVM hypervisor
Initial patch for VXLAN support.
Fully functional, hopefully, for GuestNetwork - AdvancedZone.

Patch Note:
 in cloudstack-server
- Add isolation method VXLAN
- Add VxlanGuestNetworkGuru as plugin for VXLAN isolation
- Modify NetworkServiceImpl to handle extended vNet range for VXLAN isolation
- Add VXLAN isolation option in zoneWizard UI

 in cloudstack-agent (kvm)
- Add modifyvxlan.sh script that handle bridge/vxlan interface manipulation script
-- Usage is exactly same to modifyvlan.sh
- BridgeVifDriver will call modifyvxlan.sh instead of modifyvlan.sh when VXLAN is used for isolation

Database changes:
- No change in database structure.
- VXLAN isolation uses same tables that VLAN uses to store vNet allocation status.

Known Issue and/or TODO:
- Some resource still says 'VLAN' in log even if VXLAN is used
- in UI, "Network - GuestNetworks" dosen't display VNI
-- VLAN ID field displays "N/A"
- Documentation!

Signed-off-by : Toshiaki Hatano <haeena@haeena.net>
2013-09-26 23:37:18 +09:00
Daan Hoogland 6f970c6ff9 static nat capabilities parsing cleanup and testing 2013-09-26 15:18:52 +02:00
Edison Su 81ff4795df fix compile errors 2013-09-25 17:59:54 -07:00
Edison Su a9aad4f388 add sourcetemplateid for template created from volume/snapshot
Conflicts:

	server/src/com/cloud/template/TemplateManagerImpl.java
2013-09-25 16:35:31 -07:00