etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,135 Commits 323 Branches 325 Tags 845 MiB
Commit Graph

8160 Commits

Author SHA1 Message Date
Kelven Yang fed85813e9 use lock table for locking 2014-02-28 15:35:58 -08:00
Kelven Yang fa7d9ad1a8 VirtualMachineManager.migrateAway() need to put under management of new sync model 2014-02-28 15:35:58 -08:00
Kelven Yang fda7219646 CLOUDSTACK-5928: disable host delta sync when new VM sync is enabled 2014-02-28 15:35:57 -08:00
Alena Prokharchyk d9a4e038a0 Enhanced updateVirtualMachine API with optional parameter "name" - to allow update hostName for the virtual machine 2014-02-28 14:35:37 -08:00
Jayapal 100a911229 CLOUDSTACK-6187: Fixed MigrateSystemVMCmd response for router 2014-02-28 16:46:57 +05:30
Nitin Mehta 5360ab3d43 CLOUDSTACK-6186: 
Unable to register private template across all Zones - crosszones flag no longer works.
This was because the code skipped the loop after the first download initiation. Introduced a set so that if it is already downloaded to the same zone then skip it for private template.
 2014-02-27 18:29:58 -08:00
Alena Prokharchyk bb6fddf434 listVirtualMachines API: ability to search by service offering the vm is created from 
listVolumes API: ability to search by disk offering the volume is created from
 2014-02-26 16:56:33 -08:00
Daan Hoogland e431538b0a findbugs possible nullpointer mitigated 2014-02-26 11:56:49 +01:00
Prachi Damle 187f9cd0a2 iam/plugin: Rename Acl to IAM everywhere 2014-02-25 16:43:23 -08:00
Prachi Damle f41604fc6c Renaming AclEntityType --> IAMEntityType 2014-02-25 16:43:17 -08:00
Mandar Barve b0c6d47347 - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-25 22:59:10 +01:00
Laszlo Hornyak 0e3fde5107 replace String != operation with .equals 
replaced the != operation performed on two String objects with ObjectUtils.equals

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-02-25 21:54:32 +01:00
Alena Prokharchyk e2ec094722 Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn 2014-02-21 14:51:22 -08:00
Alena Prokharchyk 0f489732c8 Display flag support for LB/InternalLB/NetworkACL rules 2014-02-21 14:03:10 -08:00
Alena Prokharchyk 92064e347a Display flag support for autoscale vmGroup and vmProfile 2014-02-21 11:52:50 -08:00
Alena Prokharchyk 27a790bdc1 DisplayFlag update support for PF/Firewall/EgressFirewall rules 2014-02-21 11:06:52 -08:00
Marcus Sorensen df1e3998ff CLOUDSTACK-6079: 
fixed issue: if public traffic is on a physical network isolated by VLAN,
and guest traffic is on an another physical network isolated by VXLAN,
public traffic's broadcast type is updated to VXLAN by mistake.

submitted-by: mail@ynojima.net
 2014-02-20 23:28:19 -07:00
Marcus Sorensen f1f79586da CLOUDSTACK-6072: Release VNIs when guest networks are destroyed 
submitted-by: mail@ynojima.net
 2014-02-20 23:21:07 -07:00
Alena Prokharchyk 21d016b3dd API response: added new field to @Param - RoleType[] authorized() default {}. The field defines who is authorized to see this partciluar reponse field. If not specified, the parameter is returned to everybody 2014-02-20 17:15:43 -08:00
Alena Prokharchyk 2f7bfc0c73 Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only 2014-02-20 17:15:42 -08:00
Nitin Mehta c171e2c3e4 CLOUDSTACK-4744: Enhance root admin API updateVolume with chaininfo parameter as a part of "Better control over first party objects" feature. 2014-02-19 18:01:18 -08:00
Prachi Damle 42a7d41c55 Adding annotations to router commands 2014-02-19 12:22:35 -08:00
Prachi Damle f0a9b3b510 @ACL from some commands 2014-02-19 12:22:30 -08:00
Min Chen 13e25d2aae Fixed a bug in constructing search parameters with accountName passed. 2014-02-19 11:35:00 -08:00
Sheng Yang 6bde675f87 Remove SetupGuestNetworkAnswer 
It's unnecessary and not different from Answer itself.
 2014-02-14 18:10:05 -08:00
Min Chen 586ee74000 Clean up SecurityChecker.AccessType and modify code to use them 
consistently.
 2014-02-14 11:23:05 -08:00
Daan Hoogland 15fa2ef8df findbugs: check for system template id == -> equals() 2014-02-14 18:37:47 +01:00
Daan Hoogland 0d7a96526c error message containing array content instead of array 2014-02-14 18:37:47 +01:00
Alex Hitchins 39cfc4968c AJH Findbugs [8] - Added .toString() to enum. 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-02-14 18:37:45 +01:00
Alex Hitchins b8c228e151 AJH Findbugs [9] - Added object to map rather than string 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-02-14 18:37:45 +01:00
Min Chen 8072e50845 Fixed a bug for listTemplates with TemplateFilter=shared. 2014-02-13 16:47:41 -08:00
Marcus Sorensen df77c4310a CLOUDSTACK-6103: Pass VM iso information along with 
PrepareForMigrationCommand, so that destination hypervisor can
mount pool. This further exposed an issue for KVM where iso
was not getting cleaned up upon successful migration, fixed as well.
 2014-02-14 00:34:48 -07:00
Daan Hoogland ea5f318c9d pass isSourceNat to second ip on the same network 2014-02-11 14:12:00 +01:00
Jayapal 11c5574b05 CLOUDSTACK-5966 enable/disable global setting for service monitor in VR 2014-02-11 15:35:02 +05:30
Alena Prokharchyk e0de79b170 Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command 2014-02-10 12:05:59 -08:00
Devdeep Singh 306ffa0218 CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't 
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
 2014-02-10 10:29:09 +05:30
Min Chen 7bab0bc304 Optimize fix for CLOUDSTACK-5987. 2014-02-07 16:08:12 -08:00
Min Chen 3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Hugo Trippaers b6db18fae4 Slightly improve the error message to make it clean what the problem actually is 2014-02-07 14:10:02 +01:00
Alena Prokharchyk 782c530685 Revert "CLOUDSTACK-6003 fixing plus refactoring dispatcher" as it breaks API dispatching for commands having Map<String,String> as a parameter type 
This reverts commit 447430c3df.

Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-02-06 14:46:58 -08:00
Hugo Trippaers cbbe3e0cd7 Fix several AssertionErrors caused by improper transaction handling. Rewrite to new way of doing transactions. 2014-02-06 16:51:20 +01:00
Min Chen c440d90466 Merge fix for CLOUDSTACK-5987 in master to RBAC. 2014-02-05 16:34:01 -08:00
Min Chen 7c0170e3e9 Hook up IAM update for updateTemplatePermission api. 2014-02-05 16:04:13 -08:00
Alena Prokharchyk 4305d817ba External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection 2014-02-05 15:56:40 -08:00
Alena Prokharchyk a873a0efdd Fixed the build broken by changes made to MonitoringServiceVO 2014-02-05 10:37:03 -08:00
Alena Prokharchyk 9641e1dbee External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer 2014-02-05 10:36:21 -08:00
Hugo Trippaers 3cfa5fbfe1 Fix camelcasing inconsistency causing an assertion error. 2014-02-05 19:32:32 +01:00
Alex Huang 54f32a8e46 Moved the controlling logic for secondary storage vm into place 2014-02-05 01:39:17 +00:00
Alex Huang 03a424e45a Removed some useless imports 2014-02-05 01:39:16 +00:00
Alex Huang 7f34282dfa Removed references to secondarystoragevmmanager from code that doesn't use it. 2014-02-05 01:39:15 +00:00
Alena Prokharchyk aaa20947a9 ExternalUUID control support for Firewall and Egress Firewall rules 2014-02-04 17:06:04 -08:00
Alena Prokharchyk 7cb4b571c8 ExternalUUID control: enforce checking uuid validity by defining checkUUID method in the corresponding absract class, and performing the check during API command dispatching 2014-02-04 15:47:13 -08:00
Alena Prokharchyk e5335cd6e4 CLOUDSTACK-2789: UpdateVPC shouldn't require name parameter 2014-02-04 15:47:13 -08:00
Alena Prokharchyk 8065ee445f External UUID control support for VPC and NetworkACLItemp 2014-02-04 15:47:12 -08:00
Alena Prokharchyk 7cd0ad336b External UUID control support for AutoscaleVmProfile and AutoscaleVmGroup 2014-02-04 15:47:12 -08:00
Alena Prokharchyk 6af6ce7e9e 1) Added External UUID control support for network. 
2) Moved UUIDManager interface to cloud-util package
 2014-02-04 15:47:12 -08:00
Prachi Damle f84375442e Merge branch 'master' into rbac 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
 2014-02-04 12:07:32 -08:00
Antonio Fornie 447430c3df CLOUDSTACK-6003 fixing plus refactoring dispatcher 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit a9bcc1ea3b7dfd3fcc5c795b0095c77851ebe618)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-04 13:37:08 +01:00
Prachi Damle 939b15169c changes to support the domain wide resources for Network 2014-02-03 17:34:03 -08:00
Alena Prokharchyk fc56f0cf42 Revert "Findbugs: different issues solved(cherry picked from commit" as it breaks UserVm API Response 
This reverts commit fae0556021.

Conflicts:
	server/src/com/cloud/dc/DedicatedResourceVO.java
 2014-02-03 17:20:28 -08:00
Anthony Xu 657d9e4789 Allow different VLANs have ovveride subnet for shared network 2014-02-03 15:03:31 -08:00
Likitha Shetty f4a96d4c85 CLOUDSTACK-6011 . When detach is called on a deleted volume, avoid the NPE and throw an appropriate exception instead 2014-02-03 18:17:25 +05:30
Likitha Shetty 9cb37ec349 CLOUDSTACK-6007. Restore VM command fails with NPE. 
If a VM instance is deployed with startVm=false, then calling restoreVm on the instance fails with NPE
because CS tries to expunge a volume that has not been created in primary store.
 2014-02-03 12:32:14 +05:30
David Grizzanti ce4b718f4a CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating usage events are enabled 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit fc796632ed984f37fdf32e6aedf26d179a70b22f)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-01 21:08:24 +01:00
Prachi Damle 7d0472bdaa CLOUDSTACK-5995 ; change service offering is not honouring host tags 
- Check host tag when the lastHostId is set.
 2014-01-31 12:02:44 -08:00
Alena Prokharchyk 48361d8a8b Fixed listAutoScaleVmGroups: used to return incorrect value in lbruleid field (wrong parameter was used when search in firewall_rules table - profileId instead of lbRuleId) 2014-01-31 09:21:55 -08:00
Sanjay Tripathi e8438f1b6d CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75 
and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to
different accounts"  message while deleting multiple events .
 2014-01-31 17:10:04 +05:30
sbalineni ed3e1b95b0 VPC Support for contrail networking 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2014-01-30 18:13:48 -08:00
Nitin Mehta 0e2e6995b7 CLOUDSTACK-5997: 
Template state changes side affects
 2014-01-30 17:59:55 -08:00
Alena Prokharchyk 02bdb28d76 Resource metadata support for autoscale vm group object 2014-01-30 13:04:56 -08:00
Alena Prokharchyk cb073e0634 listAutoscaleVmProfiles: added zoneId to the list of optional api parameters 2014-01-30 12:36:56 -08:00
David Grizzanti 5de9ae0bce CLOUDSTACK-5496 : Account included in ActionEvents is Project Account ID 
When Action Events are generated and placed on the Event Bus, an
"account" parameter is included with the event. When these events are
generated for resources within projects, this "account" parameter is not
useful as it's the UUID of the project account, instead of the project.

To solve this, I updated ActionEventsUtil class to include a "project"
parameter in the generated events when the resource is being
changed/add/deleted in a project.
 2014-01-30 17:35:01 +05:30
Saksham Srivastava 85d0f8f93a CLOUDSTACK-5916: associateIpAddress leaves an IP in allocating state 2014-01-30 17:11:02 +05:30
Sanjay Tripathi 20fd2769a9 CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as ""Failed to migrate the system vm"". 2014-01-30 16:29:18 +05:30
Alena Prokharchyk b38c033d5c LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller 2014-01-29 17:12:46 -08:00
Alena Prokharchyk 37fa8012f8 Resource metadata for autoscaleVmProfile - forgot to add dao mapping to the ResourceMetaDataManagerImpl 2014-01-29 14:57:01 -08:00
Alena Prokharchyk 65c5de1cb6 Removed recently introduced api.servlet.endpoint global config as CS already has config serving the same purpose - 'endpointe.url' 2014-01-29 14:57:01 -08:00
Alena Prokharchyk fdb25d6f5b Resource metadata support for autoscaleVmProfile CS object 2014-01-29 14:57:00 -08:00
Daan Hoogland 920163f24f findbugs: possible nulpointer derefs 2014-01-29 13:09:17 +01:00
Daan Hoogland ee1e8a6c2a findbugs: use system account id instead of null (security considerations 
to be made here)
 2014-01-29 12:36:34 +01:00
Daan Hoogland fef2daf5d4 findbugs: compare strings with equals() 2014-01-29 12:06:34 +01:00
Min Chen 0063b60701 Remove ACL permission for a particular entity when it is deleted. The 
hook is currently only done for deleteTemplateCmd.
 2014-01-28 18:17:01 -08:00
Min Chen 72812cdf22 Grant public template permission to domain admin and normal user policy. 2014-01-28 17:41:27 -08:00
Daan Hoogland bd2acd1eff findbugs: comparison of wrapper objects 2014-01-28 23:20:45 +01:00
Prachi Damle 91317dc497 Changes for createDomain - create new group AND createAccount - add account to domain group 2014-01-28 09:48:19 -08:00
Marcus Sorensen 29e22384b7 fix checkstyle in DedicatedResourceVO.java, trailing space 2014-01-28 10:38:30 -07:00
Daan Hoogland 53777c9523 findbugs: removed obfuscating fields(cherry picked from commit 
9495c68c13)
 2014-01-28 17:42:17 +01:00
Daan Hoogland be21822cba findbugs: throw exceptions when found(cherry picked from commit 
9772693dca)
 2014-01-28 17:39:02 +01:00
Daan Hoogland 5d8e8fd3a2 findbugs: nullpointer guards and wrappertype comparisons(cherry picked 
from commit 791b7f8f7f)
 2014-01-28 16:46:05 +01:00
Daan Hoogland 9edeb24f3f findbugs: assign result of string manipulations(cherry picked from 
commit 20127e09dc)
 2014-01-28 16:36:27 +01:00
Daan Hoogland fae0556021 Findbugs: different issues solved(cherry picked from commit 
0b13f8e59d)
 2014-01-28 16:30:04 +01:00
Daan Hoogland 0daca84eff findbugs: removed fields injected in parent(cherry picked from commit 866a539b06) 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2014-01-28 15:59:04 +01:00
Daan Hoogland a16759a9b1 findbugs: byte[].toString -> Arrays.toString(byte[])(cherry picked from commit 23a3d99fc0) 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2014-01-28 15:51:08 +01:00
Daan Hoogland 44bc2beb14 findbugs: null-checks(cherry picked from commit 
c58e509924)
 2014-01-28 15:44:04 +01:00
Daan Hoogland fe262caa75 findbugs: retrieve the objects to remove from the collection(s) 2014-01-28 15:36:40 +01:00
Daan Hoogland 53feecaa76 findbugs: null check for gateway and netmask instead of gateway 
twice(cherry picked from commit
d30ddf6d59)
 2014-01-28 14:53:11 +01:00
Daan Hoogland a71871d11c findbugs: fixes for ApiServer, ApiSerializerHelper and 
ApiXmlDocWriter(cherry picked from commit
9aced41d70)
 2014-01-28 14:47:06 +01:00
Daan Hoogland 1c7361756c Findbugs: scariest issues in ApiResponseHelper fixed (cherry picked from 
commit 9a1b882d0e)
 2014-01-28 14:24:21 +01:00
Daan Hoogland 60e8d131cf findbugs: moved call on static object to synchronized block(cherry 
picked from commit f3529a19a9)
 2014-01-28 14:14:47 +01:00
Daan Hoogland 9eae5f6929 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git 2014-01-28 13:49:42 +01:00
Daan Hoogland 4f6638d7c7 findbugs: nullpointer dereference guarded(cherry picked from commit 
43ba36f979)
 2014-01-28 13:49:14 +01:00
Likitha Shetty 95bd04e449 CLOUDSTACK-5965. VM displayname is not returned by API. 
If user doesn't supply a display name during VM launch, default it to VM name(uuid) in listVM response.
 2014-01-28 16:43:12 +05:30
Rajesh Battala 807dc09138 CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV 2014-01-28 07:03:08 +05:30
Min Chen f77974b5d2 Fix trailing whitespace from cherry-pick 2014-01-27 13:31:35 -08:00
Min Chen cfe7864618 CLOUDSTACK-5960: Domain admin or user cannot register a template using 
S3/Swift object store.
 2014-01-27 13:31:35 -08:00
Marcus Sorensen 0502d2f375 CLOUDSTACK-5697 This patchset fixes a bug with the recently merged 
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
 2014-01-27 12:11:18 -07:00
Sanjay Tripathi b25ee92c34 CS-5950: Wrong storage tags are used for ISO deployed VMs. 2014-01-27 16:58:55 +05:30
Koushik Das a0f21ff6bf CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view 
Removed unused field. This will ensure that list VM queries are not blocked.
 2014-01-27 15:43:20 +05:30
Min Chen d47d4bbd20 Guard NPE due to empty policies. 2014-01-23 18:32:48 -08:00
Prachi Damle 96a64b933e - Adding OperateEntry during loading of commands 
- Replace ListEntry By OperateEntry
- ApiDispatcher should pass on the API name
 2014-01-23 17:50:59 -08:00
Damodar Reddy 4925b9f6a1 CLOUDSTACK-2031:support for number of ips per nic limit needs to be added for the multiple ip address per nic 2014-01-23 18:14:12 +05:30
Anshul Gangwar 513f1dba36 CLOUDSTACK-5705: fixed the thumbnail not wrking for hyperv 2014-01-23 10:54:08 +05:30
Anshul Gangwar b2de225f54 CLOUDSTACK-5703: putting rdp server port value in host details 2014-01-23 10:54:08 +05:30
Anshul Gangwar 5941ac46d2 CLOUDSTACK-5344 commit for console proxy rdp for hyperv 2014-01-23 10:54:08 +05:30
Nitin Mehta 1b89ae7acb CLOUDSTACK-5478: 
Publish uuid for deployvm action event.
 2014-01-22 16:50:50 -08:00
Prachi Damle 39c0a302b4 Fix the isRootAdmin and isDomainAdmin to return true or false even if the permission is denied by IAM 2014-01-22 13:59:59 -08:00
Min Chen 33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Alena Prokharchyk ab627bc767 Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased 
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
 2014-01-21 17:45:53 -08:00
Alena Prokharchyk a0197006ef Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package 2014-01-21 17:19:52 -08:00
Min Chen c0da0a884a CLOUDSTACK-5921:S3 security key is stored in DB unencrypted 2014-01-21 14:34:32 -08:00
Mike Tutkowski 0846bfe1ff CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false 2014-01-20 23:10:54 -07:00
Min Chen 3689f72f27 CLOUDSTACK-5913:API rate limiting throws a different error than expected 
when Throttle limit hit in the API.
 2014-01-20 15:49:19 -08:00
Alena Prokharchyk 452c20b242 Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators. 
Also intoroduced one more global config parameter - api.servlet.endpoint (default value is "http://localhost:8080/client/api?"). The parameter defines API end point. Can be used by CS components/services deployed remotely, for sending CS API requests
 2014-01-20 13:37:52 -08:00
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Kelven Yang a9733b5df2 CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations 2014-01-17 11:55:14 -08:00
Saksham Srivastava 06f8c1de75 CLOUDSTACK-5692: obscure passwords when using cifs as storage 2014-01-17 14:00:24 +05:30
Alena Prokharchyk bd79fb33a6 CLOUDSTACK-5870: API support for retrieving user data 2014-01-16 15:31:18 -08:00
Alena Prokharchyk 47fd67b7fa CLOUDSTACK-4987: when addNic to vm, don't make account check if the call is made by ROOT admin 2014-01-16 13:34:45 -08:00
Mike Tutkowski 3ef560d925 CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false 2014-01-16 12:15:18 -07:00
Alena Prokharchyk aa6dddc778 CLOUDSTACK-4987: when addNic to vm, don't make account check if the vm belongs to ROOT admin 2014-01-16 10:59:38 -08:00
Min Chen dd50210e74 CLOUDSTACK-5877: ListTemplates does not sort based on sort_key. 2014-01-15 17:39:00 -08:00
Sateesh Chodapuneedi 6d9146bf2d CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory" 
Bump up RAM size of system offering for SSVM to 512MB. Fix if default service offering is already not present.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2014-01-16 01:30:06 +05:30
Min Chen 6583cb3800 Add listAclGroupsByAccount to QuerySelector adapters and remove 
AclProxyService interface.
 2014-01-14 16:19:25 -08:00
Alex Huang 68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management 
of keys out of management server
 2014-01-14 13:11:35 -08:00
Likitha Shetty 16d36dd75f Fix checkstyle 2014-01-14 14:04:57 +05:30
Likitha Shetty e5512960af CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid 2014-01-14 13:47:27 +05:30
Prachi Damle fac9f2da0f Adding messageBus events for adding and removal of an account. 2014-01-13 22:12:39 -08:00
Min Chen bae498c89e Handle search of those entities without db view created using new ACL 
model.
 2014-01-13 21:55:56 -08:00
Murali Reddy af657b3d71 CLOUDSTACK-5861: networks that failed to implement can not be destroyed 
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java
 2014-01-13 23:28:35 +05:30
Prachi Damle 6cd121fe7b RootAdmin and DomainAdmin access check via IAM 2014-01-10 17:06:10 -08:00
Marcus Sorensen 8ee61f3a57 CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use, 
equate empty string to untagged in api parameter input
 2014-01-10 17:09:41 -07:00
Min Chen 43f0f901dd Remove VO and DAO from cloud-engine-schema. 2014-01-10 15:57:39 -08:00
Min Chen e42a262f6c Remove old APIs and old security checker plugins. Also use QuerySelector 
adapater in ACL search routine.
 2014-01-10 14:54:31 -08:00
Prachi Damle 42e53702a2 CLOUDSTACK-5732 [UI] Search is not working in Affinity Groups panel 
- Added keyword support

Conflicts:

	api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
	api/src/org/apache/cloudstack/query/QueryService.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
 2014-01-10 14:45:08 -08:00
Nitin Mehta 2571dd7713 CLOUDSTACK-5829: 
listvms should return the diskoffering id when deployed with an iso
 2014-01-10 14:19:36 -08:00
Harikrishna Patnala 5bf78b82c0 CLOUDSTACK-4904: Unable to see a derieved template if the 
parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same.
 2014-01-10 10:26:10 -08:00
Bharat Kumar 7053c222f9 CLOUDSTACK-5651 deployVm: customparameters param name has to be changed 
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2014-01-10 10:01:43 -08:00
Kishan Kavala 9486a9652e CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters. 
Conflicts:
	engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
 2014-01-10 19:58:59 +05:30
Mike Tutkowski 6944bf9bba Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:02:43 -07:00
Mike Tutkowski ae35782ccd Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 21:36:34 -07:00
Alex Huang 5fb6edd684 Changed the package to name to org.apache.cloudstack 2014-01-09 16:12:26 -08:00
Alex Huang ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08:00
Mike Tutkowski 8b6e89c012 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 15:44:02 -07:00
Kelven Yang 1e2e1ea051 CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues 2014-01-09 14:29:13 -08:00
Kelven Yang 87381d4236 CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging 2014-01-09 14:29:12 -08:00
Kelven Yang ad6454d2bf CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic. 2014-01-09 14:29:12 -08:00
Kelven Yang 737a382c38 Fix a typo caused problem in attach-volume process 2014-01-09 14:29:12 -08:00
Kelven Yang ac0faeb091 Fix auto-merge caused issues 2014-01-09 14:29:12 -08:00
Kelven Yang 0587382265 CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement 2014-01-09 14:29:12 -08:00
Kelven Yang 8c93bd6080 CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Kelven Yang bf9a554522 CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Mike Tutkowski caf87ac5d9 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 15:06:25 -07:00
Mike Tutkowski 03118c2969 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 14:44:35 -07:00
Kishan Kavala 0e315f16c0 CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules. 2014-01-09 22:01:59 +05:30
Nitin Mehta 5c1d639bc4 CLOUDSTACK-5829: 
listvms should return the diskoffering id when deployed with an iso
 2014-01-08 18:32:51 -08:00
Min Chen ac8bc74269 CLOUDSTACK-5840:Remove old API method. 2014-01-08 18:11:12 -08:00
Min Chen 649d9d927f CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API 
(updateCloudToUseObjectStore) instead of two APIs.
 2014-01-08 17:25:13 -08:00
Min Chen 858b9b1177 CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one 
zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed.
 2014-01-08 17:15:04 -08:00
Sheng Yang 1ea02fed4a Revert "CLOUDSTACK-4540: Set execute.in.sequence.network.element.commands=true by default" 
This reverts commit 3c68b9f850.

Refer to the latest comment in the bug.
 2014-01-08 16:03:21 -08:00
Alena Prokharchyk c3680cc111 CLOUDSTACK-5839: fixed xml serializer to process collection field when its elements are of String type 2014-01-08 15:38:50 -08:00
Alena Prokharchyk 07557eb570 CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse 2014-01-08 14:40:10 -08:00
Wei Zhou cbe2560a78 CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage) 
(cherry picked from commit 4bb85cd7f9)

Conflicts:

	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2014-01-08 15:38:06 +01:00
Kishan Kavala 3e45dfb942 CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering. 2014-01-08 19:10:40 +05:30
Bharat Kumar 776b5059fb CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering. 
Conflicts:
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/UserVmStateListener.java
 2014-01-08 19:10:39 +05:30
Jayapal 54275f4f05 CLOUDSTACK-5552 Set private gateway state to ready on delete failure 2014-01-08 11:44:41 +05:30
Alena Prokharchyk cb0c14671a CLOUDSTACK-5826: do netmask/gateway validation before calculating the POD cidr 2014-01-07 10:20:30 -08:00
Jayapal ab3a2c20cd CLOUDSTACK-5552 fixed private gateway DB clean up on router upgrade required 2014-01-07 17:57:58 +05:30
Sanjay Tripathi c3d8e207c8 CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table. 2014-01-07 15:07:02 +05:30
Alena Prokharchyk 4dcc5671d1 CLOUDSTACK-5812: pass podId information when request for secondary ip address in Basic zone guest network 2014-01-06 17:22:17 -08:00
Alena Prokharchyk b15431e574 CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller 2014-01-06 17:09:14 -08:00
Alena Prokharchyk 647ea6e2d0 listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm 2014-01-06 17:09:14 -08:00
Min Chen 89a20d3eed CLOUDSTACK-5771:listImageStores returns error in keyword search. 2014-01-06 14:50:10 -08:00
Min Chen e02e19a6f1 Make AclApiServiceTest pass without changing ApiServerService signature. 2014-01-06 10:43:01 -08:00
Sanjay Tripathi 1069f56f8e CLOUDSTACK-5406: Not able to take snapshot becasue of secondary_storage limit of 400 gb exceeded even though we have not really consumed this limit in secondary store. 2014-01-06 16:09:09 +05:30
Min Chen d374cd5a2c Add Unit Testcases for AclApiService. 2014-01-03 17:18:44 -08:00
Devdeep Singh e59420c514 CLOUDSTACK-5691: Fix for attaching an uploaded volume to instance running 
on hyperv. There were multiple issues here. Upload volume was actually
failing because the post download check for vhd on the cifs share was
unsuccessful. Also the agent code wasn't parsing the volume path correctly.
Fixed it too.
 2014-01-03 16:55:28 +05:30
Jayapal 77878299fb CLOUDSTACK-5552 fixed private gateway DB clean up on failure 2014-01-03 12:57:12 +05:30
Prachi Damle e5b4a1d869 Moved the loading of commands.properties to the IAM plugin 2014-01-02 18:39:18 -08:00
Sheng Yang 3c68b9f850 CLOUDSTACK-4540: Set execute.in.sequence.network.element.commands=true by default 
The things is, VR would take time to execute the commands, say it would need
time t1(which is greater than 0).

And the interval between parallel deployment is t2(which can be almost 0).  In
any case, VR need to handle commands in sequence internally, so if t1 > t2, then
the new task in the VR would wait longer and longer to execute, then some
commands result in timeout ultimately. No matter how long the timeout is, if
there are enough big number of queued task for VR, the last ones can timeout.

Currently VR has a robust mechanism to sequence the jobs internal and I
confirmed in this case, it works well. But there is no way to fix this issue if
VR is already 100% load at all time.

Probably we can improve the speed of VR internal executing, but seems the
ultimate answer is: set execute.in.sequence.network.element.commands to true. VR
doesn’t know how long it would take for mgmt. server to timeout, only mgmt.
server knows that.

By setting sequence execution in VR to "true", mgmt server would handle the
commands in a queue, make sure that VR won't be overload and report unexpected
failure just because it's overload.
 2014-01-02 15:41:31 -08:00
Harikrishna Patnala fd0fabd3e2 CLOUDSTACK-5551: Search not working for Configuration parameters in (Account/zone/cluster/storage) settings page 
Added filters while listing scoped configuration parameters.
Fixed: Some parameters are missing from UI settings tab because of missing scope entry in configuration table.

Signed-off-by: Koushik Das <koushik@apache.org>
 2014-01-02 16:18:21 +05:30
Kishan Kavala 619674e21e CLOUDSTACK-5656: Rules will remain in Revoked state when router upgrade is required. Filtered revoked rules while listing. Show genreric error since router is not visible to enduser. 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-01-02 15:08:49 +05:30
Kishan Kavala 700184f3ba Added config to enable/disable router version check 2014-01-01 17:32:00 +05:30
Kishan Kavala 79dc74dcb8 CLOUDSTACK-5698: support network ACL list search by keyword 
Conflicts:
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
 2014-01-01 16:59:52 +05:30
Daan Hoogland 2cf356e047 isSameIsolationId 2013-12-31 12:25:17 +01:00
Murali Reddy 14241ce233 CLOUDSTACK-5667: Shared Network - fails to launch router due to " 
Multiple generic soure NAT IPs provided for network"

'getExistingSourceNatInNetwork' method was retruning source nat ip for
a particular account, resulting in multiple source nat ip's to be
assigned to a shared network on network implemen. Fix ensures that
account id is not considered for shared network implement.
 2013-12-31 11:09:57 +05:30
Sanjay Tripathi db8d5f602a CLOUDSTACK-5422: Changing XenServer Tools Version 6.1 + doesnt work. 2013-12-30 20:01:06 +05:30
Sanjay Tripathi a782d17caa CLOUDSTACK-3806: OS Preference can not be set. 2013-12-30 20:01:06 +05:30
Sanjay Tripathi f6b063de79 CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM. 2013-12-27 18:17:22 +05:30
Devdeep Singh 40a9909864 Fix check style errors 2013-12-27 16:39:29 +05:30
Rajesh Battala dcf8ddfb24 CLOUDSTACK-5340 [Hyper-V] Control IPs are not getting released when VRs are in stopped state 2013-12-27 14:56:02 +05:30
Rajesh Battala ab304d2821 CLOUDSTACK-5592 
ssh should run on eth1 interface in ssvm/cpvm running in HyperV.
 2013-12-27 14:50:08 +05:30
Rajesh Battala 18fd0157a5 CLOUDSTACK-5365 added route for mgmt cidr in the VR running on HyperV 2013-12-27 14:46:28 +05:30
Murali Reddy 8b151c98c2 CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router 
restart, firewall rules dropped from iptables post restart

on VR restart, not all public IP's associated with the network are sent
with IpAssocCmd to VR. This fix will ensure all the ip's associated with
the network irrespective of the account are sent as part of
IpAssocCommand

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2013-12-27 14:27:57 +05:30
Prachi Damle b7c3411be9 Fixing the issues in loading the beans 2013-12-26 15:17:10 -08:00
Min Chen 6f800506fd CLOUDSTACK-5653:S3 object store as Secondary Storage, the template 
created from different zone is not available for the other zones.
 2013-12-26 14:48:21 -08:00
Alena Prokharchyk 526af5e326 Included guestOsId to userVmResponse - as we let to change this param through updateVm call, we should return it in the response 2013-12-26 13:28:29 -08:00
Bharat Kumar fead6706ff CLOUDSTACK-5530 attempt to add secondary storage with the same name is ignored 2013-12-26 12:43:44 -08:00
Min Chen 5d262d7b59 CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS 
migration to S3.
 2013-12-26 12:39:39 -08:00
Jayapal 16763be77f Fixed issue in setting vm ip,mac in vm_instance table 
This issue is not seen in 4.2, It is observed only in 4.3.
 2013-12-26 16:58:04 +05:30
Devdeep Singh c75f8bcc06 CLOUDSTACK-5420: The agent manager wasn't transitioning the host to maintenance 
mode if their are no vms running on the host. Made the change to do so.
 2013-12-26 11:15:51 +05:30
Alena Prokharchyk 03226ba539 Added deviceId parameter to the NicResponse. This information can be useful for the user if he wants to see the order of the networks in his vm 2013-12-24 15:34:43 -08:00
Kishan Kavala 435aefec15 CLOUDSTACK-5254: If VR is not upgraded, leave firewall rule in Active state. Rule will be applied when VR is upgraded 2013-12-24 18:13:50 +05:30
Alena Prokharchyk 914bc46484 CLOUDSTACK-5390: when calculate index (page #) in NetworkManager, rely on fact that getStartIndex() returned by API, returns pageSize*(page-1). So to get index(page), you need to do the reverse calculation 2013-12-23 16:28:06 -08:00
Alena Prokharchyk fbba17e68c Resource metadata support for cloudStack user 2013-12-23 14:25:07 -08:00
Alena Prokharchyk 79e64aa535 Resource metadata support for Disk Offering 2013-12-23 12:36:13 -08:00
Kishan Kavala 0335009a1e CLOUDSTACK-5300: Catch vpn add error failure, removed failed user and return failure status 2013-12-23 17:15:21 +05:30
Kishan Kavala 55d84bdd5f CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check when comparing min version 2013-12-23 17:15:03 +05:30
Devdeep Singh 34894f5a9d CLOUDSTACK-5564: The deployment on other hosts in the cluster used to fail because 
cloudstack though the storage pool wasn't accessible from the host. Make sure host
to pool mapping is added in the storage_pool_host_ref table when a host is added
to the cluster.
 2013-12-23 17:06:11 +05:30
Min Chen 630b7fb4a1 Fix listTemplates issues with new ACL model. 2013-12-20 17:57:44 -08:00
Nitin Mehta edc1b78d84 Revert "Revert "CLOUDSTACK-5281:"" 
This reverts commit ab37009e90.
 2013-12-20 17:30:05 -08:00
Alex Huang ab37009e90 Revert "CLOUDSTACK-5281:" 
This reverts commit 6b62a04eaf.
 2013-12-20 17:23:33 -08:00
Nitin Mehta 6b62a04eaf CLOUDSTACK-5281: 
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
 2013-12-20 16:58:43 -08:00
Nitin Mehta f083f91b0b CLOUDSTACK-5281: 
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
 2013-12-20 15:33:37 -08:00
Alena Prokharchyk 1832cf6660 CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet. 2013-12-20 13:39:13 -08:00
Edison Su 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 231e7c01f2.
 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 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
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 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 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
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 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
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
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
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
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
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
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
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