Commit Graph

6332 Commits

Author SHA1 Message Date
Murali Reddy 83d381f25c fixing some issues found in unit testing 2013-03-26 12:00:13 +05:30
Murali Reddy d56ccd438d Merge branch 'master' into gslb-wip 2013-03-20 00:44:52 +05:30
Murali Reddy e601272679 logic to get the NetScaler configured as gslb servce provider in the
zone
2013-03-20 00:43:03 +05:30
Kishan Kavala 90678c3d14 CLOUDSTACK-198: Included VpnUsers in Add state while listing. Added state to Vpn user response. 2013-03-19 18:17:09 +05:30
Murali Reddy dc25e9f2bb Merge branch 'master' into gslb-wip 2013-03-19 17:21:59 +05:30
Murali Reddy 45110b65dc Merge branch 'master' into gslb-wip
Conflicts:
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/region/Region.java
	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	server/src/org/apache/cloudstack/region/RegionVO.java
2013-03-19 17:20:44 +05:30
Rohit Yadav beb15af0f2 CLOUDSTACK-1720: Add upgrade paths from 4.0.x to 4.2.0
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-19 12:21:19 +05:30
Kelven Yang fb94b72213 CLOUDSTACK-1568,CLOUDSTACK-1664: Fix ActionEvent interception and optimize @DB lookup with caching 2013-03-18 18:07:52 -07:00
Prachi Damle d9b85e397d CLOUDSTACK-1706 Failed to deploy VM with error "cannot find DeployPlannerSelector"
Changes:

- Regular plugin/adapter components should usually be loaded at run level RUNLEVEL_COMPONENT(5)
- HypervisorVmPlannerSelector was at level 0, while configurationServer at level 2  - causing config to be not loaded for the HypervisorVmPlannerSelector
2013-03-18 12:12:56 -07:00
Min Chen 2b05f546b7 CLOUDSTACK-1690: Remove region_id from sql insert statement for inserting "system" and "admin" account and user in MS startup due to recent region feature change. 2013-03-18 11:21:15 -07:00
Rajesh Battala 183b989d30 CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful 2013-03-18 14:01:15 +05:30
Anshul Gangwar 61754cd987 CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack
Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-18 11:36:19 +05:30
Chip Childers eee720ceaa CLOUDSTACK-1702: Changed getId to getUuid in an exception message
string.

This doesn't resolve the bug in question, but does fix the specific
message that was reported as the origin of the bug.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-16 15:22:51 -04:00
Min Chen 1dc1bf00c6 CLOUDSTACK-1684: api.throttling.enabled configuration setting should be set to "false" in Config.java. 2013-03-14 21:17:35 -04:00
Sanjay Tripathi 105618896b CLOUDSTACK-1645 : Resources limit is not validated with update compute offering [ Instances are updated to higher CPU/Memory resources though there are no resources available @ account/domain] 2013-03-14 13:44:34 -07:00
Sheng Yang 98291d043d CLOUDSTACK-1218: Use the first IP in the first vlan range for VR in shared network 2013-03-14 13:13:31 -07:00
Prachi Damle a7231015e8 CLOUDSTACK-1604: deploy VM failed when global setting "vm.allocation.algorithm" is set to "userdispersing"
Changes:
- DeployPlannerSelector was newly introduced for BareMetal feature. It had the planner name hardcoded.
- Change it to decide the planner by referring to the global config vm.allocation.algorithm value
2013-03-14 11:24:35 -07:00
Wido den Hollander 41e3db39c3 debian: Package ulimits and sudo rules
The old packages used to write this data to the configuration
in a postinst file.

That was horrible to track since system administrators had no
idea what was going on.
2013-03-14 15:55:32 +01:00
Kishan Kavala 2dd31f331d CLOUDSTACK-1636: Removed the concept of owner region.
Removed region_id from user/account and domain tables.
Removed forwarding of api calls to owner region.
Removed api_key and secret_key from region table.
Included related DB upgrade changes.
2013-03-14 11:53:40 +05:30
Jayapal Uradi b4bab5a152 CLOUDSTACK-1595 removeIpFromNic using uuid and response changes
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 14:46:31 +05:30
Rohit Yadav 0f8c4d0ac0 baremetal: Remove old templateadapter in cloud-server, fix spring xmls
The BareMetalTemplateAdapter in cloud-server is old and was introduced by recent
branch merges, Frank had separated and moved code to the baremetal plugin so
we will use that.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-13 11:50:54 +05:30
Bharat Kumar 6715f98087 CLOUDSTACK-1551: Failed to list clusters due to NPE at createClusterResponse(ApiResponseHelper.java:837) when cluster is added automatically as a part of addHostCommand
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 11:07:28 +05:30
Jayapal Uradi a49261c3b1 CLOUDSTACK-24: mipn feature for basiczone
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 10:24:22 +05:30
Kelven Yang d55560a627 CLOUDSTACK-1624: Initialize configuration variables properly to avoid influence of any racing conditions 2013-03-12 15:02:31 -07:00
Likitha Shetty da89946ca9 CLOUDSTACK-1625. NPE with updateResourceCount when && is passed thru API.
If any API contains '&' i.e. no key value pair or '&<paramter-name>' i.e. a parameter without a value, then we get an NPE as owasp.esapi.StringUtilities.stripControls deosn't handle NPE.
2013-03-12 12:00:46 +05:30
Murali Reddy 3a310ac830 move DB schema changes from create-schema to schema41-42 file 2013-03-12 11:28:46 +05:30
Min Chen 1af8710da8 updateTemplatePermissions should allow user to be able to see
templates granted permissions by another user.
2013-03-11 17:32:26 -07:00
Min Chen bab6839f38 CLOUDSTACK-1621: listProjectInvitations fails with NPE for valid requests. 2013-03-11 13:07:12 -07:00
Saksham Srivastava 75261eb317 CLOUDSTACK-924 :
Volumes created from snapshots misses the source template information.Fixed the issue with volumes now getting the template id.
	Signed Off by : - Nitin Mehta <nitin.mehta@citrix.com>
2013-03-11 16:40:12 +05:30
Murali Reddy fea98fa66b Merge branch 'master' into gslb-wip
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/Config.java
	setup/db/create-schema.sql
2013-03-11 14:28:26 +05:30
Murali Reddy 11a7546f1e add the ability to add NetScaler device as GSLB provider in a zone 2013-03-11 12:42:51 +05:30
Kishan Kavala 603b5ad985 CLOUDSTACK-1569: Only forward API to source region and check for succcess. Do not convert the response to user/account/domain object since it is not updated locaaly. 2013-03-11 12:18:52 +05:30
Sheng Yang e35ce6587a CLOUDSTACK-1461: Don't set dns server for non-default ipv6 network
The non-default parameter can be used by ipv4 as well in the future.
2013-03-08 17:43:23 -08:00
Min Chen e40ebcce8f CLOUDSTACK-1179: API searches for names should not be fuzzy. fuzzy
search should be done through keyword.
2013-03-08 16:43:03 -08:00
Alena Prokharchyk 860ea5c0dd CLOUDSTACK-1451 Pass randomly generated UUID instead of empty string when create internal account as a part of project creation. Otherwise entityexistsexception would happen when attempt to create more than 1 project in the system 2013-03-08 14:57:54 -08:00
Min Chen c129c4e02e Add missing Apache license header. 2013-03-08 14:38:35 -08:00
Sanjay Tripathi f539f40e35 CLOUDSTACK-874: Ability to delete Events and Alerts
This feature will provide the functionality to delete or archive
the Alerts/Events.
Delete or archive alerts APIs are available only for root-admin,
delete or archive events are available for regular users.
2013-03-08 11:59:53 -08:00
Chip Childers bd4508589b Revert "CLOUDSTACK-874 Ability to delete Events and Alerts"
This reverts commit 5e4c2c8a9e.
2013-03-08 14:28:23 -05:00
Sanjay Tripathi 5e4c2c8a9e CLOUDSTACK-874 Ability to delete Events and Alerts
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-03-08 10:52:40 -08:00
Kishan Kavala a1fdb0c2d4 CLOUDSTACK-241: Remove API sync. Merge changes from 4.1 branch. Converted tabs to spaces. 2013-03-08 19:02:41 +05:30
Likitha Shetty ee9f97f92e CLOUDSTACK-1509. During CreateVLANIPRange while trying to assign Public IPs to a new network if the network offering is persistent we get an NPE.
Since associateIpRangeToAccount starts and commits a seaparte transaction, commit the transaction started for createVlanAndPublicIpRange before calling associateIpAddressListToAccount.
2013-03-08 13:59:02 +05:30
Edison Su 409ec9c6b6 CLOUDSTACK-1426: We has strong implication that VO must implement an interface, otherwise EntityManagerImpl can't the vo 2013-03-07 18:25:57 -08:00
Murali Reddy 89c33a01e7 -introducing RegionServiceProvider and GslbServiceProvider
-NetScaler element implements GslbServiceProvider
2013-03-07 20:05:51 +05:30
Sanjay Tripathi 9b288c758b CLOUDSTACK-1574: updateResourceCount API is failed saying to specify valida resource type even after parsing the valid resource type.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-07 11:43:39 +05:30
Kishan Kavala 99066060cd CLOUDSTACK-1572: Remove references to netscalar vpc provider. NetworkElement is not implemented yet 2013-03-07 16:42:39 +05:30
Harikrishna Patnala d51e964d42 CLOUDSTACK-1013 : running cloudstack overwrites default public/private ssh keys
The default private/public keypairs in .ssh will not be overwritten.
Instead cloudstack will generate a new keypair id_rsa.cloud and
id_rsa.cloud.pub and use those in developer mode.

To use this insert the (name,value)=(develop,true) tuple into
`cloud`.`configuration`

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-07 15:11:05 +05:30
Sheng Yang 27ba0208f0 CLOUDSTACK-1315: Fix NPE when try to upgrade network from VR to SRX-F5
Still return a valid object when reverting non-existed rules.
2013-03-06 16:49:44 -08:00
Min Chen e31cd2b3d2 CLOUDSTACK-1402: listRouters API response doesn't return linklocal IP and public IP details. 2013-03-06 11:31:52 -08:00
Rohit Yadav a1ca7e09ca rat: Fix license header on DataCenterLinkLocalIpAddressDao.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-06 18:46:33 +05:30
Rohit Yadav 15b5b7e7a3 CLOUDSTACK-1417: cosmetics, print param name, value for uuid->id translate error
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-06 17:55:40 +05:30