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

9861 Commits

Author SHA1 Message Date
Will Stevens cacbc80ab1 Merge branch 'origin/CLOUDSTACK-7468' 2014-09-04 14:08:07 -04:00
Will Stevens 18653f6cd6 CLOUDSTACK-7418 and CLOUDSTACK-7488 - Fixed LB removal if cert is applied 2014-09-04 13:02:12 -04:00
Kishan Kavala 6f7c4863a2 CLOUDSTACK-7473: Vm migration is not supported for LXC. When host is put in maintenance mode, stop the Vms instead of migrating 2014-09-04 20:59:19 +05:30
Fred Clift 355eb72c7d make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-04 04:22:27 -04:00
Mike Tutkowski 1d2f3300ad Adding support for SolidFire snapshots 2014-09-03 20:09:00 -06:00
Will Stevens 5d11385c31 CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
 2014-09-03 10:07:19 -04:00
Hugo Trippaers dc3f0cbc63 Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
Min Chen 47365ac4ba Fix incorrectly written unit tests. 2014-09-02 17:55:44 -07:00
Min Chen 5f7b4dbbb2 CLOUDSTACK-7471:Regular user is allowed to deleteNetwork/RestartNetwork 
that does not belong to him.He is also able to deploy Vm for other
users.
 2014-09-02 17:24:08 -07:00
Mike Tutkowski ba41f230e1 CLOUDSTACK-7467 (this part of the ticket is related to augmenting an error message) 2014-09-02 12:51:01 -06:00
Hugo Trippaers f636611cac Revert "server: Add event bus bean as commented xml in META-INF core" 
Breaks CloudStack startup. You're better off putting this on the wiki

This reverts commit c730bc3491.
 2014-09-02 10:09:04 +02:00
Rohit Yadav c730bc3491 server: Add event bus bean as commented xml in META-INF core 
This adds a spring bean xml to have EventBus for ACS, but the bean is commented
so the event bus service won't start by default. I'm adding this for any developer
who may want to hack on events and may use it just by uncommenting it and fixing
options.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-01 21:26:43 +02:00
Kishan Kavala f44be742f8 CLOUDSTACK-7447: Send modify storage pool command on host connect to LXC hosts 2014-09-01 12:39:05 +05:30
Rohit Yadav 33a249e77a CLOUDSTACK-7455: Fix possible case for NPE 
NPE can happen if Spring fails to inject api authenticator, so better check
and set list of commands if the authenticator is not null or returning null cmds

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-31 14:42:18 +02:00
Mike Tutkowski de6a3112b6 Update to volume-resize logic 2014-08-28 23:19:04 -06:00
Rohit Yadav 6eae9b8596 saml: disable plugin by default and don't initiate if not enabled 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:49:48 +02:00
Rohit Yadav 249446dc52 server: add config to enable/disable SAML SSO/SLO plugin 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:27 +02:00
Rohit Yadav b0f3d66f9d Config: add config for saml user account, domain and redirected URL to ACS UI 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:25 +02:00
Rohit Yadav 47ccce85a1 api: add method to pass on api authenticators to cmd classes 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:24 +02:00
Rohit Yadav 0444bfb653 server: Add IDP entity ID config param 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:24 +02:00
Rohit Yadav 5d94fd5be5 server: Add SAML related config params in Config 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:23 +02:00
Rohit Yadav 37d696db80 ApiServer: Fix imports order, use org.apache.cloudstack.api.ApiServerService 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:23 +02:00
Rohit Yadav 591a686d77 server: fix server package after auth plugin refactor 
- Have opensaml dependency to get version from root pom
- add com.cloud.api.auth.APIAuthenticationManagerImpl to spring ctx manager
- Fix getCommands() in APIAuthenticationManagerImpl
- Fix imports in resources, test and src classes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:23 +02:00
Rohit Yadav 68e094ebaf saml: move refactor files from server to api module 
- Move interfaces and classes from server to api module
- This can be then used for pluggable api authenticators

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:22 +02:00
Rohit Yadav a364054db6 Minor fixes 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:21 +02:00
Rohit Yadav 2464e02bf4 SAML2LoginAPIAuthenticatorCmd: Set all necessary cookies and redirect to UI 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:21 +02:00
Rohit Yadav 2694ad7bd9 ApiServlet: Fix NPE while inserting to auditTrail 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:21 +02:00
Rohit Yadav a1dc9e8189 SAML2LoginAPIAuthenticatorCmd: Implement SAML SSO using HTTP Redirect binding 
- Creates SAMLRequest and uses HTTP redirect binding (uses GET/302)
- Redirects to IdP for auth
- On successful auth, check for assertion
- Tries to get attributes based on standard LDAP attribute names
- Next, gets user using EntityManager, if not found creates one with NameID as UUID
- Finally tries to log in and redirect

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:21 +02:00
Rohit Yadav 9c7204d386 DefaultLoginAPIAuthenticatorCmd: move createLoginResponse to ApiServer 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:21 +02:00
Rohit Yadav 1a3813a342 ApiServer: change loginUser method signature to return ResponseObject 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:20 +02:00
Rohit Yadav b82207e081 SAML: WIP redirections work now 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:20 +02:00
Rohit Yadav 18ff47efc0 server: add opensaml as dependency 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:20 +02:00
Rohit Yadav df95a762f4 SAML2: add saml sso and slo apicmds skeleton, add classes to AuthManager 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-28 19:45:20 +02:00
Saksham Srivastava d9531fb0de CLOUDSTACK-7453: Network rate field specified with negative value in service offering results in db Exception 2014-08-28 16:01:11 +05:30
Saksham Srivastava 490d499b7f CLOUDSTACK-7453: Network rate field specified with negative value in service offering results in db Exception 2014-08-28 15:28:00 +05:30
Kishan Kavala 55983d47c0 CLOUDSTACK-7400: Allow migration of systemVms in LXC. USer Vms cannot be migrated 2014-08-27 13:05:04 +05:30
Kishan Kavala 08dc5c6f91 CLOUDSTACK-7428: Allow LXC cluster in SG enabled zones. Use lxc driver in security_group.py script for lxc host 2014-08-27 11:52:59 +05:30
Saksham Srivastava 9fb2a760c6 CLOUDSTACK-300: Creation of compute offering allow combination of local storage + HA 2014-08-26 14:48:51 +05:30
Jayapal 384025f258 CLOUDSTACK-7218: Remvoing all static nat associated with vm in case of secondary ips 
In vm secondary ips case static nat configured to vm primary/secondary ips
IP1-->vm1Ip1, IP2-->vm1Ip2
While destroying vm deleting all static nats associated with the vm
 2014-08-26 14:29:23 +05:30
Rohit Yadav d71c19f91c ApiXmlDocWriter: add more search name spaces to find APIs 
Whenever a new API command is added to CloudStack, if developers are not using
the recommended namespace of org.apache.cloudstack.api.* they should add their
custom namespace/package here. ApiXmlDocWriter uses ReflectUtils to find APIs
within these packages (which must be also available in cloud-client).

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-25 18:16:28 +02:00
Likitha Shetty 433ec7c856 Fixed few issues reproted by coverity. 2014-08-25 16:11:58 +05:30
Mike Tutkowski 3773ff060e Update to volume-resize logic 2014-08-21 20:18:20 -06:00
Min Chen 1436ce62b6 CLOUDSTACK-7394:Caller should be owner after creating template from 
snapshot/volume.
 2014-08-21 17:16:13 -07:00
Santhosh Edukulla 19ffc93e2e Fixed few coverity reported issues:Aug22 2014 2014-08-21 17:09:27 +05:30
Rohit Yadav e3b3a18aef ConfigurationManagerImpl: Fix NPE when trying to access method on null object 
Before checking obj.length, the fix is to check that the obj is not null

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-21 11:34:44 +02:00
Bharat Kumar cab2b12d7d CLOUDSTACK-7155 Re-copying templates to other zones doesn't work 2014-08-21 09:50:54 +05:30
Mike Tutkowski ffa4d73290 Update to volume-resize logic 2014-08-20 13:18:33 -06:00
Harikrishna Patnala 8d0817860f CLOUDSTACK-7337: Volume state remains in allocated after volume creation faliure from snapshot Volume should be marked to Destroy state after creation faliure. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-08-20 17:39:53 +05:30
Wei Zhou 880bff28e0 CLOUDSTACK-7362: fix wrong uuid issue for resource tags 
(cherry picked from commit 838a1a8476)
 2014-08-18 16:17:36 +02:00
Wei Zhou b035a444c6 CLOUDSTACK-7308: add tags to all security group rules 
(cherry picked from commit ae1b87ca23)
 2014-08-18 16:17:28 +02:00
seif 59ea2e2960 Added the listHostTags API command 2014-08-17 20:38:46 -06:00
Stephen Hoogendijk 6978c18c3a CLOUDSTACK-7308 - Adds tagging support for security group rules 2014-08-15 09:39:53 +02:00
Girish Chaudhari adf7de9a95 CLOUDSTACK-5663 : Added the NULL CIDR check to avoid NPE for createNetwork and listNetwork 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-08-14 10:34:45 +02:00
Min Chen fee2bfce49 CLOUDSTACK-7344:VOLUME.DELETE usage event missing for VM's in ERROR 
state.
 2014-08-13 22:15:47 -07:00
Anthony Xu 90fe6d8087 removed trailing space 2014-08-13 11:09:38 -07:00
Rohit Yadav 31fbb20648 ApiXmlDocWriter: Don't hardcode around login api or skip it based on key name 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-13 14:05:18 +02:00
Luis Henrique Okama cb9319d3d8 bugfix CLOUDSTACK-7309 using findProjectByProjectAccountIdIncludingRemoved 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-13 00:07:25 +02:00
Min Chen e3564658be CLOUDSTACK-6940, CLOUDSTACK-7312, CLOUDSTACK-5512: Template/ISO/Volume 
upload rejects some valid URL formats. Also consolidate URL format check
into one util routine.
 2014-08-12 11:43:08 -07:00
Min Chen 83bd4d60f1 Revert "CLOUDSTACK-7312:ISOs cannot be downloaded from URLs without matching" 
This reverts commit 737f76df8c.
 2014-08-12 11:43:08 -07:00
Min Chen a8316de725 Revert "CLOUDSTACK-6940:Templates cannot be downloaded from URLs without" 
This reverts commit 569e94908b.
 2014-08-12 11:43:08 -07:00
Harikrishna Patnala 6568e0bb31 CLOUDSTACK-7305: hypervisor type parameter is mandatory when deploying VM using ISO 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-08-12 16:27:48 +05:30
Rohit Yadav ae207bea98 DefaultLoginAPIAuthenticatorCmd: return userId as UUID 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:32 +02:00
Rohit Yadav 384acffff4 ApiServer: take UTF_8 and other static vars from HttpUtils 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:32 +02:00
Rohit Yadav 3cc6efce04 ApiServlet: use HttpUtils instead of class specific implementation 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:32 +02:00
Rohit Yadav 983252cffd ApiResponseSerializer: Use HttpUtils instead of BaseCmd 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:32 +02:00
Rohit Yadav f11dcf8ef5 ApiServletTest: Fix test, now login/logout have their own API/class 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:31 +02:00
Rohit Yadav 224dc9f8e5 APIAuthenticator: refactor signature of APIAuthenticator interface's authenticate 
Pass HttpServletResponse as it can be useful for authenticators which need to
have their own writer interface/method

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:31 +02:00
Rohit Yadav 6ec1a1b604 ApiServlet: move setting of response type up in the layer 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:31 +02:00
Rohit Yadav 7434f1bd33 ApiXmlDocWriter: get rid of hardcoded login/logout docs 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:31 +02:00
Rohit Yadav ee57f47e29 ApiServlet: use the new and refactored authentication mechanism 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:31 +02:00
Rohit Yadav 2e5bbc9a0d ApiXmlDocWriter: remove hardcoded login and logout apis 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:31 +02:00
Rohit Yadav b587291d55 ApiResponseSerializer: Skip extra boxing for Auth responses 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:30 +02:00
Rohit Yadav bd2898e491 APIAuthenticationManagerImpl: add the auth manager and bean entry in spring xmls 
- This implements ManageBase, is a pluggable service
- Has a mechanism to return commands, useful for apidocs etc.
- Has a method to return APIAuthenticator based on API command name

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:30 +02:00
Rohit Yadav f7821ecf09 DefaultLoginAPIAuthenticatorCmd: Refactor and implement the default login mechanism 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:30 +02:00
Rohit Yadav 1330559b8d DefaultLogoutAPIAuthenticatorCmd: Refactor and implement the logout mechanism 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:30 +02:00
Rohit Yadav ac3adfeca7 APIAuthenticationManager: Add Auth manager definition 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:30 +02:00
Rohit Yadav 4d3fbc54ad APIAuthenticationType: Add auth enum type, login or logout 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:30 +02:00
Rohit Yadav 31722c2674 APIAuthenticator: Add interface definition for the auth mechanisms 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:29 +02:00
Min Chen 737f76df8c CLOUDSTACK-7312:ISOs cannot be downloaded from URLs without matching 
file extensions.
 2014-08-11 15:00:32 -07:00
amoghvk d1d722f9bd CLOUDSTACK-7295: VMs is Stopped state have no host ID, resulting in NPE 2014-08-11 14:56:58 -07:00
Alena Prokharchyk 97efbc56e4 CLOUDSTACK-7283: listUsers - for regular user, only return the caller info. If there are more users under the same account, their information should never be returned 2014-08-11 13:51:11 -07:00
Rajani Karuturi 736ff5f8e5 Fixed CLOUDSTACK-7303 [LDAP] while importing ldap users, update the user info if it already exists in cloudstack 2014-08-11 17:54:31 +05:30
Santhosh Edukulla fd96ad02d7 Fixed few coverity reported issues around concurrency, null checks 2014-08-11 16:55:23 +05:30
Santhosh Edukulla f9e11540c7 Fixed few coverity issues 2014-08-11 16:02:19 +05:30
Alena Prokharchyk 354756219c CLOUDSTACK-6486: Guest network guru - when add network, validate isolation method in case insensitive manner 2014-08-08 17:08:13 -07:00
Min Chen d33278250d CLOUDSTACK-7264:NPE while creating scheduled/recurring snapshots for the 
removed account with cleanup_needed=1.
 2014-08-08 09:42:55 -07:00
seif 67ca2557f9 Changes for a new API command to list the storage tags 2014-08-07 17:46:06 -06:00
Alena Prokharchyk 6d1482b97b CLOUDSTACK-7283: listUsers API is available for regular users now 2014-08-07 14:01:58 -07:00
Nitin Mehta f424a04b0c CLOUDSTACK-7272: Router stop fails with NPE. Fixing it by making the hostId as Long object than native type long. The issue was the response was checking for getHostId() != null to populate attribute hypervisor. But since the hostId is declared as long it will never be null, resulting in the NPE when populating hypervisor. Fixed that 2014-08-06 18:06:33 -07:00
Santhosh Edukulla dda2820552 Fixed Coverity reported type issues 2014-08-06 15:27:00 +05:30
Nitin Mehta b9d834e838 CLOUDSTACK-4200: listSystemVMs API and listRouters API should return hypervisor property since dynamic scaling is not enabled for all the hypervisors and that action can be showed only for the hypervisors that support it. 2014-08-05 17:29:34 -07:00
Anthony Xu 129437c636 added more log 2014-08-05 16:41:38 -07:00
Rohit Yadav 1176a836af server: use scoped variable in pom.xml for build.properties file path 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-05 18:30:14 +02:00
Ilia Shakitko 07f916dfc6 CLOUDSTACK-7159 Added "state" parameter to the "listPublicIpAddresses" API call 
Signed-off-by: Ilia Shakitko <i.shakitko@tech.leaseweb.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-05 18:13:38 +02:00
namita.chaudhari fce2880b9f CLOUDSTACK-2694: Able to configure duplicate firewall rule with protocol and no ports 
Signed-off-by: Jayapal <jayapal@apache.org>
 2014-08-05 17:57:54 +05:30
Damodar 221c118b4f CLOUDSTACK-7245: listIsos call does not return isdynamicallyscalable in the response attributes as mentioned in API docs. 2014-08-05 16:06:01 +05:30
Nitin Mehta 835ca8eea8 CLOUDSTACK-7018: Restore VM - missing destroyed usage event for the destroyed root volume. Also removed the resource count logic since we destroy the old root volume and create a new one. 2014-08-04 16:40:28 -07:00
Min Chen 8a21633050 CLOUDSTACK-7239:Wrong message thrown on Primary Storage addition failure 
in some cases.
 2014-08-04 16:04:38 -07:00
Frank.Zhang 1ee7e0c77e CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-08-04 15:00:44 -07:00
Frank.Zhang 44dff6c426 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-08-04 15:00:44 -07:00
Alena Prokharchyk 05d056bb90 CLOUDSTACK-7194: deployVm Api, "hypervisor" parameter: 
* is respected only when vm is deployed from ISO, or hypervisorType is not set on the template record
* if parameter passed when vm is deployed from template having hypervisor info set, validate that these 2 parameters are the same instead of silently defaulting the final value to the one set on the template
 2014-08-04 14:21:52 -07:00
Santhosh Edukulla b7d3f1bd30 Fixed few coverity issues for resource synchronization 2014-08-04 16:09:26 +05:30
Edison Su 29f711e0a9 remove unused servlet 2014-08-01 16:55:35 -07:00
Alena Prokharchyk ffeca8bbd2 CLOUDSTACK-7209: handle the case when network fails to implement NoTransitionException, and null is returned to the caller stack. All caller methods should verify if the return value is null before processing it further. 2014-08-01 09:47:28 -07:00
Likitha Shetty f803100813 CLOUDSTACK-6969. Data Volume Shrink operation failing with "Unexpected Exception". 
For ResizeVolume API command -
1. If hypervisor resource throws an exception, handle the NPE thrown by the job framework.
2. Improve user error message in case of RuntimeException by throwing the exception instead of 'Unexpected Exception'.
 2014-08-01 16:23:47 +05:30
Santhosh Edukulla 92c70f03e0 Fixed Coverity Issues 2014-08-01 16:16:12 +05:30
Jayapal d28da9d986 CLOUDSTACK-7212: Failed creating LB rule on public port 8081 for VR as LB provider 2014-08-01 15:54:17 +05:30
Anthony Xu 5fb03aec9b check if admin user exists 2014-07-31 13:44:58 -07:00
Rohit Yadav 89fabe82b9 CLOUDSTACK-7211: Add Guest OS mapping before returning VirtualMachineTO object 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 19:03:51 +02:00
Santhosh Edukulla b371356abc Fixed coverity issues reported 2014-07-31 21:19:57 +05:30
Mike Tutkowski b919da8a5c CLOUDSTACK-7173 2014-07-30 19:27:45 -06:00
Alena Prokharchyk 89017a7d7b CS-19072: got rid of unneeded type casting when apply pagination to different resources 2014-07-30 10:33:45 -07:00
Santhosh Edukulla dc2346147b Fixed few coverity issues reported 2014-07-30 17:06:35 +05:30
Devdeep Singh 96b5c08250 CLOUDSTACK-7136. While listing hosts for migration, the offering details were 
not correctly initialized in the vmprofile. With a custom offering the cpu,
cpu-speed and memory were getting initialized to null which caused a NPE in
the allocator. Fixed it by explicitly initializing the offering details in the
vm profile before calling into the allocator for listing suitable hosts.
 2014-07-30 16:32:10 +05:30
Devdeep Singh fc14fe1132 CLOUDSTACK-7201. Before initating out live volume migration to a pool check that if the 
destination pool is a cluster wide pool, it should be in the same cluster as the vm to
which the volume is attached.
 2014-07-30 13:01:29 +05:30
Rajani Karuturi 5fa2d1c7ca Fixed Bug: CLOUDSTACK-7200 [LDAP] importUsersCmd for a group fails incase any member of a group is not an user 2014-07-30 12:02:24 +05:30
Anthony Xu fefb0028fe HA VM with local storage works 2014-07-29 16:31:33 -07:00
Alena Prokharchyk 3d34a136a6 CLOUDSTACK-6168: fixed the description for global config "vm.instancename.flag" - the flag is applicable for VMware hypervisor only 2014-07-29 11:15:37 -07:00
Alena Prokharchyk 477f91327c CS-19072: fixed broken pagination and count in listVpcs 2014-07-28 15:26:02 -07:00
Alena Prokharchyk fa74b3a300 CS-19072: fixed broken pagination and count in listVpcOfferings 2014-07-28 14:44:12 -07:00
Alena Prokharchyk 8b98cc2202 CS-19072: fixed broken pagination and count in listNetworkOfferings 2014-07-28 14:44:04 -07:00
Alena Prokharchyk ca8d3672e8 listNetworks: moved pagination post processing to StringUtils class 2014-07-28 14:43:55 -07:00
Anthony Xu 330c4ba578 completed the new vmsync TODOs in the code. 
removed old vmsync logic
 2014-07-28 12:51:37 -07:00
Min Chen a216046191 CLOUDSTACK-7165:[Automation] NPE observed during restart and expunge VM. 2014-07-25 15:51:47 -07:00
Santhosh Edukulla 343943fd4e Fixed Coverity Issues Reported 2014-07-25 16:45:16 +05:30
Santhosh Edukulla 5ee9a3cc8a Fixed Coverity Issues Reported 2014-07-25 16:44:18 +05:30
Santhosh Edukulla deeb754bfa Fixed Coverity Issues Reported 2014-07-25 16:42:14 +05:30
Santhosh Edukulla 16b1746111 Fixed Coverity Issues Reported 2014-07-25 16:40:43 +05:30
Rajesh Battala ea740aa0e1 fixed CLOUDSTACK-7090 Console proxy key store password should be securely generated 2014-07-25 14:20:52 +05:30
Kishan Kavala c61c636ce8 CLOUDSTACK-5946: Commit 2774b62d64 changed keystore file along with coverity fixes. Use varible name for keystore filename to keep it in sync 2014-07-25 14:07:46 +05:30
Nitin Mehta 2ed22b3ba7 CLOUDSTACK-5641: Local disk usage on host don't show up in the admin's webui. Correcting the view to include capacity type 9 which is local storage. Also changing the response to just pick the used bytes coming in through the view which now stands corrected. 
Verified that the dashboard and storage pool view works fine.
 2014-07-24 17:16:30 -07:00
Edison Su 2f832fddff CLOUDSTACK-7164: fix NPE 2014-07-24 17:01:23 -07:00
Edison Su 165618ac9a CLOUDSTACK-7166: fix NPE 2014-07-24 16:58:30 -07:00
Hugo Trippaers 1440a1c6a0 Fix CID 1114609 Log the correct number 2014-07-24 12:21:37 +02:00
Bharat Kumar da55aff64f CLOUDSTACK-7158 listCapacity API missing types for certain zones 2014-07-24 14:33:51 +05:30
Saksham Srivastava 0f85e649b6 CLOUDSTACK-5999: Virtual Router does not start if Guest VM is rebooted from CloudStack 2014-07-24 10:45:51 +05:30
Min Chen e6ead3176c CLOUDSTACK-7175:Domain Id is exposed in error message when cross domain 
access is attempted when listing Vms.
 2014-07-23 17:36:15 -07:00
Daan Hoogland 7f14da6406 rats 2014-07-23 21:31:50 +02:00
Daan Hoogland b8112ac79e highlevel 'unit'-test for refactoring of (Vpc)VirtualNetworkApplianceManagerImpl 2014-07-23 21:30:21 +02:00
Daan Hoogland 44be176486 rename networkMgr to networkMdl to prevent name clashes in mocks of 
VirtualRouterElement and VirtualNetworkApplianceManagerImpl
 2014-07-23 21:19:31 +02:00
amoghvk c804660c74 CLOUDSTACK-7168: Revert "Fixed Coverity Issues reported" that broke CI 
This reverts commit 4523490d44.
 2014-07-23 11:37:36 -07:00
Damodar c43b56998a CLOUDSTACK-7153: addNicToVirtualMachine not BaseAsyncCreate but creates an entity 2014-07-23 09:28:32 +05:30
Santhosh Edukulla 4523490d44 Fixed Coverity Issues reported 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-07-22 18:03:36 +05:30
Hugo Trippaers 4bf321bd03 Fix equality check using != on objects 
Cleanup in the code, removing dead code
 2014-07-22 13:14:26 +02:00
Hugo Trippaers 2833366415 Remove dead code 2014-07-22 13:12:47 +02:00
Likitha Shetty 493fd17054 CLOUDSTACK-7152. Attaching datadisk to VMs that have VM snapshot throws 'Unexpected exception'. 
Like with other API commands, ensure input parameter validation for AttachVolume happens outside the job queue.
 2014-07-22 15:13:37 +05:30
Nitin Mehta 77dadd75c4 CLOUDSTACK-6787: Publishing uuids missing in some cases, adding/correcting events in some cases. 
Also fixed a bug in the global config framework.
 2014-07-21 14:08:18 -07:00
Murali Reddy 9dc322d46f CLOUDSTACK-7144: No GSLB provider is available during assigning load 
balancing rule

this fix ensures any bean implementing GslbProvider interface are injected
into GlobalLoadBalancingRulesServiceImpl.
 2014-07-21 16:50:21 +05:30
Suresh Ramamurthy 03de9cc335 CLOUDSTACK-6845 : NuageVsp Network plugin 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-07-21 10:49:49 +02:00
Rajani Karuturi 8b2efee61c Fixed coverity reported issues in UserVmManagerImpl 2014-07-21 08:24:23 +05:30
Ian Duffy 8716376b4a remove unused import 2014-07-20 18:15:52 +01:00
Ian Duffy d4428a93a8 Allow for length of password on VMs to be set via global settings 
Conflicts:
        server/src/com/cloud/vm/UserVmManagerImpl.java
        setup/db/db/schema-430to440.sql
 2014-07-20 18:14:55 +01:00
Mike Tutkowski 08d7b46be7 Update to volume-resize logic 2014-07-19 00:42:04 -06:00
Edison Su 1bb3ea8b7a CLOUDSTACK-6918: iterate through pending works in cancel maitenance 2014-07-18 15:39:30 -07:00
amoghvk cfcc4a076d CLOUDSTACK-6358: KVM mappings for CentOS 6.x and RHEL 6.x 2014-07-18 15:10:10 -07:00
Murali Reddy 2f293f42d5 CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared 
networks

fix ensures only admin users can delete shared network
 2014-07-18 17:52:09 +05:30
Harikrishna Patnala 0069037573 CLOUDSTACK-7113: Ability to reset password when Router VM is stopped 
With this improvement password reset also happens when router is in stopped state on resetPasswordCmd and restoreVM
 2014-07-18 14:37:44 +05:30
Mike Tutkowski b080eaf327 Updates to the way resizing a volume works 2014-07-17 21:09:19 -06:00
Daan Hoogland 3b76278b97 rvr4vpc: more interesting test 2014-07-17 15:32:03 +02:00
Saksham Srivastava d382be9578 CLOUDSTACK-6508: impossible to list projects from API with domainid set 2014-07-17 14:26:25 +05:30
Likitha Shetty d3e7b43ee9 CLOUDSTACK-7119. [VMware] Don't allow VM reset when VM has snapshots. 2014-07-17 13:32:16 +05:30
Daan Hoogland 27bc791746 rats 2014-07-17 09:23:03 +02:00
Edison Su 771b53b342 CLOUDSTACK-4725: if storage pool has different path, but the uuid is the same, then treat them as the same storage pool 2014-07-16 16:38:17 -07:00
Daan Hoogland 5b37c65577 oversimplified test fixed 2014-07-16 17:28:01 +02:00
Hugo Trippaers b0d7e10aef Prevent a NPE when shutting down a network that did not have a vlan 
assigned yet.
 2014-07-16 16:57:12 +02:00
Daan Hoogland cc37eb50cf checkstyle: unused imports 2014-07-16 16:52:02 +02:00
Daan Hoogland 799258662c rvr4vpc simple test for deployRouter 2014-07-16 16:44:28 +02:00
Hugo Trippaers dbc7d80329 Aggregate command cleanup is not required for the virtual router as we 
already cleanup in the finish.

And consequently dies if somebody tries to test with assertions enabled.
 2014-07-16 16:24:54 +02:00
Daan Hoogland 5ccd904e83 simple first test for backward compatibility testing in rvr4vpc work 2014-07-16 10:59:58 +02:00
amoghvk 3d8dd1c921 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2014-07-14 17:30:12 -07:00
Amogh Vasekar c30821f703 CLOUDSTACK-6671: Missing patch in master 2014-07-14 17:00:08 -07:00
Amogh Vasekar 09069fcc87 CLOUDSTACK-6358: Add missing patches in master for KVM 2014-07-14 16:51:55 -07:00
Alena Prokharchyk 4f0640dac4 CLOUDSTACK-6595: allow to expunge the vm when its in Error state, in addition to Expunging/Destroyed states 2014-07-14 14:40:11 -07:00
Jayapal 778e04cb77 CLOUDSTACK-7104: perform ipassoc for ip when network is implemented after the gc 2014-07-14 19:50:36 +05:30
Alena Prokharchyk 63b81995f6 CLOUDSTACK-7100: update global config - trim leading and trailing whitespaces before global config value update 2014-07-11 16:02:51 -07:00
Alena Prokharchyk 7098367dc6 Fixed code causing warnings in ActionEventUtils 2014-07-11 14:59:39 -07:00
Likitha Shetty 00778de96e CLOUDSTACK-7099. Volume snapshot is not getting backed up. 
Correctly inject ConfigDao into SnapshotStateListener.
 2014-07-11 17:06:15 +05:30
Jayapal 73b622c823 CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate 2014-07-09 14:57:25 +05:30
Min Chen cc8fc746df CLOUDSTACK-6468:IAM - Templates - Admin user is not allowed to edit 
template and set isExtractable() paramater.
(cherry picked from commit b6617843d2)

Signed-off-by: Nitin Mehta <nitin.mehta@citrix.com>
 2014-07-08 14:20:45 -07:00
Alena Prokharchyk b517156fe3 CLOUDSTACK-7039: don't log exception stackTrace when catch sql exception on system/admin user/account insert 2014-07-07 16:45:23 -07:00
Frank.Zhang 65497b69c7 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-07-07 14:52:45 -07:00
Frank.Zhang 3ddc9e7674 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-07-07 11:40:21 -07:00
Santhosh Edukulla a600d8408e Fixed Resource Leaks, null dereferences, few other issues reported by coverity 2014-07-04 16:17:58 +05:30
Daan Hoogland b2d613f536 CLOUDSTACK-6242: catching all to allow continuation on configuration 
error (CLOUDSTACK-7039 through CLOUDSTACK-7042)
 2014-07-03 08:41:47 +02:00
Prachi Damle 48574f2d60 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account 
Changes:
- removing unused imports
 2014-07-02 17:49:53 -07:00
Prachi Damle 9f68870a77 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account 
Changes:
-DeploymentPlanner should include disabled resources only when the VM owner is Admin account.
The disabled resources should be ignored when VM is owned by any other user.
 2014-07-02 17:49:51 -07:00
Alena Prokharchyk 324b5d5a57 CLOUDSTACK-7045: save started/completed events for createPrivateGateway and createStaticRoute apis 2014-07-02 17:23:35 -07:00
Nitin Mehta 1f7a818440 CLOUDSTACK-7000: Fix bugs in ListSnapshotPolicy and updateSnapshotPolicy command 
(cherry picked from commit 63c4f02897)
 2014-07-02 13:13:51 -07:00
Kishan Kavala 421d6029db Remove cloud-server dependency for cloud-usage project 2014-07-02 15:28:42 +05:30
Santhosh Edukulla 97d296bfbd Fixed Coverity reported performance issues like inefficient string concatenations, wrong boxing or unboxing types, inefficent map element retrievals 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-07-01 22:06:25 +02:00
Jayapal f45c9f9d2f CLOUDSTACK-7027: Removing left over static nat rule 2014-07-01 15:16:35 +05:30
Nitin Mehta 0c9c5a71b4 CLOUDSTACK-4364: Restore VM - log a usage event for newly created volume 2014-06-30 14:41:37 -07:00
Mike Tutkowski afd48819a6 Fixing an issue introduced with Review Request 22717 2014-06-27 14:03:08 -06:00
Hugo Trippaers 190116c94c Fix CID 1223793 Use equals to test equality of values contained in 
objects.
 2014-06-27 15:15:29 +02:00
Sanjay Tripathi 28505c2729 CLOUDSTACK-6884: List Capacity API always returns GPU capacity also even if type is different. 2014-06-27 15:58:42 +05:30
Nitin Mehta 80ef915fd5 CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command 
(cherry picked from commit fce21439fa)
 2014-06-26 11:38:41 -07:00
Hugo Trippaers cd0ef09344 Fix typo and add the right exception to the error map. 2014-06-25 15:51:28 +02:00
Hugo Trippaers 49b0936a72 Fix several potential issues reported by coverity. 2014-06-25 15:51:28 +02:00
Daan Hoogland 17850c7aff CLOUDSTACK-6747: call a more forgiving test on the supplied peer 
cidr-list
 2014-06-25 15:45:28 +02:00
Mike Tutkowski 3d9eaf0753 Fixed some spacing issues from 4d6c682f18 2014-06-24 15:27:06 -06:00
punith-cloudbyte 4d6c682f18 supporting nfs protocol and resize feature for managed storage for xenserver 
resize feature refactored

Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
 2014-06-24 15:16:45 -06:00
Nitin Mehta cb5e8c591f CLOUDSTACK-6987: Add support for storing metadata for snapshot policy and controlling policy using display flag 
(cherry picked from commit 5cf8edd7ec)
 2014-06-24 14:07:39 -07:00
Mike Tutkowski c344693e48 Inform the applicable storage plug-in's life cycle that capacity (bytes and/or IOPS) can be updated 2014-06-24 14:39:57 -06:00
Daan Hoogland c79ab570b0 Revert "CLOUDSTACK-6967: Initial OVM3 drop" 
This reverts commit 8a485b9b59.
 2014-06-24 10:24:01 +02:00
Funs 8a485b9b59 CLOUDSTACK-6967: Initial OVM3 drop 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e25)

Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js
 2014-06-23 12:39:10 +02:00
Anshul Gangwar 6416de5770 CLOUDSTACK-6968: allowing cluster scope volumes to attach to any VM. If migration is 
needed then first they will be migrated to appropriate cluster before attaching.
 2014-06-23 12:15:10 +05:30
Santhosh Edukulla 1c80185170 Fixed Resource Leaks, null dereferences, invalid value comparisons, invalid result set loop 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-21 12:38:46 +02:00
Min Chen a97455b602 CLOUDSTACK-6971: createAutoScaleVmProfile failed with NPE due to lack of bean 
injection.
 2014-06-20 14:28:26 -07:00
Kelven Yang 60f4203cbc Protect event interpretion from causing NPE exception 2014-06-20 10:16:04 -07:00
Anshul Gangwar 450d890942 CLOUDSTACK-6830: Fixed during VM migration, volumes on zone wide primary store 
requires storage migration resulting in failure of VM migration. This also improves
the hostsformigration api. Firstly we were trying to list all hosts and then
finding suitable storage pools for all volumes and then we were checking whether
vm migration requires storage migration to that host. Now the process is updated.
We are checking for only those volumes which are not in zone wide primary store.
We are verifying by comparing volumes->poolid->clusterid to host clusterid. If it
uses local or clusterids are different then verifying whether host has suitable
storage pools for the volume of the vm to be migrated too.
 2014-06-20 16:32:19 +05:30
Murali Reddy 7e355de365 CLOUDSTACK-6750: [OVS] With stretched network deploying vm in a ovs 
disabled zone does not fail

Fix ensures that connectivity service provider is enabled in the zone on
to which nework is being streched.
 2014-06-19 16:06:56 +05:30
Jayapal cc98d44542 CLOUDSTACK-6922: Updated events for firewall ingress and egress 2014-06-19 15:06:56 +05:30
Jayapal 2be26e03af CLOUDSTACK-6923: updated listLBStickinessPolicies API to list using stickinesspolicy id 2014-06-19 15:05:22 +05:30
Kishan Kavala 89854de18d CLOUDSTACK-6931: Set hypervisor.type in agent.properties using cloudstack-setup -t option. Default is kvm. 2014-06-19 11:31:23 +05:30
Prachi Damle 05c01a7dc9 CLOUDSTACK-6941: Can't choose storage for the volume, when attaching uploaded data volume to VM 
Changes:
- Only way to choose a certain storage pool is by using disk_offering_tags
- Added a parameter to take in a disk offering Id.
- Admin will have to create a custom sized disk offering and tag it as necessary for the user
- This custom offering Id should be passed during uploadVolume to associate the volume with this disk offering
 2014-06-18 16:37:43 -07:00
Min Chen 569e94908b CLOUDSTACK-6940:Templates cannot be downloaded from URLs without 
matching file extensions.
 2014-06-18 16:13:49 -07:00
Kelven Yang f529823566 Add ReflectionUse annotation for marking up *un-used* methods 2014-06-17 17:31:29 -07:00
ynojima 5be7fa23b4 refactor unused code in storagePoolHasEnoughIops method 2014-06-17 14:48:57 -06:00
Alena Prokharchyk 09a97e1968 CLOUDSTACK-6919: don't attempt to restart user vms having no Root volume attached 2014-06-16 14:59:52 -07:00
Santhosh Edukulla f89100ed72 CLOUDSTACK-6793 : Added fix 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2014-06-16 17:11:14 +05:30
Hugo Trippaers 0c28f36ff1 Fix a number of resource leaks reported by Coverity 2014-06-13 14:42:35 +02:00
Alena Prokharchyk 887f027a9a CLOUDSTACK-6907: lisVolumes - make a decision whether to set service or disk offering in the response, based on the DiskOfferingVO type entry, not the volume Type 2014-06-12 16:25:04 -07:00
Saksham Srivastava 505a7127b8 CLOUDSTACK-6812: Do not allow edit of storage.overprovision.factor for non supported types 2014-06-12 17:26:06 +05:30
Jayapal 923c0cd89f CLOUDSTACK-6899: Added vmId in listnics response 2014-06-12 17:18:08 +05:30
Santhosh Edukulla 93c75c73a4 CLOUDSTACK-6791 Fixed the issue 2014-06-12 16:48:44 +05:30
Rajani Karuturi 2482da8cbf Fixed few coverity issues unused assignments, boxing and unboxing of values etc. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-06-12 13:44:58 +05:30
Saksham Srivastava 41030e4e3e CLOUDSTACK-6654: Configkey parameters are not validated 2014-06-12 11:20:44 +05:30
Saksham Srivastava f2464e4182 CLOUDSTACK-6864: UploadSSlCert API requires double encoding of URL params 2014-06-12 10:35:47 +05:30
Nitin Mehta c2a0fb4e52 CLOUDSTACK-6895: 1. Populate firstclass entities as uuids in the context instead of dbids for performance. 
2. Add ctxDetails in the ParamGenericValidationWorker to avoid warning for api validation
3. Add some missing events.
4. Correcting mapping for ResourceObjectType.NetworkACL and ResourceObjectType.NetworkACLItem
(cherry picked from commit 8a9092c3cd)
 2014-06-11 15:24:56 -07:00
Harikrishna Patnala 522208dec2 CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance 2014-06-11 17:00:32 +05:30
Olivier Lemasle a5902f1db4 CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-06-10 03:11:35 -04:00
Tim Mackey a8212d9ef4 Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin 
Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-06-07 04:50:23 -04:00
Alena Prokharchyk ac1b4b0316 Fixed unittest 2014-06-05 18:37:56 -07:00
Koushik Das d34419579e CLOUDSTACK-6843: [Automation] List listServiceOfferings api fails with NPE 
Incorrect parameter name used in query building resulted in a bad sql query.
 2014-06-05 13:57:38 +05:30
Hugo Trippaers a59db987f9 Fix CID-1219920 Dereference before null check 2014-06-03 16:39:32 +02:00
Rohit Yadav eb8e630f24 AlertGenerator: Fix NPE from CLOUDSTACK-3272 
There was a commit 4b89a45e57 on master which was
added by "root@devcloud.apache.org" with no committer signature so I cannot tell
whom to reach. In the code it looks like they forgot to initialize the static
config dao variable which is causing NPE on master. The fix simply initializes
the s_configDao with injected configDao object.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2014-06-02 22:43:27 +05:30
Nitin Mehta 5393387bbd CLOUDSTACK-6599: 
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls
 2014-05-30 10:48:42 -07:00
Hiroki Ohashi 3256e88623 Allow usaage reporting on removed service offering 2014-05-29 19:12:11 +02:00
Upendra Moturi e9af5f44ae CLOUDSTACK-6223. removeNicFromVirtualMachine fails if another instance in another domain has a nic with the same ip and a forwarding rule configured on it 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-05-29 10:18:41 +02:00
Marcus Sorensen 7ce3034299 CLOUDSTACK-6790: Disable PXE ROM for system vm nics 2014-05-27 16:52:26 -06:00
Nitin Mehta a8140ff58c CLOUDSTACK-6787: Event Bus - uuids missing in some cases due to various reasons 2014-05-27 15:07:38 -07:00
Marcus Sorensen 20a31b43d6 CLOUDSTACK-6784: Expose data types via API so consumers of API can validate data 2014-05-27 15:23:23 -06:00
Marcus Sorensen 96055058b0 CLOUDSTACK-6785: changed async job param injectedjobid to customjobid and check for unique/uuid 2014-05-27 15:23:12 -06:00
Marcus Sorensen 2a5bf65c78 CLOUDSTACK-6785: Allow async jobs to supply an injectedjobid 2014-05-27 15:23:02 -06:00
Rajani Karuturi ce6a53e37b Fixed CLOUDSTACK-6756: usage id is not being returned for an ip in deleted ip range 
(cherry picked from commit a6ed48fc9c5f68b46f0d2e05adefc7263c4cd0d0)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-05-27 10:41:40 +05:30
Daan Hoogland 16bf065a0d CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router 2014-05-24 19:44:00 +02:00
Min Chen 8a1eed24b9 Fix AccountManager unit testcase. 2014-05-22 22:33:25 -07:00
Min Chen faa379b6c2 CLOUDSTACK-6752: IAM command class separation caused ApiDoc warning of 
duplicated cmd class for the same api name.
 2014-05-22 18:28:25 -07:00
Min Chen b259bccee7 CLOUDSTACK-6742: listVolumes - As regularuser , able to list Vms and 
volumes of other users.
 2014-05-22 18:28:00 -07:00
Min Chen ba848087f8 Disable IAM feature from 4.4 release. 2014-05-22 18:27:08 -07:00
Anthony Xu c0936fecbc fixed a typo 2014-05-22 15:47:28 -07:00
Anthony Xu df6ce24f43 if networkID is not specified, get one network with free ips. 2014-05-21 14:33:52 -07:00
Murali Reddy 17fe6cdda4 CLOUDSTACK-6721: VolumeApiServiceImpl is sending wrong type for 
updateAsyncJobAttachment

fix sends 'Volume' instead of 'volume'

Conflicts:
	server/src/com/cloud/storage/VolumeApiServiceImpl.java
 2014-05-20 17:13:20 +05:30
Murali Reddy 965346cad1 CLOUDSTACK-6712: NPE in findJobInstanceUuid() in ApiDBUtils 2014-05-20 10:26:12 +05:30
Nitin Mehta 667c8e7905 CLOUDSTACK-6699: listResouceDetails - enhance it to list by (key,value) pair - allowed to Admin only. 2014-05-18 23:21:37 -07:00
Sanjay Tripathi f789a03769 CLOUDSTACK-6678: API:MS: listCapacity returns; errorcode":530,"cserrorcode":9999,"errortext":"Index: 0, Size: 0"}. 2014-05-15 14:22:40 +05:30
Nitin Mehta afb31fa09f CLOUDSTACK-6660: Dont assume every vm will have a root volume now. 
(cherry picked from commit 076bbdcfe8)
 2014-05-14 15:00:34 -07:00
Sanjay Tripathi 35cd61c463 CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce. 2014-05-14 15:05:28 +05:30
Amogh Vasekar 9b6d430171 This patch disallows deleting / modifying system defined guest OS mappings 
Local env
1. Create user defined mapping
2. Delete / modify user defined mapping. Should pass
3. Delete / modify system defined mapping. Should fail

Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
 2014-05-12 22:45:24 -07:00
Sheng Yang 0a62eb8380 CLOUDSTACK-5501: Allow one vpn customer gateway with multiple connections 
This restriction was purposely avoid confusion of VPN setup, but later found too
strictly and cause troubles for deployment. Removed after testing one customer
gateway with multiple connections.
 2014-05-12 18:50:48 -07:00
Nitin Mehta 7ae784ba3c CLOUDSTACK-6633: listVolumes should return template/iso info for root volumes 2014-05-11 20:36:53 -07:00
Min Chen daadc45122 CLOUDSTACK-6628:[Automation] Create PF rulw API failing with error 
"database id can only provided by VO objects".
 2014-05-09 18:48:08 -07:00
santhosh 00fcd9fb20 Added fix for CLOUDSTACK-6548 
Signed-off-by: santhosh <santhosh.edukulla@gmail.com>
Signed-off-by: Daan Hoogland <daan@onecht.net>

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
 2014-05-09 17:14:06 +02:00
Min Chen 0f79223f28 CLOUDSTACK-6613:IAM: authorizeSecurityGroupIngress fails when SG Name is 
passed.
 2014-05-08 23:19:28 -07:00
Min Chen 51cb0f9a4a CLOUDSTACK-6598:IAM - listAccount() retrurns "Caller cannot be passed as 
NULL to IAM!" when domain deletion is in progress.
 2014-05-08 17:56:20 -07:00
Murali Reddy 2a175a2b02 CLOUDSTACK-6608:OVS distributed firewall: default ACL rule is not 
getting applied when a tier in VPC is created.

fix ensures, VpcRoutingPolicyUpdate is send when network rules are
programmed when network tier in VPC is created
 2014-05-08 15:58:02 +05:30
Daan Hoogland 3515c39cac Revert "CLOUDSTACK-6485: private gateway network should not be associated with vpc" 
This reverts commit 3bd594c584.

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
 2014-05-08 11:45:35 +02:00
Devdeep Singh 245b7f4c39 CLOUDSTACK-6510: Fix gson serialization exception in storage migration. Gson couldn't serialize 
a map with volume and storagepool objects for logging. Fixed by using volume and storage pool
ids instead of objects in the map.
 2014-05-08 12:23:46 +05:30
Alena Prokharchyk b7b89b1297 CLOUDSTACK-6601: added "forDisplay" parameter to listLoadBalancerRules API 2014-05-07 17:06:55 -07:00
Alena Prokharchyk 66d5ebc657 CLOUDSTACK-6596: UUID and display flag update support for LBStickinessPolicy and LBHealthCheckPolicy 2014-05-07 15:46:18 -07:00
Alena Prokharchyk 25ab05a189 CLOUDSTACK-6595: call expunge method marked with @ActionEvent from expunge thread context. So the action even EXPUNGE.VM is generated when vm is expunged by the thread. 2014-05-07 15:46:10 -07:00
Nitin Mehta 5388d349a4 CLOUDSTACK-6597: Updatevm - root admin should be allowed to change instance name 2014-05-07 14:34:01 -07:00
Murali Reddy e18ff2821d CLOUDSTACK-6593: Connectivity service capabilites should be matched with 
the provider only if at least one capability is specified

Fix avoids the check, and only if the createNetworkOffering
'StrechedL2'Subnet' capability is specified then it should match against
'Connectivity' service provider
 2014-05-07 20:05:47 +05:30
Jayapal d4f167032b Fixed vpc private gateway backend issues 2014-05-07 16:33:46 +05:30
root 4b89a45e57 CLOUDSTACK-3272 Latest changes to add global configuration parameters to control the publishing of events on the message bus 2014-05-07 10:09:03 +05:30
Alena Prokharchyk ee5f5591c7 CLOUDSTACK-6585: added missing metadata support for LBStickiness/LBHealthcheck policies 2014-05-06 17:13:50 -07:00
Kelven Yang 521ac796dd Move EventBus hookup on job framework to ApiServer to decouple job framework away from business logic related hookups. The decoupling is done through internal messaging facility provided inside management server. 2014-05-06 15:48:22 -07:00
Rajani Karuturi 59bf355919 CLOUDSTACK-6531: stopping the router in case of command failures. Also added alerts for failures. 
Signed-off-by: Jayapal <jayapal@apache.org>
 2014-05-06 20:08:30 +05:30
Jayapal 40836344de CLOUDSTACK-6578: Fixed issue in delete remote access vpn command 2014-05-06 20:08:30 +05:30
Jayapal b9b623bccc CLOUDSTACK-6577: Disable service monitoring in RVR 2014-05-06 20:08:30 +05:30
Jayapal 11591582d5 CLOUDSTACK-6364 Added ip address validation 
Also updated to assign vm primary ip to lb rule when vmid is passed virtualmachineid
and vm id ip details in vmidipmap
 2014-05-06 20:08:30 +05:30
Girish Chaudhari 0babb92d62 CLOUDSTACK-2697 Removed the clusterId as null from the alert message logs 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-05-05 19:10:17 +02:00
Tanner Danzey 601827e6b3 CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting 
modified:   server/src/com/cloud/api/ApiDBUtils.java

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-05-05 15:15:25 +02:00
Min Chen 4e674ffad1 CLOUDSTACK-6568:API:createVolume: Volume gets created with wrong domain 
ID.
 2014-05-02 17:47:06 -07:00
Mike Tutkowski 8ac7784db2 CLOUDSTACK-6170 Corrected an issue related to the "Reinstall VM" command and managed storage with VMware 2014-05-02 18:41:59 -06:00
Min Chen 7f595778ad Fix compilation error due to cherry-pick CLOUDSTACK-6569. 2014-05-02 16:01:13 -07:00
Min Chen 3314e11b70 CLOUDSTACK-6569: IAM - Regular user is able to listNetworks of another 
user in the same domain , by passing account and domainId.
 2014-05-02 14:58:11 -07:00
Alena Prokharchyk 15c4851fc9 LOUDSTACK-6475: cleanupVPC task - removed the transaction wrapping up multiple VPC destroy as the destroy operation has external calls, to prevent long-locked transaction. 
Reviewed-by: Prachi Damle
 2014-05-02 14:20:38 -07:00
Sam Schmit 81b4731e3b CLOUDSTACK-6472 listUsageRecords: Pull information from removed items as well, fixing NPEs/Null UUIDs with usage API calls. 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-05-02 16:27:21 -04:00
Laszlo Hornyak 178240a7da test for HighAvailabilityManagerImpl 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-05-02 21:22:43 +02:00
Laszlo Hornyak 726d8fc3fc test for escapeHTML 
- test added
- StringBuffer replaced with StringBuilder

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-05-02 21:19:49 +02:00
Laszlo Hornyak 78507c07c8 log exceptions in ConsoleProxyServlet 
- Added exception to the logger method parameters to make stack trace available
- removed checking of debug level, it does not save temporary object creation here

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-05-02 21:19:48 +02:00
Min Chen 134a7998ce CLOUDSTACK-6556: Deploy VM failing with error "does 
not have permission to access resource Ntwk".
 2014-05-01 15:57:29 -07:00
Min Chen d7c5382c58 CLOUDSTACK-6535: IAM:MS:API createVMSnapshot doesn't preserve access 
rights.
 2014-05-01 15:57:28 -07:00
Min Chen 95e9db2f91 CLOUDSTACK-6556: [Automation] Deploy VM failing with error "does not 
have permission to access resource Ntwk".
 2014-05-01 15:57:28 -07:00
Min Chen 2521fd482b CLOUDSTACK-6513: remove commented code. 2014-05-01 15:57:28 -07:00
Min Chen db9aee4517 CLOUDSTACK-6513: templateFilter=shared should not show self-owned 
template.
 2014-05-01 15:57:28 -07:00
Min Chen a9072a6612 CLOUDSTACK-6513: Optimize code by removing deprecated utility to 
QueryManagerImpl as private method just used for listTemplates and
listAffinityGroups to avoid misuse by new list APIs.
 2014-05-01 15:57:28 -07:00
Min Chen 5521581b6e CLOUDSTACK-6532:Affinity Groups - As admin user, not able to list all 
affinity groups available for regular users by passing account and
domainId paramater. This is to revert IAM way of implementing
listAffinityGroupsCmd, will bring it back when we have implemented real
impersonation.
 2014-05-01 15:57:27 -07:00
Laszlo Hornyak 94ab870d42 null pointer dereference fix 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-04-29 21:46:16 +02:00
Rajani Karuturi f4779b4d0c Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account 
Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java

Signed-off-by: Koushik Das <koushik@apache.org>
 2014-04-29 14:49:06 +05:30
Nitin Mehta dd55095fd5 CLOUDSTACK-6530: Populate the first class entities in the context to be available for publishing more information for the event bus, checking the displayable property etc. 
(cherry picked from commit 3e7ea4e8d9)
 2014-04-28 18:21:48 -07:00
Laszlo Hornyak fc68922286 Static resource compression 
- added compile time maven plugin to compress css and js files
- Added new StaticResourceServlet to serve the requests to static files, this replaces the tomcat DefaultServlet
- Tests
- mapping of the static resource servlet to css and js files

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-04-28 21:10:18 +02:00
Laszlo Hornyak ecec8d368d autounboxing fix in ConfigurationManager 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-04-28 20:56:45 +02:00
Min Chen 44ff7fea5f CLOUDSTACK-6513: IAM - Templates - When templates are listed with 
templatefilter="shared" is used , we see public templates also being
included in the list. This commit reverts listTemplates behavior to 4.3
old logic without using consistent interpretation of list parameters
adopted in new IAM model.
 2014-04-28 11:11:53 -07:00
Min Chen 3e4151e13e CLOUDSTACK-6512:IAM - Not able to list shared networks in the Vm 
deployment flow. This commit is to revert
ec5ee761d9 to still use old logic for
listNetworks to keep old behavior instead of new IAM model.
 2014-04-28 11:11:42 -07:00
Min Chen 6af1a2919b CLOUDSTACK-6501:IAM - DomainAdmin - When listVirtualMachines is used 
with listall=true and account and domainId , Vms owned by the account
account is not listed.
 2014-04-28 11:11:27 -07:00
Prachi Damle 9514c9e045 CLOUDSTACK-6349: IAM - No error message presented to the user , when 
invalid password is provided.

- AccountManager now works using accountId instead of accountType in
following methods too:
- isResourceDomainAdmin()
- isAdmin()
 2014-04-28 11:10:50 -07:00
Prachi Damle 797169457b CLOUDSTACK-6349: IAM - No error message presented to the user , when invalid password is provided. 
- AccountManager now works using accountId instead of accountType
 2014-04-28 11:09:12 -07:00
Daan Hoogland ca907d8d02 formatting 2014-04-28 15:50:05 +02:00
Daan Hoogland 3bd594c584 CLOUDSTACK-6485: private gateway network should not be associated with vpc 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-04-28 14:40:52 +02:00
Sanjay Tripathi 795a6e5fa0 CLOUDSTACK-6480: Creating Service Offering with Implict Dedication planner 
fails with message:  "Please specify the pciDevice and vgpuType correctly".
 2014-04-28 11:27:47 +05:30
Amogh Vasekar 05802004e2 In 4.3, SSL was turned off by default. 
However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties.

Local testing, checking a fresh install has the above property false by default.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2014-04-25 14:48:36 -07:00
Sebastien Goasguen 744e2a54e8 Review from pyr https://reviews.apache.org/r/20557/ 2014-04-25 16:59:47 -04:00
Amogh Vasekar 78c683f568 CLOUDSTACK-6437: 
Add ability to distinguish between user defined and system defined guest OS and mappings
Add default mappings for XenServer

Local testing with
1. Add new guest OS by API
2. Add new guest OS mapping by API
 2014-04-25 13:10:10 -07:00
Mike Tutkowski 2960ba733a CLOUDSTACK-6170 Updated logic to more accurately calculate how much space is currently allocated for a managed storage pool 2014-04-25 12:31:13 -06:00
Nitin Mehta 1d45b75298 CLOUDSTACK-6499: 
Made changes so that uploading custom certificate works for ssvm.
    1. Reboot ssvm only when private key is passed meaning the server cert is passed. This is because while uploading the server cert is the last to be uploaded. And we want to propagate the entire chain once uploading is done.
    2. Change the SecStorageSetupCommand sent to ssvm so that it also carries the root cert apart from having the chain and the server cert and key.
    3. Change ssvm agent code to be able to configure root cert to the java key store.
    4. Change ssvm configure ssl script to insert the chain certs correctly.
    5. Fix order of chain certificates for apache webserver in SSVM
    6. Remove double encoding and decoding for uploadCustomCertificate API from UI and server code respectively, so that API call without UI works fine
    7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL.
 2014-04-24 17:27:02 -07:00
Alena Prokharchyk 1e0d6716ca CLOUDSTACK-6436: listResourceDetails - don't return entries set with display=false, by default 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
 2014-04-24 14:35:46 -07:00
jeff 9c4de764f7 Add pre/post-state transition status to messages published on event bus by UserVmStateListener. Allow system VM resource state post-transitions to be published. 2014-04-24 20:05:26 +05:30
Alena Prokharchyk 9c4d20cb68 Revert "Return isolation methods as a part of listPhysicalNetworks call" 
This reverts commit 316f23ed5f.
 2014-04-22 18:06:46 -07:00
Alena Prokharchyk 316f23ed5f Return isolation methods as a part of listPhysicalNetworks call 2014-04-22 14:57:04 -07:00
Laszlo Hornyak e24bf73a96 new testcase for AccountManagerImpl.deleteUserAccount 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-04-22 22:47:05 +02:00
Laszlo Hornyak 9411e4517e Potential NPE dereference fix 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-04-22 22:47:05 +02:00
Laszlo Hornyak be8c6fe626 test for AccountManagerImpl 
- new test for disableUser
- unused code removed
- A redundant if branch removed - all branches are doing the same

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-04-21 10:25:16 +02:00
Sheng Yang 4620c27ebf CLOUDSTACK-6047: Make aggregation command timeout configurable 
In case some environments has different performance or we found some commands
would took too long to execute, one global configuration item is introduced to
specify "time out in seconds per one command in aggregation commands".

By default it's 3 seconds. If admin feel it's too long, it can be adjust to as
low as 1 seconds, which runs still well in my machine.

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-04-18 23:36:19 -07:00
Min Chen c4892c2692 Fix FindBugs bug. 2014-04-18 17:31:29 -07:00
Min Chen 82821daffc Fix listAccountsCmd logic to be consistent with new interpretation of 
listAll, isRecursive and domainId parameters.
 2014-04-18 17:24:00 -07:00
Alena Prokharchyk 6cfe248e2b Fixed NPE in listResourceDetalis logic 2014-04-18 16:32:05 -07:00
Min Chen 29f39149b1 Fix IAM list api implementation based on agreed interpretation for 
listAll, isRecursive, domainId and account.
 2014-04-17 18:33:22 -07:00
Min Chen c25332fc46 CLOUDSTACK-6429:distinguish the case where caller can see everything and 
the case where caller cannot see anything. Also change behavior to
default isRecursive to false if not specified.
 2014-04-17 18:33:08 -07:00
Min Chen cdd39a88ba CLOUDSTACK-5960: Remove another check preventing Domain admin and 
normal user from registering template in S3.
 2014-04-17 18:32:43 -07:00
Min Chen c4b0a1e2d9 CLOUDSTACK-6350: IAM - Listing of VM using uuid when owner account of 
this Vm is deleted results is VM not being returned.But list VM with
listAll=true is able to return this VM.
 2014-04-17 18:06:29 -07:00
Min Chen 5d59fc7f5a Fix RoleBasedQuerySelector to handle new listAll semantics. If 
listAll=true, show all resources that caller (or impersonater) has
ListEntry access type; otherwise, show all resources that caller (or
impersonater) has UseEntry access type.
 2014-04-17 18:06:07 -07:00
Min Chen 7796128372 Handle listAll flag in IAM buildAclSearchParameters. 2014-04-17 18:05:44 -07:00
Prachi Damle a0cd0c4d9d Changes while processing the @ACL annotation, to include only 1 object per parameter even if the parameter is tied to multiple interfaces in the @EntityReference 2014-04-17 17:54:19 -07:00
Min Chen da13165743 Change AccountManagerImpl.checkAccess to invoke SecurityChecker 
interface that takes multiple controlled entities.
 2014-04-17 17:53:01 -07:00
wrodrigues b3f18e7d74 implementation of the featured requests in the issue CLOUDSTACK-6139. 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-04-17 20:51:46 +02:00
Daan Hoogland a05718cb23 [DB-CHANGE] windows line endings 2014-04-17 20:51:04 +02:00
Sheng Yang 74fe010db3 CLOUDSTACK-6434: Make RvR advert_int configurable 
In some network environment, 1*3 seconds by default make RvR setup too
sensitive. A configurable parameter would be better for fitting different
network environments.
 2014-04-16 20:13:16 -07:00
Sheng Yang a554ebdf75 CLOUDSTACK-6432: Blocking DHCP server to service DNS outside network 
This would cover only DHCP only network since in basic and shared network, the
private IP used by VR and network may expose to outside.
 2014-04-16 19:13:23 -07:00
Sheng Yang 59a9db39b1 CLOUDSTACK-6433: Don't return success if only one of RvR successfully created 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
 2014-04-16 18:10:39 -07:00
Saksham Srivastava eb195d0575 CLOUDSTACK-6151: Local data disk with tag goes to the wrong local storage pool 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-04-16 16:19:08 +05:30
Ding Yuan c031eb7d38 CLOUDSTACK-6242: exception handling improvements 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-04-15 08:07:15 +02:00
Antonio Fornie f5ba020633 Fix: ParamGenericValidationWorker shouldn't be case sensitive 
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
 2014-04-14 10:05:19 -07:00
Marcus Sorensen 11f5bdd78d CLOUDSTACK-6191 Add support for specifying volume provisioning 
type (thin, sparse, fat) in disk/compute offerings.

Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski
 2014-04-10 09:23:04 -06:00
Kishan Kavala 26746feb39 CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated. 2014-04-10 14:45:15 +05:30
Kishan Kavala 16ab5ce76c CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails 2014-04-10 14:45:15 +05:30
Sanjay Tripathi 6a725c6795 CLOUDSTACK-6373: listHost API response is not listing all the details of vgpuType. 2014-04-10 14:08:32 +05:30
Sanjay Tripathi a195205d11 CLOUDSTACK-6366: add vgpuTypes details in vgpu_types table. 2014-04-09 18:23:50 +05:30
Harikrishna Patnala ecc71518a9 CLOUDSTACK-6253: Optimizing VR alerts getting algorithm In addition to this a new configuration parameter is added router.alerts.check.interval defaulted to 30minutes to check for alerts in Virtual Router 2014-04-09 18:12:20 +05:30
Sanjay Tripathi 2ae9da8d47 CLOUDSTACK-6357: Not able to select GPU card in case of GPU-passthrough. 2014-04-08 22:10:09 +05:30
Jayapal e6e4fe4d26 CLOUDSTACK-6353 Fixed listing vm ip details for lb rule 2014-04-08 12:56:02 +05:30
Jayapal 78a29c0d41 CLOUDSTACK-6327 updated uuid to id mapping 2014-04-07 18:03:57 +05:30
Sanjay Tripathi 2530bf9658 CLOUDSTACK-6345: Non gpu enabled VMs are getting deployed in gpu enabled Hosts. 2014-04-07 15:43:46 +05:30
Daan Hoogland e97e65bff0 findbugs: toArray of the right type, not Object[] 2014-04-05 10:14:54 +02:00
Min Chen 94ebc90877 Remove usage of sameOwner checkAccess invocation, and convert to 
OperateEntry IAM check.
 2014-04-04 16:38:29 -07:00
Prachi Damle a509f94544 Adding SecurityChecker list for the ParamProcessWorker 2014-04-04 16:38:29 -07:00
Prachi Damle 897e0d3abe SecurityChecker can accept multiple ControlledEntity 2014-04-04 16:38:29 -07:00
sbalineni 0560254c04 internal lb support for contrail vpc 
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
 2014-04-04 15:36:09 -07:00
Jayapal b94a982618 CLOUDSTACK-6327: Updated the removeFromLoadBalancerRule and listLoadBalancerRuleInstances API 
Updated these APIs to use VM primary/secondary details on LB rule.

listLoadBalancerRuleInstances API lists the vm ips which are assigned to lb rule when passed
listlbvmips
removeFromLoadBalancerRule is updated to remove the spcific vm ip entry assinged to LB rule.
Added new param vmidipmap to this API
 2014-04-04 18:42:03 +05:30
Alena Prokharchyk 375c799a24 Added missing license header to the unittest 2014-04-03 16:02:49 -07:00
Alena Prokharchyk 3a889aa217 CLOUDSTACK-3886: Volume attach/detach implementation for ROOT disk 
Implemented for Xen hypervisor only by now
Unittests are included
 2014-04-03 11:39:56 -07:00
Kelven Yang 66bece5906 Don't let VMsync touch the VM if VM has been scheduled for HA but HA is not yet running. 2014-04-02 14:58:35 -07:00
Gabor Apati-Nagy 883d7f17f7 Value of Global parameter "custom.diskoffering.size.min" is not reflected in UI during new instance creation. 
Added fields to /api and /server classes for CustomDiskOfferingMinSize
to be available in CapabilitiesResponse. Fixed UI code in Instance
Wizard to have this config value as the minimum selectable option when
we are in custom disk size mode.
 2014-04-01 10:57:36 -07:00
Edison Su 25a6234a5b fix build 2014-03-28 16:24:45 -07:00
Edison Su 504a6cdee2 CLOUDSTACK-5432:sync vm and storage commands on mgt server for kvm 
Conflicts:

	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/hypervisor/KVMGuru.java
 2014-03-28 16:24:07 -07:00
edison d4c7574f12 CLOUDSTACK-5831: Fix NPE, in case the volume isn't attached to any pool 2014-03-28 16:23:27 -07:00
Edison Su 7c04aa6115 CLOUDSTACK-5831: return quiescevm field in volumeresponse 
Conflicts:

	api/src/org/apache/cloudstack/api/response/VolumeResponse.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
 2014-03-28 16:23:19 -07:00
edison 550834e4b9 CLOUDSTACK-5763: if vm is stopped, then don't check hypervisor support live storage migration capabilities. 2014-03-28 16:23:09 -07:00
edison 5bfef62ab0 CLOUDSTACK-5607: Don't delete the template if its stored in other zones. 2014-03-28 16:22:57 -07:00
edison 8583b70f2a CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed. 2014-03-28 16:22:49 -07:00
Edison Su 6b7994512d CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage 
Conflicts:

	api/src/com/cloud/storage/StoragePool.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2014-03-28 16:22:16 -07:00
Edison Su b38dbc64db CLOUDSTACK-6245: the security group rule is lagging behind the rules in DB, due to there is a worker thread launched inside a transaction Reviewed-by: Alex 
(cherry picked from commit d4fdc184fe)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>

Conflicts:

	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
 2014-03-28 16:21:50 -07:00
Edison Su 7416988c58 CLOUDSTACK-4506: fix NPE in case hostid is null 
Conflicts:

	server/src/com/cloud/capacity/CapacityManagerImpl.java
 2014-03-28 16:14:46 -07:00
Prachi Damle 4e61e49143 CLOUDSTACK-6303 [Automation] [UI] Account creation hang in UI 
Changes:
- Caused due to a MySql error during 'Project' account cleanup. The MySql error hits a deadlock bug in the MessageBus code that does not release the lock/decrement the counter Eventually all callers on the MessageBus end up waiting to enter
- This fixes the account cleanup MySql error.
 2014-03-28 14:35:00 -07:00
Laszlo Hornyak 05c9d54c4f removed Integer and Long instantiations 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-28 18:40:25 +01:00
Daan Hoogland 8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Anshul Gangwar e3e452625e CLOUDSTACK-6267: unblocking smb as zone wide primary storage for hyperv 
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
 2014-03-27 16:24:40 +05:30
Anthony Xu d14f66f58d when start vm times out, check VM status, if it is running , return succeed. 
change XAPI timeout to 60 second.
 2014-03-24 17:15:08 -07:00
Anthony Xu 726dd16daa use vm instance name in log 2014-03-24 16:24:55 -07:00
Anthony Xu bf48309e14 addHostCmd will try to load all hosts in a pool 2014-03-24 16:06:26 -07:00
Laszlo Hornyak c6d2549939 StringBuffer replaced with StringBuilder in ApiServerService 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-24 21:04:06 +01:00
Laszlo Hornyak aef76f71ec StringBuffer replaced with StringBuilder in ApiServlet 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-24 21:03:48 +01:00
Laszlo Hornyak 843464efc8 removed commented-out code 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-24 19:05:47 +01:00
Laszlo Hornyak 96d56b7525 Tests for ApiServlet 
- tests for login
- loginSuccessResponse test for xml and json

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-24 19:05:47 +01:00
Jayapal fb498a40ba CLOUDSTACK-6250: updated review comments, added unit test case 2014-03-24 17:54:54 +05:30
Damodar Reddy 93c46c9be8 CLOUDSTACK-6105: Initial version Windowsfication of the management server 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2014-03-24 10:54:46 +05:30
Laszlo Hornyak 265208a261 Basic tests for ApiServlet 
new tests for ApiServlet covering
 - utf8Fixup
 - some of processRequestInContext

minor cleanup done in StringBuffer handling and utf8Fixup got a bit shorter

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-22 18:34:46 +01:00
Laszlo Hornyak 3dc4d2ec21 Removed commented-out code 
A big block of code commented out for about a year.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-22 18:34:46 +01:00
Laszlo Hornyak dd225684f4 new unit test for ApiResponseHelper 
- unit test for getDateStringInternal
- StringBuffer replaced with StringBuilder, string concatenation replaced with append

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-22 18:34:46 +01:00
Laszlo Hornyak 2c4ac5e4d3 removed some redundant Boolean isntantiations 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-22 18:34:45 +01:00
Mike Tutkowski 7629d6f129 CLOUDSTACK-6170 2014-03-20 23:54:53 -06:00
Min Chen ea2ee15214 Add newly separated admin cmd class in ManagementServerImpl.getCommands. 2014-03-20 16:42:31 -07:00
Min Chen a1831bc864 Revert "CLOUDSTACK-6170" due to unit test failure. 
This reverts commit 50b5e2e247.
 2014-03-20 16:40:45 -07:00
Mike Tutkowski 50b5e2e247 CLOUDSTACK-6170 2014-03-20 16:52:52 -06:00
Jayapal d38cab879b CLOUDSTACK-6250 Review comments fixes for CLOUDSTACK-2692 2014-03-20 17:22:28 +05:30
Murali Reddy 2b51207510 persist fact that network can span multiple zones, if network offering 
has strechedL2Subnet capability and return the zones in which
network spans in the networkreponse object
 2014-03-20 17:01:33 +05:30
Murali Reddy d2d54a9463 region level VPC support 
introduce 'RegionLevelVpc' as capability of 'Connectivity' service. Add
support for CreateVPCOffering to take the 'regionlevelvpc' as capability
of service 'connectivity'.

introduces new capability 'StretchedL2Subnet' for 'Connectivity'
service. Also add support to createNetworkOffering api to allow
StretchedL2Subnet capablity for the connectivity service.

adds check to ensure 'Connectivity' service provider supports
'StretchedL2Subnet' and 'RegionLevelVpc' capabilities when specified in
createNetworkOffering and createVpcOffering respectivley

enable ovs plug-in to support both StretchedL2Subnet and RegionLevelVpc
capabilities

make zone id optional parameter in createVpc, zone id can be null only
if vpc offfering supports region level VPC

in region level vpc, let the network/tier to be created in any zone of
the region

keep zoneid as required param for createVpc

skip external guest network guru if 'Connectivy' service is present in
network offering

fix build break in contrail manager

permit VM's to be created in different zone that in which network is
created if the network support streched L2 subnet

add integration tests for region level VPC

rebase to master

Conflicts:
	setup/db/db/schema-430to440.sql

Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	engine/schema/src/com/cloud/network/vpc/VpcVO.java
	setup/db/db/schema-430to440.sql
 2014-03-20 16:32:22 +05:30
Murali Reddy c838f3abb8 fix scripts that handle setting up bridge for tunnel network and for 
distributed routing. Fix ensures there is approproate flag in other
config of the network to indicate the bridge type.

Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2014-03-20 16:30:07 +05:30
Prachi Damle c3ee01cca1 More changes to support 'readOnly' access 2014-03-19 11:00:23 -07:00
Jayapal 289ac0465c CLOUDSTACK-6240 Fixed updating advanced SG rules for vm nic secondary ip 2014-03-19 15:46:15 +05:30
Min Chen 6e034cad03 Refactor listNetworks logic to use new IAM model. 2014-03-18 17:02:22 -07:00
Kelven Yang ce1e53f451 Fix style-check issue after cherry-picks 2014-03-18 17:00:08 -07:00
Kelven Yang d9506d2a05 Let VMSync be aware of HA take-over on VM state management. 2014-03-18 16:45:45 -07:00
Nitin Mehta 5d19a936a2 CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature 
Work done for network offering.
 2014-03-18 14:00:55 -07:00
Nitin Mehta 7442b56fa8 CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature 
And when the flag is updated on the resource accordingly generate usage events again.
Also when display flag is false in deployvm cmd it should be false for the volumes associated with the vm as well
 2014-03-18 14:00:25 -07:00
Min Chen 22eb5eb2d6 Fix a regression caused by IAM search criteria refactor on VPC. 2014-03-18 10:41:55 -07:00
Marcus Sorensen d638d04cbf CLOUDSTACK-6181: Merge of resize root feature (resize-root branch) 2014-03-14 07:17:33 -06:00
Min Chen ae1d6a771b Remove IAMEntityType to use existing VO interface class to annotate 
entityType.
 2014-03-17 17:19:55 -07:00
Alena Prokharchyk 78a04c5315 CLOUDSTACK-6235: listSystemVms - retrieve vlan info of EIP address only when ip address can be found in the DB 2014-03-16 16:29:56 -07:00
Alena Prokharchyk d9e1c9c502 CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately 
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2014-03-14 11:57:58 -07:00
Daan Hoogland 3aee404a49 findbugs: removed unused variable 2014-03-14 18:50:43 +01:00
Jayapal 384eeaf792 CLOUDSTACK-2692 Assigning LB rule for vm nic secondary ips 2014-03-14 22:47:17 +05:30
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Saksham Srivastava 48f8a95b06 CLOUDSTACK-6092: Storage OverProvisioning as a Per Primary Basis Allow storage.overprovisioning.factor to be specified at storape pool level. 
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2014-03-14 12:16:46 +05:30
Rajesh Battala 1b4325d2c8 CLOUDSTACK-6106 supporting VPC VR on Hyper-V 2014-03-14 17:36:43 +05:30
Murali Reddy 794b38a789 fix unit-test failure 2014-03-14 17:19:27 +05:30
Murali Reddy 423a748807 adds hypervisor script to convert JSON routing polcies (ACL) config in 
to flow rules and applies them on the bridge

add event subscriber in OvsTunnelManager, that listens to
replaceNetworkAcl events. On event sends the updated policy info to all
the hosts in the VPC
 2014-03-14 16:56:37 +05:30
Murali Reddy 2c7786992f some bug fixes 2014-03-14 16:56:37 +05:30
Murali Reddy e045883c52 introduce OvsNetworkTopologyGuru that has convinenace functions to 
- get the hosts on which VPC spans given vpc id
   - get the VM's in the VPC
   - get the hosts on which a network spans
   - get the VPC's to which a hosts is part of
   - get VM's of a VPC on a hosts

introduces capability to build a physical toplogy representation of a
VPC. This json file is encapsulated in
OvsVpcPhysicalTopologyConfigCommand, and is used to send full topology
to hypervisor hosts. On hypervisor this json config can be used to setup
tunnels, configure bridge, add flow rules etc

Ovs GURU, to use different broasdcast scheme VS://vpcid.gerkey for the
networks in VPC that use distributed routing

each VIF and tunnel interface to carry the network UUID in other/options
config
 2014-03-14 16:56:37 +05:30
Murali Reddy 32ac021043 make Ovs as VPC provider 2014-03-14 16:56:36 +05:30
Murali Reddy 3139b35518 mark VPC to be using distributed router if VPC offerign supports 
distributedrouter capability.
 2014-03-14 16:56:35 +05:30
Murali Reddy e3ec12e5d0 -add check to ensure 'Connectivity' service provider specified in 
createVpcOffering actually supports 'DistributedRouter' capability

- enable OVS to support 'DistributedRouter' capability
 2014-03-14 16:56:35 +05:30
Murali Reddy 7c4443e233 -introduces 'DistributedRouter' as capability to 'Connectivity' service. 
-create VPC offering to permit 'DistributedRouter' as capability to
connectivity service
 2014-03-14 16:56:35 +05:30
Devdeep Singh 2aff39f8c7 CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared 
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
 2014-03-14 16:27:58 +05:30
Harikrishna Patnala f7337527cf CLOUDSTACK-6090: Virtual Router Service Failure Alerting 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-03-14 15:14:15 +05:30
Sanjay Tripathi 6a5d3e96c9 CLOUDSTACK-6238: NPE in HostStatsCollector. 2014-03-14 13:37:19 +05:30
Kelven Yang 42d637376b Handle a race-condition in VirtualNetworkManagerImpl.java in the process of starting it parallelly. 2014-03-13 16:59:56 -07:00
Kelven Yang 3123c30f23 BUG-ID: CS-19196: Relax HA work termination rule on exceptions. It could cause premature HA termination due to unhandled exceptions. Reviewed-By:Anthony 2014-03-13 16:59:56 -07:00
Kelven Yang 7fa4715b99 perform VM HA based on agent state report. 2014-03-13 16:59:56 -07:00
Kelven Yang 6ad245e675 Restore to old HA logic, but suppress VM state change on resource state report to avoid interferring HA. 2014-03-13 16:59:56 -07:00
Kelven Yang 4312d88462 HA manager to check target state of the VM to make decisions on whether or not to carry on a cheduled step. Fix NPE in capacity manager when releasing capacity of a stopped VM. 2014-03-13 16:59:56 -07:00
Kelven Yang 3d5fbe7073 move HA rescheduling operation to HA worker context. 2014-03-13 16:59:56 -07:00
Min Chen 8ff94601f1 Merge branch 'rbac' to master 2014-03-13 16:42:22 -07:00
Alena Prokharchyk 6c23e201ad 1) More fixes for the problems found by findBugs 
2) Corrected some logging in  MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
 2014-03-13 16:05:45 -07:00
Prachi Damle 36c0a4e2c3 Removed the AccessType.UseNetwork - replaced all referrences by AccessType.UseEntry 2014-03-13 15:32:38 -07:00
Min Chen 84a528fad6 Merge branch 'master' into rbac 2014-03-13 14:52:37 -07:00
Alena Prokharchyk 90c485e5d6 Fixed some problems reported by FindBugs 2014-03-13 13:45:30 -07:00
Prachi Damle d9696b26e1 After merge, fix isRootAdmin() calls to use accountId instead of type 2014-03-13 13:28:40 -07:00
Alena Prokharchyk df85211945 Removed unused imports and instance vars from FirstFitAllocator 2014-03-13 11:05:37 -07:00
Min Chen 99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
Antonio Fornie 39e5b768e8 More generic parameters that are not unknown 
Adding some more parameter names that should not be considered unknown since they belong to general use paramters

Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
 2014-03-13 10:40:14 -07:00
Alena Prokharchyk 1b83698dac deployVm/startVm APIs: ability to define deploymentPlanner for VmToStart in the api call (available to ROOT admin only) 2014-03-13 10:23:34 -07:00
Koushik Das 5779292e93 CLOUDSTACK-6052: List VM enhancement to support querying with multiple VM IDs 
New parameter 'ids' added to listVirtualMachine API. The syntax looks like
http://localhost:8096/api?command=listVirtualMachines&listAll=true&ids=eddac053-9b12-4d2e-acb7-233de2e98112,009966fc-4d7b-4f84-8609-254979ba0134
The new parameter will be mutually exclusive with the existing 'id' parameter.
 2014-03-13 17:05:35 +05:30
amogh.vasekar 3ee1fc28de CLOUDSTACK-6217: 
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same

Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
 2014-03-12 17:03:38 -07:00
Alena Prokharchyk 40192cd8a1 CLOUDSTACK-6235 - return gateway/netmask of publicVlan, along with the EIP information, for system vms in EIP/ELB setup 2014-03-12 15:11:01 -07:00
Daan Hoogland b5c8a56eea CLOUDSTACK-6232 allow expansion of ip on isolated networks as well 2014-03-12 19:36:11 +01:00
Daan Hoogland 6c035240ba check-style: tabs to spaces 2014-03-12 18:04:22 +01:00
Daan Hoogland 5685d14537 [CLOUDSTACK-6232] bridging allowed in isolated networks 2014-03-12 17:47:55 +01:00
Sheng Yang 467986321a CLOUDSTACK-6047: Enable VR aggregation commands for VPC 2014-03-11 16:14:33 -07:00
Sheng Yang f45de30d1b CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot 2014-03-11 13:04:26 -07:00
Min Chen b554d4ac1f Fix issues found through FindBugs. 2014-03-11 11:49:48 -07:00
Kishan Kavala c63f43a9cc CLOUDSTACK-6122: Add LXC to supported hypervisor list for VPC 2014-03-11 23:49:28 +05:30
Sanjay Tripathi c7d31fe288 CLOUDSTACK-4760 : Enabling GPU support for XenServer. 
CLOUDSTACK-4762 : Enabling VGPU support for XenServer.

This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors.
 2014-03-11 15:44:51 +05:30
Nitin Mehta 33a0dec965 CLOUDSTACK-6221: 
Publish first class objects involved in an operation (for now vm uuid) on the event bus . Example -  during attach/detachIso along with iso id, vm id should be available as well.
 2014-03-10 16:22:34 -07:00
Alena Prokharchyk bf9375b8b9 CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state 
Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java

Conflicts:
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
 2014-03-10 11:42:24 -07:00
Daan Hoogland d182a51162 findbugs: another array pointer in error message 2014-03-10 13:21:13 +01:00
Daan Hoogland e0d20fb6eb findbugs: null check before use of pointer 2014-03-10 13:08:15 +01:00
Daan Hoogland 579cb9c479 findbugs: output vlanids in errormessage instead of array object pointer 2014-03-10 13:04:10 +01:00
Daan Hoogland 0aca7cfab6 unneeded imports removed 2014-03-10 10:56:37 +01:00
Daan Hoogland 2386ad73da rat 2014-03-10 10:54:31 +01:00
Daan Hoogland 1075bed06c findbugs: String for Service type mismatch (plus test for dummy data) 2014-03-10 10:44:10 +01:00
Daan Hoogland 07102b400f findbugs: scope and final to mitgate possible abuse of fields 2014-03-10 09:39:35 +01:00
John Kinsella 09c375379d CLOUDSTACK-6204: removing realhostip dependency 
Moving default transport for console proxy, SSVM to http.

See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.

jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.

Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
 2014-03-09 13:46:57 -07:00
Nitin Mehta ded7e682dc CLOUDSTACK-5478: Enable publishing uuid for all the async apis in the CallContext. 
The advantage would be that event publishing can pick up the uuid and publish them.
 2014-03-07 16:50:21 -08:00
Alena Prokharchyk 7b0c5cfcbe Removed unused methods from BaseCmd class. Moved some helper methods to AccountManagerImpl class 2014-03-07 11:33:10 -08:00
Daan Hoogland c257fb0e3e rats 2014-03-07 19:27:58 +01:00
Antonio Fornie c211f0bbbe Dispatcher corrections, refactoring and tests 
Corrects problems from previous attempt. Fixes based on help comments from
the community and conflict resolution

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-03-07 19:12:07 +01:00
Sheng Yang 60dc25450a CLOUDSTACK-6047: Introduce Aggregated commands queue to VR 2014-03-06 16:22:01 -08:00
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Mike Tutkowski 9b66866dc2 CLOUDSTACK-6170 2014-03-06 13:01:11 -07:00
Nitin Mehta 830328b63d CLOUDSTACK-6199: Hide action events for Vm/Volume commands when the resources have display flag=0. 
Introduce generic BaseAsync(Vm/Volume)Cmd to make get the flag value for logging action events.
Rename the db field as display rather than display_event in keeping with the convention
 2014-03-05 16:40:44 -08:00
Alena Prokharchyk d1c0b81dc1 CLOUDSTACK-6205: VPC VR start - when create guest nics for the VR, consider networks not only in Implemented state, but in Setup state as well 2014-03-05 15:39:34 -08:00
Mike Tutkowski b06e66c50a CLOUDSTACK-6170 2014-03-05 13:55:12 -07:00
Min Chen 793becf524 CLOUDSTACK-5920: Add some interface methods and constants required by 
IAM.
 2014-03-05 09:40:55 -08:00
Min Chen d0ae4d9a9f CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM 
entity type.
 2014-03-05 09:40:55 -08:00
Marcus Sorensen b8413b9413 CLOUDSTACK-6194: Failed to increase Shared network IP Range 
Submitted-by:Saksham Srivastava <saksham.srivastava@citrix.com>
 2014-03-04 22:19:08 -07:00
Prachi Damle 695d689de5 Adding annotations for more admin APIs 2014-03-04 18:14:05 -08:00
Alena Prokharchyk 5a8d165afa CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic 
Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 2014-03-04 15:37:52 -08:00
Nitin Mehta 339c4f4c3f CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature. 
For root admin - s/he should be able to see all the events despite the value of the flag.
 2014-03-04 14:59:30 -08:00
Alena Prokharchyk bbf5a912c6 list* APIs - added parameter helping to filter by "display" flag (available to ROOT admin only) 2014-03-03 14:37:46 -08:00
Prachi Damle a837ac8873 Adding Operate access check at service layer, since we are not checking access on the command parameter here 2014-03-03 13:35:19 -08:00
Alena Prokharchyk fd43cf1516 Revert "CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information" 
This reverts commit ebcaec8632.
Reverting as it breaks API compatibility
 2014-03-03 12:44:08 -08:00
David Grizzanti ebcaec8632 CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2014-03-03 11:02:34 +01:00
Kelven Yang 90262a81ec Do not do investigation for SSVM/CPVM agent host upon disconnect. 2014-02-28 15:36:00 -08:00
Kelven Yang 0c48f70762 pass over volume info through job boundary for all volume related tasks, since volume record may be re-created. 2014-02-28 15:36:00 -08:00
Kelven Yang 7ce5e5b1fb Add VM level HA for hypervisors that are not integrated with native HA with CloudStack, i.e., Xen/KVM. 2014-02-28 15:35:59 -08:00
Kelven Yang 537bf7ced1 add job path to help associate an API job to related internal job. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang ee2adab7c7 reboot VR if a out-of-band power-on event is detected 2014-02-28 15:35:58 -08:00
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 83bef78390 Fixed unittest 2014-02-21 14:29:00 -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
Hugo Trippaers 97bad4f9b3 Fix checkstyle and license issues 2014-02-14 18:37:47 +01: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 9e92197dfd Fixing Build after merge 2014-02-04 15:10:24 -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 72c0f1a617 Remove trailing whitespace 2014-02-03 18:28:09 -08:00
Prachi Damle cb4d3a3c54 Support deleteAffinitygroup - remove access 2014-02-03 18:22:57 -08:00
Prachi Damle 022b9b8f80 Add access for domain wide createAffinityGroup 2014-02-03 18:14:56 -08:00
Prachi Damle 939b15169c changes to support the domain wide resources for Network 2014-02-03 17:34:03 -08:00
Alena Prokharchyk ea355d7383 listSslCerts: removed an exception thrown when there is no certificate mapped to the lbId specified in the list* command. Exception in the list* command should be thrown only when id specified in the command, is invalid CS id, but never in the case when we can't find data satisfying search criteria. In this case we just return empty list 2014-02-03 17:20:28 -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 af14699c4c fixing the build _ AffinityGroup command changes 2014-01-23 18:17:43 -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 6c1849f4bf Fix Spring wiring issues in starting up MS. 2014-01-14 16:20:30 -08:00
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
Ian Southam f8681de07c Invalid reference to a class which has been moved 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-01-14 15:13:12 +01: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 f1ecd9ed31 Removing the AclServiceImpl old bean entry 2014-01-11 01:01:00 -08:00
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
Hugo Trippaers 7c8facf3c9 Change checkstyle to run on every sub project, so it will also run when you build an individual module 2014-01-09 17:00:11 +01:00
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 cca60cd86d fix network ACL unit test 2013-12-23 17:27:16 +05:30
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 83bbe682d9 CLOUDSTACK-5281: 
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
 2013-12-20 17:42:45 -08:00
Nitin Mehta edc1b78d84 Revert "Revert "CLOUDSTACK-5281:"" 
This reverts commit ab37009e90.
 2013-12-20 17:30:05 -08:00
Alex Huang ab37009e90 Revert "CLOUDSTACK-5281:" 
This reverts commit 6b62a04eaf.
 2013-12-20 17:23:33 -08:00
Alex Huang c2baed665b Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies 2013-12-20 17:21:34 -08:00
Nitin Mehta 6b62a04eaf CLOUDSTACK-5281: 
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
 2013-12-20 16:58:43 -08:00
Nitin Mehta f083f91b0b CLOUDSTACK-5281: 
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
 2013-12-20 15:33:37 -08:00
Alena Prokharchyk 1832cf6660 CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet. 2013-12-20 13:39:13 -08:00
Edison Su 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
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
Edison Su d1a14fbf95 disk resize NPE, if the new disk offering doesn't have tags, then NPE 2013-09-25 16:29:01 -07:00
Edison Su 49d8e44491 CLOUDSTACK-4459: one more try, bypass libvirt to find volume if libvirt call failed 
Conflicts:

	server/src/com/cloud/template/TemplateManagerImpl.java
 2013-09-25 16:16:10 -07:00
Edison Su a82b179878 add table lock on snapshot, during taking snapshot 
Conflicts:

	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
 2013-09-25 16:03:59 -07:00
Edison Su 7b6aebc102 add test 
Conflicts:

	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
 2013-09-25 15:58:46 -07:00
Edison Su b3ac12e171 delete snapshot_store_ref if the snapshot is in error state 2013-09-25 15:51:55 -07:00
Abhinandan Prateek 77bec4f2ad Cloudstack-2997: the maxconn setting is masked by wrong conditions 2013-09-25 21:09:24 +05:30
Prachi Damle 4294005142 Check if an Account belongs to RootAdmin group 2013-09-24 17:01:43 -07:00
Prachi Damle aba54356d5 Account_Type Refactoring for Root Admin Role 
- change the AccountService::isRootAdmin(short) to  isRootAdmin(long accountId);
- Change all callers
- Change all places that check the account.getType() directly to call the AccountManagerImpl.
 2013-09-24 15:31:09 -07:00
Wei Zhou 98c79cc313 CLOUDSTACK-4732: search network name for virtual router when listRouters by keyword 2013-09-24 15:01:14 +02:00
Wei Zhou e61f1bb158 fix issue: listHosts with hahost throws exception 
(cherry picked from commit a206f423a3)
 2013-09-24 11:59:35 +02:00
Alena Prokharchyk 2fa5a5ae97 CLOUDSTACK-4704: 41-42 db upgrade - populate vpc_service_map table with the services/providers supported by VPC 
(cherry picked from commit 798f34a49c)

Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
 2013-09-23 14:18:41 +02:00
Abhinandan Prateek c7cc79181b Revert "Cleanup DefaultUserAuthenticator and removed masking _name variable" 
This reverts commit 4d01ce8fc7.
 2013-09-20 19:33:50 +05:30
Darren Shepherd 4d01ce8fc7 Cleanup DefaultUserAuthenticator and removed masking _name variable 2013-09-20 17:40:00 +05:30
Alena Prokharchyk 94e744fe0c CLOUDSTACK-4573: fixed decrement resource count for VPC networks 2013-09-19 17:20:22 -07:00
Laszlo Hornyak 88954053c3 do not instantiate Long just for toString 
replaced Long object instantiation with static call to Long.toString in case it was only to generate a string

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-09-19 16:58:59 +02:00
Daan Hoogland 284742ad11 add networkofferid to search network for 2013-09-19 16:26:46 +02:00
Kelven Yang b6d448d1fd apply https://reviews.apache.org/r/14189/ - UserVmDomRInvestigator and ManagementIPSystemVMInvestigator mask adapter name 2013-09-18 17:58:31 -07:00
Prachi Damle 62d60c2b77 CLOUDSTACK-4664: [ZWPS] High delay to start a stopped VM which has ROOT/DATA volumes migrated to Second Zone wide primary Storage(More than 10 mins) 
Changes:
- DeploymentPlanningManager needs to reuse the zone wide primary storage pool when VM's volume is READY
 2013-09-18 16:52:07 -07:00
Prachi Damle 7416383fcd CLOUDSTACK-4651: Restarting management server when volume Snapshot is still in progress for root volume of a VM , then there is no way to restart VM since the startVM job is stuck forever since the volume is in "Snapshoting" state. 
Change:
-If no volume of the VM is usable, VM cannot be deployed or started. Atleast ROOT volume should always be in usable state to start up the VM
 2013-09-18 16:52:04 -07:00
Alena Prokharchyk d34b79c970 CLOUDSTACK-4573: fixed resource limit check when acquire public IP in VPC - update resource count for VPC public ip even when network_id is not set yet. 2013-09-18 14:43:42 -07:00
Daan Hoogland 2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Kelven Yang 832db1b398 Apply https://reviews.apache.org/r/14084/ 2013-09-17 16:29:48 -07:00
Kelven Yang 5820b071b8 CLOUDSTACK-4659: Add the missing feature back for GC VMware worker VMs 2013-09-17 14:06:52 -07:00
Min Chen 22c5ea0ebe CLOUDSTACK-4671:ListZone API failed with Assertion error if assertion is 
turned on for MS.
 2013-09-13 17:21:24 -07:00
Laszlo Hornyak cb3a3da75d simplify setCpuUsed 
- variables inlined
- cpu utilization is not cast to float from double

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-09-11 21:33:02 -07:00
Laszlo Hornyak d3237e75b2 simplified casting 
double values do not need a Double object to be casted to long

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-09-11 18:27:54 -07:00
Donal Lafferty e958f22ff3 CIFS support for secondary storage is documented here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/CIFS+Support 
It was implemented by extending the NFS provider. Its validation was updated so that you can pass it a URL containing the
details of a CIFS share.  The code that mounts NFS shares was extended to allow it do the same for CIFS shares.  Otherwise,
the secondary storage code is left unchanged.
 2013-09-11 14:23:29 +05:30
Daan Hoogland 25c8cee01a CLOUDSTACK-4346 uses of parseInt and parseLong secured 2013-09-09 22:19:59 +02:00
Daan Hoogland 947f49d869 Revert "uses of parseInt and parseLong secured" 
This reverts commit f8fb422612.
 2013-09-09 22:17:10 +02:00
Daan Hoogland f8fb422612 uses of parseInt and parseLong secured 2013-09-09 22:15:07 +02:00
Alex Huang a05ec6df33 Fixed up the agent separation. Added comments for config packaging. 2013-09-06 15:40:39 -07:00
Alex Huang 1f5699b29f Fixed unit tests 2013-09-06 15:40:39 -07:00
Alex Huang 8f556e6d88 Made changes to configuration. Eliminated ConfigValue and only use ConfigKey 2013-09-06 15:40:38 -07:00
Alex Huang b8e79c30a8 Compile complete 2013-09-06 15:40:37 -07:00
Alex Huang 6e8ca99466 Got all of the config stuff out of the way 2013-09-06 15:40:36 -07:00
Alex Huang 47afae8112 Merged conflicts resolved 2013-09-06 15:40:36 -07:00
Alex Huang 5b439f0748 Revert "Revert "Added missing files"" 
This reverts commit 48053001fb2303d4acfb77d23fe3733941e83781.
 2013-09-06 15:40:35 -07:00
Alex Huang 06493d5b5c Revert "Added missing files" 
This reverts commit a1dfc227e895d724f68c0206643825b3ba43116c.
 2013-09-06 15:40:35 -07:00
Alex Huang 375eadd3d3 Added missing files 2013-09-06 15:40:34 -07:00
Alex Huang 435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Alex Huang 2e5bb63f77 Moved NetworkManagerImpl to NetworkOrchestrator 2013-09-06 15:40:32 -07:00
Alex Huang 8e5249df62 Moved NetworkManager to NetworkOrchestrationService 2013-09-06 15:40:31 -07:00
Sheng Yang ebb9a0c619 Revert "CLOUDSTACK-2792: Send "saved_password" to BACKUP router when reset password for user VM" 
This reverts commit 5a8a2a259e.

We would fix it in another way, since mgmt server may get state updated in
time.

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2013-09-05 14:26:52 -07:00
Kelven Yang 71b8f6061f CLOUDSTACK-4376: fix cloud-early-config to workaround vSwitch stall in VPC mode. fix potential NPE in DirectAgentAttache in processing answers from resource 2013-09-04 14:49:45 -07:00
Kelven Yang c528e71fec CLOUDSTACK-4390, CLOUDSTACK-4358: Enable full-clone deployment by default for VMware. Apply keep-alive kick for all outstanding vCenter sessions 2013-09-04 14:49:45 -07:00
Kelven Yang 9a2148ffc3 CLOUDSTACK-3886: check in for review request https://reviews.apache.org/r/13008/ 2013-09-04 14:49:45 -07:00
Kelven Yang f383656b21 Fix problems found in local test when JVM assertion is turned on 2013-09-04 14:49:44 -07:00
Kelven Yang 249e2e8f59 Correct DAO usage in VmwareDatacenterVO, relax assertion conditions to work with stack calling frame that is not wrapped with @DB injection 2013-09-04 14:49:44 -07:00
Prachi Damle f31c318158 Changes required to merge to master: 
- Replace UserContext by CallContext
 2013-09-03 20:03:11 -07:00
Prachi Damle 6a0bda0280 CLOUDSTACK-4337 Dedicated Resources: Zone dedicated to an account should only be visible and accessible to that account 
Changes:
- When listing a zone, add clause in the search to check the account_id for a dedicated zone
- When listsing a zone with a domainid, add a similar clause.
- DomainCheck:: checkAccess() for a zone should consider that zone can now be dediacted to a specific account and check access accordingly.

Conflicts:

	server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
	setup/db/db/schema-410to420.sql
 2013-09-03 20:02:59 -07:00
Prachi Damle 012afceed2 CLOUDSTACK-4276 Dedicated Resources: Private Zone functionality issues 
Changes:
createZone API:
- This API takes in domainid, set it to the zone record in the data_center table

updateZone API:
- This API uses 'isPublic' flag to set a private zone to public - if this flag is set and the zone is dedicated, release the dedication and remove the domainid from the data_center table

listZone API:
- This API already has 'domainid' parameter. We should allow list zones by domain for Root admin.

DedicateZone API:
- set domainid in the data_center table

ReleaseDedicatedZone API:
- remove zoneid from the data_center table
 2013-09-03 20:02:56 -07:00
Prachi Damle 96ca70e2da CLOUDSTACK-4259 Dedicated Resources: createAffinityGroup API should not allow admin to create the group of this type through API 
Changes:
- Block API from creating this type of group
 2013-09-03 20:02:53 -07:00
Prachi Damle 2ce2552132 CLOUDSTACK-4234 Dedicated Resources: When multiple dedication groups are chosen for VM deployment, dedicated resources belonging to both groups should be considered 
- Override the equals method
 2013-09-03 20:02:47 -07:00
Prachi Damle 5628153c59 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group 
Changes:
- Adding mocks in unit tests for new injected components

Conflicts:

	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
 2013-09-03 20:02:44 -07:00
Prachi Damle ef22b42b38 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group 
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.

Conflicts:

	plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
	plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
 2013-09-03 20:02:38 -07:00
Prachi Damle a06bd9fa2b CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain 
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.

Conflicts:

	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
 2013-09-03 20:02:34 -07:00
Min Chen e92d46bfd4 CLOUDSTACK-4600:Registered Cross-zone template does not populate 
template_zone_ref for later added zones.
 2013-09-03 16:39:23 -07:00
Chip Childers bf967eb622 Updating datetime format of events to include the timezone 2013-09-03 12:45:01 -04:00
Chip Childers ee13e19a03 Passing description string through to the EventBus for ActionEvents 2013-09-03 12:34:36 -04:00
Chip Childers c86f3bc969 Adding body and subject to the AlertGenerator's Event description hash 2013-09-03 12:28:26 -04:00
Chip Childers 14ee684ce3 Adding eventDateTime to all event generation locations 2013-09-03 11:34:56 -04:00
Wei Zhou 65c1c986da CLOUDSTACK-1192: fix collectVmDiskStatistics issue when stopping a vm 2013-09-03 11:45:34 +02:00
Jayapal 7aea599eb4 CLOUDSTACK-4586 Added CIDR validation for SG Egress rules 2013-09-03 14:18:18 +05:30
Wei Zhou a16fd4781c CLOUDSTACK-4566: fix incorrect values in resource_count table for resource limitation 
There are three issues in resource_count table
(1) expunge a vm, the public_ip decreases and becomes -1 in basic zone.
(2) recover a vm, the volume increase.
(3) restore a vm, the volume decrease.
 2013-09-02 16:56:34 +02:00
Daan Hoogland d9c06e538b CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods 2013-09-01 22:53:23 +02:00
Ian Duffy bdba0ddeed Bring up to date with master 2013-08-31 00:25:48 +01:00
Prachi Damle af175d8c65 CLOUDSTACK-4528 [Vmware] new mapping vmware datacenter cloudstack zone - Virtual Router host migration across cluster FAIL 
Change:
- Also add a check in migrateSystemVM API to check that source and destination host are in the same cluster
 2013-08-28 17:03:24 -07:00
Prachi Damle 92eb84c3e0 CLOUDSTACK-4528: [Vmware] new mapping vmware datacenter cloudstack zone - Virtual Router host migration across cluster FAIL 
Changes:
- listHosts within same cluster for migration of system and router VMs
 2013-08-28 17:03:21 -07:00
Chiradeep Vittal 4a9b2fb584 Since some config values moved to individual ConfigKey<T> from Config.java, validation is broken for those keys. Workaround the issue so that updateConfiguration API still works 2013-08-27 18:04:30 -07:00
Min Chen b67a832f77 CLOUDSTACK-4530:Create Template from a Snapshot fails with unable to 
find any snapshot ova/ovf when we have multiple secondary storage for a
zone.
 2013-08-27 17:15:11 -07:00
Murali Reddy 5f42e2937d CLOUDSTACK-3010: [VMWare] [SharedNetworkWithServices] router VM 
deployment fails with error "Message: Invalid configuration for device
'2'."

ensuring that direct network guru assigns a mac address for the nic that
it designs
 2013-08-28 00:49:38 +05:30
Harikrishna Patnala 81938c68ac CLOUDSTACK-4482: getVMPassword() API call does not return password for Vms that are deployed with password enabled templates. 
Improving the error message saying ssh key pair should be assinged to VM to get the encrypted password.

Signed-off-by: Koushik Das <koushik@apache.org>
 2013-08-27 16:41:07 +05:30
Alex Huang 8113ebb08f Moved the csvtotags into StringUtils. It was there to begin with. No idea who copied it to ConfigurationManager 2013-08-26 20:27:27 -07:00
frank 64f9f0cee6 CloudStack CLOUDSTACK-4484 
Vmware - Not able to fetch userdata from guest Vms using http://<router-address>/latest/user-data
 2013-08-26 17:54:39 -07:00
Alex Huang abbae2aa87 Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items. 2013-08-26 17:31:10 -07:00
Alex Huang 2d05fe40c0 Removed getPod, getCluster from ConfigurationManager 2013-08-26 17:31:09 -07:00
Alex Huang ff6b3fd11a Removed getzone 2013-08-26 17:31:08 -07:00
Koushik Das eeac80eaa2 CLOUDSTACK-4350: [Performance Testing] Adding hosts take much longer time than baselines 
During host connect multiple listeners gets invoked, one of them is the download listener.
As part of processConnect() method, it checks if templates needs to be downloaded to secondary
store for a particular HV type. As part of that check it computes list of HVs present in the
zone. The earlier logic was to query all hosts (excluding current one) and iterate over them to
make the list. This is not optimal and is bound to have some latency as the number of hosts
increases.
Optimized the logic by querying the list of HVs from the db. directly instead of iterating over
all hosts in the zone.

Conflicts:
	server/src/com/cloud/resource/ResourceManagerImpl.java
 2013-08-26 16:18:54 +05:30
Toshiaki Hatano 914e7c4542 Revert "CLOUDSTACK-2328: Linux native VXLAN support on KVM hypervisor" 
This reverts commit 34ae32e0c2.
 2013-08-24 07:12:23 +00:00
Toshiaki Hatano 34ae32e0c2 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:
- 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"
 2013-08-24 01:39:11 +00:00
Min Chen c6e569755f CLOUDSTACK-4481:API: listEventTypes returns nothing; raises ERROR in MS 
logs.
 2013-08-23 15:26:57 -07:00
Min Chen 4218ce48f1 CLOUDSTACK-4478:API: ListSwiftsCmd API missing. 2013-08-23 15:26:25 -07:00
Marcus Sorensen 62072514f0 CLOUDSTACK-4661: fix vpcid field in response of creating vpn gateway 2013-08-22 15:17:12 -06:00
Alena Prokharchyk 96a17cc036 CLOUDSTACK-4428: "kvm.snapshot.enabled" flag shouldn't affect detached volumes, or volumes attached to the vm in Stopped/Destroyed state 2013-08-21 16:27:16 -07:00
Alena Prokharchyk d5379b8704 CLOUDSTACK-4392: API volumeresponse - return primary storage information to ROOT and resource domain admin only. 2013-08-21 15:43:06 -07:00
Koushik Das 502c1db103 CLOUDSTACK-3441: [Load Test] High delays between VM being allocated to Pod and network implementation causing delays in VM deployment 
The locking code in implement/shutdown network code was not efficient. Even in order to check the current state of the network lock was getting acquired which is not required. This resulted in delays in deploy VM as can be seen from attached logs where the code waited on the lock just to check if network is implemented.
As part of the fix moved out code that is checking if the network is already implemented or shutdowned outside the lock.
 2013-08-21 15:25:45 +05:30
Koushik Das 534e0977c3 CLOUDSTACK-2131: [Performance][Enhancement] Avoid checking for providers that are not enabled while creating network. 
For some scenarios like prepare nic, all network service providers are checked which is not efficient and also introduces unnecessary dependencies.
The check to use only the required providers is already there for implement, shutdown operation on network. Put the same check for all missing cases.
 2013-08-21 12:48:51 +05:30
Min Chen 3bd2bbf59d CLOUDSTACK-3950:Set cross-zone flag in registerTemplate/registerIso in 
case of region-wide secondary is enabled.
 2013-08-20 14:13:49 -07:00
Alena Prokharchyk d7216a776e CLOUDSTACK-4410: Parallel vm execution - turn on and off based on the global configuration variable. Before the fix, was hard coded to on 2013-08-20 11:04:50 -07:00
Alex Huang 494ea5052f Made IpAddressManager a manager 2013-08-19 14:13:31 -07:00
Alex Huang f23f1530e7 Removed missing class from application context 2013-08-19 14:13:31 -07:00
Alex Huang 9f62df580e Fixed up the unit tests 2013-08-19 14:13:30 -07:00
Alex Huang 45d239882b Added missing files 2013-08-19 14:13:30 -07:00
Alex Huang 092e20204a Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl 2013-08-19 14:13:29 -07:00
Alex Huang 564502abd7 Moved the virtualmachine implementation into engine/orchestration 2013-08-19 14:13:28 -07:00
Alex Huang 4ba359c3fe Moved VirtualMachineManager into engine 2013-08-19 14:13:28 -07:00
Marcus Sorensen 1b52a298e8 CLOUDSTACK-4379: Reset VM states when host is removed from cluster 
If you shut down the agent while VMs are running, the management
server assumes that the VMs are continuing to run. You can then
delete the host while it is in 'disconnected' state, and those VMs
will be unusable, forever in running state. They can't change state
because the host no longer exists. This patch checks for any VMs
that may have been tied to the removed host and resets their state
so that cloudstack can continue to manage them.
 2013-08-17 00:25:14 -06:00
Min Chen 97ff4981c5 CLOUDSTACK-3274: Remove duplicate cleanString calls in logging api for 
performance improvement.
 2013-08-16 11:10:25 -07:00
Bharat Kumar 15c93ba9b7 =CLOUDSTACK-4068 scaling up user vm and system vm is failing with NPE if current service offering is deleted 
Nitin Mehta <nitin.mehta@citrix.com>
 2013-08-16 17:27:00 +05:30
Nitin Mehta 088ce975c6 CLOUDSTACK-4313 
Wrong error message is throwing on failure of dynamic scale up operation. Fix it.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-08-16 13:03:42 +05:30
Min Chen 081cfa7b6b CLOUDSTACK-4277:listTemplate should return empty list without any zone 
configuration.
 2013-08-15 16:47:35 -07:00
Min Chen c675f826e5 CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied 
to Staging storage during snapshot creation.
 2013-08-14 18:12:53 -07:00
Alena Prokharchyk ae617b6a35 Revert "fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user" 
This reverts commit 94254e3c2b.

Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java

Regular user should be able to list the network offering with specifyVlan=true. He just can't use when create the network as he is unaware of the physical network topology. But as the admin can create the network on the user's behalf using this kind of offering, so the user should be able to see the offering's details
 2013-08-14 15:22:36 -07:00
Mike Tutkowski 0f60b5d41c CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack 2013-08-14 15:02:57 -06:00
Alena Prokharchyk b727001f48 CLOUDSTACK-4315: VPC - when fail to add nic to the VR, a) remove the nic b) remove the reference to nic from router_network_ref table. Before the fix b) was missing, and it caused NPEs when tried to apply the rules on the routers not having nic in the network 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2013-08-14 11:44:34 -07:00
Edison Su f87eed5b79 fix compile 2013-08-13 15:16:46 -07:00
Edison Su 3eb34d082d CLOUDSTACK-4298: in case both xenserver/vmware mixed in one zone, need to make sure, ssvm is loaded with premiumsecondaryresource 2013-08-13 15:16:46 -07:00
Edison Su c58f15d867 CLOUDSTACK-4222: use new volume object in case of migrate volume 2013-08-13 15:16:45 -07:00
Wei Zhou 3ab1abc6ba CLOUDSTACK-4296: fix a similar issue 
(cherry picked from commit e2f47871d1)
 2013-08-13 21:56:21 +02:00
Wei Zhou da7f924cc5 CLOUDSTACK-4296: fix parameter setting error in listVirtualMachines command 
(cherry picked from commit 72f013f780)
 2013-08-13 21:39:24 +02:00
Wido den Hollander 227509be46 Remove .java.orig file 
Left over from somebodies editor?
 2013-08-13 16:25:09 +02:00
Likitha Shetty 4d48d9603d CLOUDSTACK-4286. Add one more check for validating vlanrange parameter with "dedicateGuestVlanRange" API 2013-08-13 18:54:10 +05:30
Kishan Kavala 29a399b9ae CLOUDSTACK-4289, CLOUDSTACK-4290, CLOUDSTACK-4291 : Check for null when populated UUID while listing usage records. 
Filed CLOUDSTACK-4299 to make these entities always available.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2013-08-13 18:53:00 +05:30
Nitin Mehta 5b41be3567 CLOUDSTACK-4270 
ASF 4.1 to 4.2 Upgrade: Missing Global Configuration parameters on the Upgraded Setup related to "storage.cache". Adding them
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-08-13 12:16:31 +05:30
Alex Huang 3df5571d2e Resolved merge conflicts 2013-08-12 20:15:24 -07:00
Alex Huang de2bd96d98 Moved volume related code into cloud-engine-orchestration 2013-08-12 19:06:51 -07:00
Alex Huang ae8ed58228 Added missing file 2013-08-12 19:05:23 -07:00
Alex Huang 0e19e82fac Split up the volume manager into two. One part is for self-service. One part belongs in the engine. Removed old 2.1 upgrade code. In order to upgrade from 2.1, you must upgrade to 2.2. first. So therefore these files are no necessary in the newer versions of CloudStack 2013-08-12 19:05:22 -07:00
Jessica Wang 3c16adf6dc CLOUDSTACK-4142: listNetworkOfferings API has been changed to not return system-owned network offerings to regular-user. So, add networkofferingconservemode property to listNetworks API response. 2013-08-12 17:50:02 -07:00
Min Chen ebdc5786bf CLOUDSTACK-4250: [Object_store_refactor] Register ISO fails in multizone 
environment if downloading to one of the zone fails.
 2013-08-12 11:26:26 -07:00
Saksham Srivastava 5510bca9e5 CLOUDSTACK-4189: [UI] In multi zone setup, dedicating a single zone to a domain, shows other zones dedicated as well 2013-08-12 18:27:52 +05:30
Murali Reddy 5cff9bd2e6 CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard 
only when there is portable IP range added at region level.

region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
 2013-08-12 18:12:13 +05:30
Likitha Shetty cd2ea3b844 CLOUDSTACK-4244. Unable to attach a volume to a VM deployed in Stopped (startvm=false) state. 
While attaching a volume to a VM, create volume on the hypervisor only if the VM has been started on the it.
 2013-08-12 15:49:08 +05:30
Rajesh Battala be9dbcc2c5 CLOUDSTACK-3946 [KVM] [Zone Wide Primary Storages] migrateVolume is deleting the volume if the source and destination pool are same 2013-08-12 13:41:49 +05:30
Murali Reddy f1c611ac60 CLOUDSTACK-4206: [EIP/ELB] Failed to disableStaticNAT when the userVM is 
in destroyed state.

ignore VM state when system is enabling static NAT on the system IP to
VM in EIP enable network
 2013-08-12 04:49:03 +05:30
Harikrishna Patnala 2868d4b336 CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm; Zone host is ready, but secondary storage vm template: 3 is not ready on secondary storage: 2 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-11 20:34:39 +05:30
Mike Tutkowski d39408cd0c CLOUDSTACK-4227 2013-08-10 17:43:15 -06:00
Harikrishna Patnala 5404bf6063 CLOUDSTACK-4123: 3.0.6 to ASF 4.2 Upgrade: On Adding VMWare Cluster to the Setup, 3.0.6 System VM Template for VMWare is downloaded instead of 4.2 
Updating the new system template URLs for the existing templates during upgrade to 4.2.
If new 4.2 system template is registered before upgrade then marking the old templates as removed during upgrade.
 2013-08-10 18:02:49 +05:30
Anthony Xu 36d7b49d5f CLOUDSTACK-4210 
delete templateVO entry when there is no image store having this template
 2013-08-09 12:08:00 -07:00
Likitha Shetty ec669ff48e CLOUDSTACK-3786. Snapshots removed field is not set after successful deletion of the snapshot. 
Set the removed field for snapshot when the storage gc removes the snapshot
 2013-08-09 18:48:29 +05:30
Koushik Das 8cf48ed2ce CLOUDSTACK-4179: [Performance Testing] Time taken for Deploy VM async job to complete is considerably higher 
The time increased due to the newly added dedicated resources feature. During regular VM deployment, all dedicated resources are put in avoid list so that they are not considered for deployment.
Now the way to compute the list of dedicated resources is not optimal and performance deteriorates in an environment having lot of pods, clusters and hosts as the logic is to query db. for each suc resource.

The fix is to optimize the logic not to loop through all resources but get the list of each resource type in a single query.

Conflicts:
	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
 2013-08-09 16:57:21 +05:30
Devdeep Singh 32701f027a CLOUDSTACK-2670. Migrate volume doesn't allow migration of volumes of a stopped vm. 
The findStoragePoolsForMigration and migrateVolume api were explicitly blocking moving
a volume if the instance to which it was attached was stopped. Updated the check for
the same.
 2013-08-09 14:28:01 +05:30
Min Chen 99c3e4f3f5 CLOUDSTACK-4190: Add endpoint selector implementation for ImageCache 
data store and also delete object from staging area for volume copy from
primary to secondary or vice versa.
 2013-08-08 16:17:00 -07:00
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefc.
 2013-08-08 15:02:40 -07:00
Alena Prokharchyk 958c2b2040 CLOUDSTACK-4141: resizeVolume - read the result of AsyncCallFuture execution. If false, return null to the API caller 2013-08-08 13:53:58 -07:00
Alena Prokharchyk 4976a67bfc CLOUDSTACK-4193: don't let privateGateway to be created with NULL networkId 2013-08-08 10:49:12 -07:00
Bharat Kumar 5f2f5181e9 CLOUDSTACK-4083 if a failure occurs while adding VM to another network (this should be the first vm in the subnet). The ip alias created as a part of this process is not removed. 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2013-08-08 10:31:15 -07:00
Min Chen 1a194ef725 CLOUDSTACK-1405:ZWPS: listStoragePool API doesn't accept scope parameter 
.
 2013-08-08 10:10:15 -07:00
Likitha Shetty b7c5068327 CLOUDSTACK-4186. Signature computed while accessing VM's console is not aligned with how signature is computed for other APIs 2013-08-08 16:29:12 +05:30
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build 
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-08-08 14:46:56 +05:30
Likitha Shetty aba50f81cf CLOUDSTACK-4153. Guest vlan dedication is not working as expected in case of multiple physical networks. 2013-08-08 10:59:19 +05:30
Alex Huang 5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
Alex Huang 5161ded69c Removed the configuration parameters from Config.java 2013-08-07 16:41:05 -07:00
Alex Huang 49cd4fa380 Connected config gathering to CloudStack 2013-08-07 16:41:04 -07:00
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Alex Huang cf3bbb1fb1 Switched AgentManager to use ConfigDepot 2013-08-07 16:41:00 -07:00
Edison Su e115ee4026 CLOUDSTACK-3535: still maintain stop agent wont trigger HA 2013-08-07 14:43:16 -07:00
Edison Su 5b0314fff9 CLOUDSTACK-3535: add kvminvestigator to investirage kvm host 
Conflicts:

	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 2013-08-07 11:44:19 -07:00
Saksham Srivastava 61c7aa7afe CLOUDSTACK-4104: VM Creation should fail if a zone is dedicated to a domain and user of the same domain deploys vm without using affinity group "Explicit Dedication". 2013-08-07 17:15:12 +05:30
Likitha Shetty 31fe99ef91 CLOUDSTACK-4025. NPE observed during VM start. 
NPE was hit during VM start because the network it was to be deployed in didn't get implemented - Handling this failure.
 2013-08-07 13:28:27 +05:30
Sateesh Chodapuneedi c14c736d7a CLOUDSTACK-4047 [sM][VMWare][ZWPS]: no need of storage migration while migrating VM when the root volume is on zone wide primary storage 
Introduced check for zone wide pools while listing hosts for migration.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-08-07 01:36:32 +05:30
Wido den Hollander fd793f7fb6 config: Fix a typo in the configuration option 2013-08-06 15:19:43 +02:00
Bharat Kumar 1a89bc06c8 Cloudstack-4015 No error logged when deleteing all the valns when there are allocateed vnets. Alos not updating the vnet range in physicalnetworks table in the above case. 
Signed-off-by: Jayapal <jayapal@apache.org>
 2013-08-06 17:28:22 +05:30
Murali Reddy 42b81009b9 CLOUDSTACK-4013: [PortableIP] [MultiplePhysicalNetworks] Associate 
portable IP is trying to insert network id as physical network id

ensuring network id, physical network id, source network id are properly
set for portable ip in user_ip_address and vlan tables
 2013-08-06 17:16:58 +05:30
Jayapal 6164077ee8 CLOUDSTACK-4084 Fixed the static nat vm ip address in public ip address table in external network gc 
In external network after network GC the network n/w cidr changes.
    In this case the static nat enable vm ip also chagnes. So updated the new
    vm ip address in user_ip_address table.
 2013-08-06 16:25:51 +05:30
Likitha Shetty eac3631abe CLOUDSTACK-4038. State of the DATA volumes remains in Allocated state if they are deleted before using them. 
If a volume is in Allocated state i.e. not present in primary or secondary mark the volume as removed.
 2013-08-06 16:02:40 +05:30
Murali Reddy 323f246765 CLOUDSTACK-2955: [PortableIPrange deletePortableIpRange fails because of 
UI firing an incorrect API

adding 'portableiprange' tag to the job result of
CreatePortableIpRangeCmd api job response
 2013-08-06 16:01:11 +05:30
Prasanna Santhanam 0eafc0c0d8 CLOUDSTACK-4064: Missed renaming the config for KVM snapshots 
KVM.snapshot.enabled is lowercased by f025db95 to keep the configs
uniformly lower-case. But it missed the upgrade script and the
references in SnapshotManagerImpl. This commit will fix the issue in all
locations

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 0e216fa7e41bdfe0cc744006bb896c8b00138ca2)
 2013-08-06 10:39:14 +05:30
Murali Reddy 56d7ccef97 CLOUDSTACK-4037: [GSLB] removeFromGSLBRule is not cleaning the 
cloudsite1 infro from the second site NetScaler device

ensuring when a site no longer participates in GSLB, complete GSLB
config for that rule is wiped out on the GSLB provider for that site
 2013-08-06 05:56:26 +05:30
Alena Prokharchyk beabf596ba CLOUDSTACK-4080: don't GC the network when it has vms in Starting state even when the nics are not allocated for them yet (can happen when vm is being created) 2013-08-05 14:15:04 -07:00
Daan Hoogland d9202100e0 fix warnings in NetworkServiceImpl: removed unused code and add cases to switches 2013-08-05 11:21:39 -07:00
Alena Prokharchyk a5c2d24ee2 CLOUDSTACK-4087: updateTemplatePermissions - derive domainId from the template owner, not from the operation caller 
Conflicts:
	server/src/com/cloud/template/TemplateManagerImpl.java
 2013-08-05 10:39:48 -07:00
Wido den Hollander 6906a9016d config: Only user low-case names for variables 2013-08-05 17:37:57 +02:00
Sanjay Tripathi 8845aae0bc CLOUDSTACK-4075: User unable to archive events 2013-08-05 20:01:40 +05:30
Harikrishna Patnala 506f2a4b94 CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm CLOUDSTACK-3631: Enhance System vm deployment retry mechanism 
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
 2013-08-05 18:19:16 +05:30
Nitin Mehta f28a28dc77 CLOUDSTACK-3913 
Private templates would now get copied to only one of image  storage chosen randamly as was the case earlier. Dont throw an exception for uploading volumes when there are multiple image stores, instead choose one of them randomly
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-08-05 17:43:57 +05:30
Min Chen 8ff2061db7 CLOUDSTACK-4040: [Object_store_refactor] System VMs are not spinning up 
if S3 storage configuration is not part of zone creation wizard.
 2013-08-02 18:17:58 -07:00
Min Chen 151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Chiradeep Vittal d8a5f03c7f Revert "Starting the work of moving orchestration pieces to engine" 
This reverts commit 7a2aaf96fd.
 2013-08-02 15:09:29 -07:00
Chiradeep Vittal 9bb0eda5a1 Fix license 2013-08-02 14:05:01 -07:00
Alex Huang 7a2aaf96fd Starting the work of moving orchestration pieces to engine 2013-08-02 13:51:48 -07:00
Alex Huang 66cca4d9ac Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
Daan Hoogland afd5d555f6 Create Private Network Test 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-08-02 13:34:44 -07:00
Alena Prokharchyk fc33d69b2a CLOUDSTACK-4023: lock the network during the shutdownNetwork (just the way we do when implement network) 
Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2013-08-02 13:20:47 -07:00
Alex Huang a673d17171 Added missing file 2013-08-02 11:07:56 -07:00
Alex Huang 8930cfa983 Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
Alex Huang 0b1f97d048 Added Configurable interface 2013-08-02 11:07:54 -07:00
Alena Prokharchyk 4e53ce0677 CLOUDSTACK-4022: listProjects - do searchIncludingRemoved when getting info of corresponding projectAccount because when the project is being removed, its account is marked as Removed first, but we might still want to retrieve its info 2013-08-02 09:03:57 -07:00
Bharat Kumar 80e2934bb7 fix to add the the overcommit details of the vms in uservm details table when decreasing the overcommit to one. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 19:09:26 +05:30
Kishan Kavala 536fd0e8a1 CLOUDSTACK-4005: Do not allow snapshot on zone wide primary storage when KVM.snapshot.enabled is set to false 2013-08-02 18:04:28 +05:30
Bharat Kumar 65370f31bc upgrade to ASF 4.2 "cloud" Database Schema Inconsistencies on the Upgraded Setup - Table "volumes" 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 17:07:22 +05:30
Ian Duffy 25e8e9b85f General cleanup, source formatting, remove whitespace 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 14:20:47 +05:30
Ian Duffy 00c17add3c Add SSL Support 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 14:20:47 +05:30
Ian Duffy 23f0187d05 Add Support for member of filter 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 14:20:47 +05:30
Kishan Kavala 65fc2ec345 CLOUDSTACK-4032: Added KVM.snapshot.enabled config to 41to42 upgrade 
Conflicts:
	setup/db/db/schema-410to420.sql
 2013-08-02 12:04:33 +05:30
Fang Wang 8f7b90badf CLOUDSTACK-3759 [Automation] Failed to attach volume to VM, while vm are in stopped state Fix the null pointer. 
Signed-off-by: Edison Su <sudison@gmail.com>
 2013-08-01 17:47:11 -07:00
Alena Prokharchyk a3b86573b9 CLOUDSTACK-4020: lock nic entry in releaseNic method. Otherwise multiple threads can try to release the same nic at the same time, and it will lead to NPEs and backend failures 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2013-08-01 16:19:10 -07:00
Bharat Kumar 21f1b137cb Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command 
Reviewed-by: Alena Prokharchyk

Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2013-08-01 13:36:20 -07:00
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-08-01 10:35:00 -04:00
Nitin Mehta 2a20ac21ac =CLOUDSTACK-3102 ResourceDetail API - If you add detail for any resource other than volume and nic then throw an exception 2013-08-01 17:38:58 +05:30
Likitha Shetty 871e3bb279 CLOUDSTACK-3981. ListAccounts always sets 'networkTotal' to 0. 
Add vpc resource count to the response. And set the right values for network resource count.
 2013-08-01 14:18:33 +05:30
Bharat Kumar b9a2b07ceb Fix for incorect capacity displayed at the dashboard. 2013-08-01 12:31:07 +05:30
Harikrishna Patnala f12adfff8a CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU based on the presence of tools in the template 
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
 2013-08-01 12:20:48 +05:30
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
 2013-08-01 10:47:36 +08:00
Edison Su 4eefce15be CLOUDSTACK-3950: the issue can be reproduced by: copy iso failed during the first time, for some reason, then copy the same iso again, the issue be triggered. 2013-07-31 15:49:48 -07:00
Bharat Kumar 980b227817 recalculate the capacity after overcomit change. 
Conflicts:
	server/src/com/cloud/capacity/CapacityManager.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2013-07-31 18:39:14 +05:30
Wido den Hollander ce06d6542a CLOUDSTACK-3951: Don't require SSH access to KVM nodes when cancelling maintenance 2013-07-31 15:07:32 +02:00
Harikrishna Patnala 3d9fc3dbc0 CLOUDSTACK-2717: listCapabilities API to return 
allow.public.user.templates configuration parameter value
 defined at account level.
Signed by - Nitin Mehta<nitin.mehta@citrix.com>
 2013-07-31 16:58:32 +05:30
Bharat Kumar c7a1dbb176 Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-31 15:31:42 +05:30
Harikrishna Patnala 2c53ede1de CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM 2013-07-31 15:07:17 +05:30
Min Chen 622a9e1b95 CLOUDSTACK-3949:[Object_Store_Refactor][Usage] No usage event is 
generated for registered ISO.
 2013-07-30 18:08:05 -07:00
Prachi Damle a8360e41c0 CLOUDSTACK-3942 NPE from findStoragePool method 
Changes:
- Added null checks for podId

Conflicts:

	server/src/com/cloud/storage/StorageManagerImpl.java
 2013-07-30 17:53:31 -07:00
Min Chen c2192808aa CLOUDSTACK-3686: Registering a template does not generate a usage event. 2013-07-30 17:35:12 -07:00
Alex Huang 1e1ee902a2 Moved over the new jobs framework from vmsync. This has not been integrated into the server package yet. Will do that next 2013-07-30 15:00:58 -07:00
Min Chen 730d045085 CLOUDSTACK-3857: create VOLUME_CREATE event at CreateVolumeCmd instead 
of at AttachVolumeCmd.
 2013-07-30 14:51:02 -07:00
Alena Prokharchyk 9f66d18de6 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id 2013-07-30 14:30:53 -07:00
Alena Prokharchyk 9b7c4a6c47 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
 2013-07-30 14:13:58 -07:00
Alex Huang 5595a099b2 Added commons io to server 2013-07-30 14:07:21 -07:00
Alex Huang a8da8c8dff Added commons io to runtime 2013-07-30 14:07:20 -07:00
Alena Prokharchyk 244cf3b20a CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 
Fixed the build: use CallerContext instead of UserContext
 2013-07-30 13:53:31 -07:00
Alena Prokharchyk 43dc85cea1 Revert "CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command" 
This reverts commit 416331ae80.
 2013-07-30 12:05:09 -07:00
Alena Prokharchyk 416331ae80 CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 2013-07-30 11:17:17 -07:00
frank 6070a8b370 CloudStack CLOUDSTACK-1812 
create physical network fails while creating basic zone
 2013-07-30 11:11:17 -07:00
Marcus Sorensen 566ce3e625 Summary: Fix null pointer and op_networks blocker to account cleanup 
Detail: Accounts can fail in cleanup/gc process due to inconsistent op_networks
table and null pointer in looking up account for event publishing.

BUG-ID: CLOUDSTACK-3957
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1375204815 -0600
 2013-07-30 11:22:11 -06:00
Alena Prokharchyk a36c8a962b CLOUDSTACK-3902: createVpcOffering - throw an excpetion when sourceNat service is not passed in 2013-07-30 10:08:46 -07:00
Murali Reddy b2fdfc5084 CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events 
for portable IPs

generating usage event for acquire and release
 2013-07-30 19:01:10 +05:30
Murali Reddy c520aae346 CLOUDSTACK-2991: [PortableIPRange] CS should not allow portable IP with 
sourceNAT service on it

if a portable ip is first IP associated with a non-VPC network, then its
being considered as source nat IP. This fix adds exemption for portable
IP not to be considred for source nat.
 2013-07-30 15:49:09 +05:30
Thomas O'Dowd 5552d26872 Fix a few typos in ConfigurationManager. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c78ed39b2f)
 2013-07-30 11:25:15 +05:30
Prasanna Santhanam 34e751fb8d simulator supports migration 
Add simultor to the seemingly strict filter which should happen within
the hypervisor resource and not the virtualmachine :/

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3d4d350dbe)
 2013-07-30 11:25:14 +05:30
Alex Huang 486e0d02f8 Fixed the applicationcontext.xml because I removed a class. oh kelven oh kelven, when can we get back our java based config for core components...this is so bad for refactoring 2013-07-29 19:13:33 -07:00
Alex Huang 1d4b22d6de Removed AgentMonitor and moved it inside AgentManager 2013-07-29 19:13:32 -07:00
Alex Huang d0a3a69170 Unused code removal 2013-07-29 19:13:31 -07:00
Alex Huang 46e644e134 Separate agentmanager from server code. Moved out ssvm. Remove methods that shouldn't be used 2013-07-29 19:13:31 -07:00
Edison Su f486d36f88 CLOUDSTACK-3908: fix extract path 2013-07-29 16:58:51 -07:00
Min Chen 42da3efbc3 CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code. 2013-07-29 14:31:33 -07:00
Alena Prokharchyk e6ec6137ab CLOUDSTACK-3914: assignToLoadBalancer - return false, when empty vmIds list is passed in 2013-07-29 13:55:55 -07:00
Edison Su ae534388c0 CLOUDSTACK-3852: fix upload volume 
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
	server/src/com/cloud/template/TemplateManagerImpl.java
 2013-07-29 11:50:16 -07:00
Edison Su d64c318f57 CLOUDSTACK-3510 
Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>

Conflicts:

	server/src/com/cloud/storage/VolumeManagerImpl.java
 2013-07-29 11:50:15 -07:00
Alena Prokharchyk 4c0053fb2d CLOUDSTACK-3909: deployVM API - validate hypervisorType parameter when the vm is being deployed from ISO 2013-07-29 11:16:39 -07:00
Alex Huang a4cea4ebf2 Removed schema from the dependency of many components 2013-07-29 10:55:19 -07:00
Rajesh Battala 1b398aa3fc CLOUDSTACK-3846 usage event is not generated for volume resize 2013-07-29 18:51:00 +05:30
Bharat Kumar 4dc874fefc Cloudstack-2622 createipAlias.sh/deleteipAliash.sh should not be allowed with Isolated Guest Networks 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-29 18:36:20 +05:30
Bharat Kumar a8387568f3 Fixed the conditon which checks for the provider's capabilty and reapply ipaliases on virtual router restart. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-29 17:40:00 +05:30
Harikrishna Patnala 2f369973e2 CLOUDSTACK-3779: Support System vm scaling on VMWare 
Marked the system template new system template as dynamicallyScalable
   - handled upgrade case
   - moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
 2013-07-29 15:25:07 +05:30
Harikrishna Patnala 8ef097ef6e CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer. 
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
 2013-07-29 15:16:21 +05:30
Sateesh Chodapuneedi 26d8c668f9 CLOUDSTACK-3870 [VMware] Management traffic network over a VLAN is not working 
CLOUDSTACK-3437 In case of multiple physical network setup we see log message "can't get physical network"

CloudStack's control network is management network in case of VMware.
Processing management VLAN id provided in zone traffic label for management traffic.`

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-07-29 08:20:51 +05:30
Prachi Damle 790a02f936 CLOUDSTACK-3343 UI/API should also return the mode(Strict/Preferred) when listing the ServiceOffering that uses ImplicitDedicationPlanner 
Changes:
- API is fixed to return the service_offering details

Conflicts:

	api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
 2013-07-28 22:44:00 -07:00
Min Chen 1fb513e783 CLOUDSTACK-3861: Remove s3.enable and swift.enable from global setting. 2013-07-27 21:56:46 -07:00
Prachi Damle abfc351b78 CLOUDSTACK-3814 Duplicate entry for CPU, Public ip address in dashboard 
Changes:
- ListCapacity API was searching the capacities per zone, pod and cluster causing duplicates to end up in th result.
- Instead we should group by zone if zone and pod both are null. Group by pod if zone is provided but no pod. Or group by cluster when zone and pod both are provided.
 2013-07-27 16:24:48 -07:00
Harikrishna Patnala a8ad908666 CLOUDSTACK-3703: change service offering of stopped vm on 
Conflicts:
	server/test/com/cloud/vm/UserVmManagerTest.java
 2013-07-27 19:52:30 +05:30
Alex Huang 3d2e49bcfc Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format 2013-07-26 20:35:49 -07:00
Alex Huang c2752ba93c Removed mysql as any dependency 2013-07-26 20:35:48 -07:00
Min Chen b17b40bbfe CLOUDSTACK-3857:[Object_Store_Refactor][Usage] Two VOLUME_CREATE usage 
events are generated for one data disk after creating and attaching to
VM.
 2013-07-26 17:45:05 -07:00
Alex Huang 3f7c558de5 Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project 2013-07-26 16:34:08 -07:00
Min Chen c8cafb91a7 CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 15:07:45 -07:00
Alex Huang f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
Rajesh Battala 24a8d60d6f CLOUDSTACK-62 [AWS Style Health Checks] Response of the API listLoadBalancerRuleInstances should show the service state of a VM if health check is configured for it 2013-07-26 16:40:26 +05:30
Sanjay Tripathi 13fc4690fc CLOUDSTACK-3488: listStoragePools throws NPE if any of the storage pools are not in the right state. 
This issue is reporducible if user adds a primary storage and quickly fires
listStoragePool API command without waiting for the responce of previous
createStoragePool API command. So during this period
(before receiving createStoragePool API resonce), the primary srorage is in
initialized status and the "scope" of storage is not set.
 2013-07-26 16:00:06 +05:30
Alex Huang 2dc3ede0a8 Remove a line to make it compile 2013-07-25 20:29:13 -07:00
Alex Huang 111febc567 Fixed up the rest of the management server code that calls clustermanager 2013-07-25 19:57:45 -07:00
Alex Huang 9aaa378b08 Moved ClusterManager into it's own package. Removed the agent load balancing code. 2013-07-25 19:00:26 -07:00
Alex Huang 395cbcc023 Move the rest of the generics out of virtualmachinemanager 2013-07-25 19:00:25 -07:00
Min Chen db93ebf169 Fix build break due to commit 2e0847bfe0. 2013-07-25 18:04:12 -07:00
Min Chen 45d38c4142 CLOUDSTACK-3709:[Object_Store_Refactor][UI] Can't delete NFS Cache 
storage through UI.  Fixed at API side.

Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java
 2013-07-25 17:33:28 -07:00
Alena Prokharchyk 2e0847bfe0 CLOUDSTACK-3232: InternalLB system vm - allocate control ip address from the private range when vm's hypervisor is vmWare 2013-07-25 16:39:23 -07:00
Edison Su 5e427bd2f6 CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4 2013-07-25 16:36:06 -07:00
Prachi Damle dc66b6baa6 CLOUDSTACK-3821 RegisterTemplate URL validation issue 
Changes:
- Added validation for the url path
 2013-07-25 15:57:57 -07:00
Min Chen 588efa0150 Fix an incomplete logging message. 2013-07-25 15:47:39 -07:00
Edison Su a39de009da CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4 2013-07-25 15:13:00 -07:00
Ian Duffy eaa4143371 Merge LDAPPlugin 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-25 17:54:52 +05:30
Koushik Das deb701b7e0 CLOUDSTACK-3493: [storage ref] Attach volume to VM is failing in case of Primary-Localstorage . 
Some existing scenarios for root and data volume combination was not working. These are
a. Local root + Shared data
b. Shared root + Local data

Enabled these scenarios as part of this fix
 2013-07-25 17:10:20 +05:30
Alex Huang 555211a080 Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine 2013-07-25 03:57:12 -07:00
Nitin Mehta 8ee4e5ac14 =Disable the test and write a better one 2013-07-25 15:52:05 +05:30
Nitin Mehta 1f64354ec8 CLOUDSTACK-3712 
Use Vminstance instead of user vm for scaling stopped vms.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-07-25 14:58:42 +05:30
Chiradeep Vittal 1744ed7ad5 CLOUDSTACK-3626 register the correct user and account for api calls made with api keys and secret keys 2013-07-25 14:45:59 +05:30
Harikrishna Patnala 0010faee4b Fix for CLOUDSTACK-2536 
Removing memoryovercommitratio and cpuovercommitratio parameters from addCluster and updateCluster APIs,
since these can be configurable using updateConfiguration API at cluster level.
By default while creating cluster these values are taken from global configuration parameters.
 2013-07-25 13:42:08 +05:30
Edison Su 7f200d966e CLOUDSTACK-3681: fix bunch of bugs related to vmware, regarding to snapshot 2013-07-24 19:06:30 -07:00
Bharat Kumar e14f5d0aeb Cloudstack-3694 Dnsmasq rewrite in bash 
(Sheng: Fix typo, fix log and error message, remove 'set -x' in script)

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2013-07-24 14:00:31 -07:00
Edison Su be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -07:00
Likitha Shetty b7a483608f CLOUDSTACK-3735. Domain deletion fails even when the networks within the domain have been destroyed. 
When a network is destroyed remove the corresponding network entry from domain_network_ref and account_network_ref table
 2013-07-24 20:03:51 +05:30
Saksham Srivastava 135a2e66c5 CLOUDSTACK-2508: Template usage should report both physical and virtual sizes 2013-07-24 18:17:09 +05:30
Sateesh Chodapuneedi 79d49ca2dc CLOUDSTACK-3758 [Vmware][ZWPS] Failed to create volume from snapshot 
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-07-24 03:51:23 +05:30
Alex Huang e99a1ef1d9 Moved the rest of VirtualMachineManager to be vm agnostic 2013-07-23 18:24:59 -07:00
Alex Huang 9bc5870f01 Removed the remove method. Not sure why we added to VirtualMachineManager 2013-07-23 18:24:58 -07:00
Alex Huang 3ae0acc26f Forgot to save something in VirtualMachineManager 2013-07-23 18:24:58 -07:00
Alex Huang 861be3063c Simplify the components that VirtualMachineManager uses 2013-07-23 18:24:57 -07:00
Min Chen 67b15ed956 CLOUDSTACK-3639:Unable to create template from snapshot when there are 
multiple secondary storages in the zone.
 2013-07-23 16:56:46 -07:00
Sheng Yang 8295cb0ac2 CLOUDSTACK-3250: Add PvlanSetupCommand into maintenance mode allowed command list 
Then the rule in the old host can be cleared.
 2013-07-23 15:19:34 -07:00
Min Chen 956e8301c2 CLOUDSTACK-3716: State of expunged volumes are not consistent in volumes 
table and volume_store_ref.

Conflicts:
	server/src/com/cloud/storage/VolumeManagerImpl.java
 2013-07-23 15:06:34 -07:00
Alena Prokharchyk 57623832b0 CLOUDSTACK-3478: fixed volume destroy. #1 - don't call destroy() when the volume is in Expunged/Expunging/Destroy state. #2 - added state transition for Expunged state 2013-07-23 14:40:59 -07:00
Alena Prokharchyk 3962f117ac CLOUDSTACK-3733: fixed migrateVm - no need to cast vm to user vm to retrieve the iso information. Extract iso information from VirtualMachineProfile object passed to the method. 
Conflicts:
	server/src/com/cloud/storage/VolumeManagerImpl.java
 2013-07-23 11:04:39 -07:00
Wei Zhou 9985a895a4 CLOUDSTACK-3734: remove wrong break in 'for' block in VirtualMachineManagerImpl.java 2013-07-23 17:37:39 +02:00
Sanjay Tripathi a7084b2dac CLOUDSTACK-3727: Resource Count calculation happens for deleted accounts on restart of managment server. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-23 20:25:15 +05:30
Likitha Shetty 7e87221372 CLOUDSTACK-3526. When volume upload is in progress the state of the volume is UploadError. 
Update volume_view to join volumes table with volume_store_ref table instead of volume_host_ref table.
 2013-07-23 18:44:39 +05:30
Saksham Srivastava 89b94bb754 CLOUDSTACK-3382. Alert should be raised if a vm is migrated from dedicated to non-dedicated resource and vice versa. 
Alerts are generated for VM migration between:
1) Source host is dedicated and destination host is not.
2) Source host is not dedicated and destination host is dedicated.
3) Both hosts are dedicated to different accounts/domains
 2013-07-23 13:38:14 +05:30
Alex Huang 51377c40f2 Forgot to populate a method to called advanceStop 2013-07-22 20:06:05 -07:00
Alex Huang 5297a071d2 Changed virtual machine stop to use uuid 2013-07-22 20:06:04 -07:00
Alex Huang 319d91e1c2 Removed the getByTypeAndId() method and replace it with getById method 2013-07-22 20:06:04 -07:00
Alex Huang 6ac361e6a2 Removed VM generic from VirtualMachineGuru. Part of the cleanup to make vmsync a simple vm manager that doesn't understand the different types of vms 2013-07-22 16:32:59 -07:00
Min Chen db8b9ea53a Remove CLOUDSTACK-3513 debugging messages. 2013-07-22 16:18:16 -07:00
Min Chen 0fb3286cb1 CLOUDSTACK-3513:[Automation] Failed to copy iso and template between 
zones. Failed to pass generated copy url to DownloadCommand.
 2013-07-22 16:17:56 -07:00
Anthony Xu 3d05fb0b3e throw exception if stopping VM fails, then UI can show the error message in stead of fails silently 2013-07-22 16:14:01 -07:00
Anthony Xu 04cdd90a84 in one zone, Admin should not be allowed to add a Shared Network with a subnet that is already associated with another Vlan. 2013-07-22 14:29:38 -07:00
Alex Huang 1325014a03 Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms. 2013-07-22 11:48:11 -07:00
Alex Huang 7928963d16 Changed start to use uuid instead of generic vm start 2013-07-22 11:46:33 -07:00
Alena Prokharchyk d0422904d7 CLOUDSTACK-3711: return descriptive error message to the regular user when his resource limit has exceed. No harm in returning this info as the user aware of the resource limits/number of resources available for allocation, for his account 
Conflicts:
	server/src/com/cloud/api/ApiServer.java
 2013-07-22 10:28:42 -07:00
Sheng Yang 2df1d7f328 Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm" 
This reverts commit f99d599930.

Due to it break vpc function and block regression test.

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java
 2013-07-21 22:23:48 -07:00
Min Chen d423a755f5 CLOUDSTACK-3274: API Refactoring: secretkey and accesskey of the backing 
store is found in plaintext in the logs.

Conflicts:
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java
 2013-07-20 18:01:49 -07:00
Min Chen 6689e83d7f CLOUDSTACK-3513: ListIsos/ListTemplates does not return correct results 
when id and zoneid are passed.
 2013-07-20 15:18:33 -07:00
Harikrishna Patnala 78f1092df1 CLOUDSTACK-3365: cluster level parameters cluster.(cpu/memory).allocated.capacity.notificationthreshold is not considering overcommit value 2013-07-20 16:53:45 +05:30
frank 0633608f80 CLOUDSTACK-3453 
UCS:API: List Blades after decommissioning a blade, listUcsBlades API returns wrong number of total blades

fixed resolved
 2013-07-19 16:16:41 -07:00
Edison Su cd6853cc1a CLOUDSTACK-732 Add disk snapshot for KVM 6.3, add the flag in CS. 
Signed-off-by: Edison Su <sudison@gmail.com>

Conflicts:

	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
 2013-07-19 13:26:19 -07:00
Alena Prokharchyk 823c72552e InternalLb: fixed creation for default network offering with internal lb support - public lb support should be disbaled on it 2013-07-19 13:20:57 -07:00
Murali Reddy a5dcb27547 CLOUDSTACK-3640: [Usage][GSLB] usage events are not generated for GSLB 
geneating usage events for create/delete of GSLB rule
 2013-07-19 18:45:36 +05:30
Murali Reddy 28aaa7534a CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events 
for portable IPs

generating usage events for acquire/release of portable IP
 2013-07-19 18:45:14 +05:30
Sanjay Tripathi 3771e8a0e6 CLOUDSTACK-3496: [Regression]Primary Storage resource usage is not getting updated if detached volume is deleted 2013-07-19 16:04:36 +05:30
Sanjay Tripathi 539eb38908 CLOUDSTACK-3492: [Regression]Update Resource Count for an account is updating the primary storage incorretly. 
The issue is that while calculating the used primary storage size, the updateResourceCount
API is also calculating the disk size of virtual router VM, created for that account and
because of this, the API is returning the incorrect result.
 2013-07-19 16:04:10 +05:30
Devdeep Singh bd54fa13a3 CLOUDSTACK-3661: Fix for IndexOutOfBoundException in connect process to SSVM. 2013-07-19 13:03:21 +05:30
Harikrishna Patnala 03fac83180 CLOUDSTACK-3358: create template from a volume/snapshot should also take input from User/Admin whether xstools / vmware tools installed in the VM 
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
 2013-07-19 11:55:32 +05:30