Commit Graph

15851 Commits

Author SHA1 Message Date
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Kishan Kavala 4f53eb11f0 Merge branch 'master' into regions 2013-02-01 11:59:12 +05:30
Murali Reddy 1a348c85fd adding apache license heders to the files that are faling RAT check 2013-02-01 11:41:30 +05:30
Kishan Kavala 9ea90c3359 Merge branch 'master' into regions
Conflicts:
	client/tomcatconf/components.xml.in
	server/src/com/cloud/api/ApiResponseHelper.java
2013-02-01 11:38:16 +05:30
Murali Reddy 96c24930ae Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-01 08:45:53 +05:30
Kishan Kavala 33b87d8985 CLOUDSTACK-686: Modified unique constraint to include physical_network_id 2013-02-01 07:54:31 +05:30
Sheng Yang c0b18c76f0 IPv6: Add missing license header 2013-01-31 17:26:46 -08:00
Kelven Yang 7bd8bec68a Sync javelin with master up to 894cb8f7d9 2013-01-31 17:20:19 -08:00
Brian Federle 894cb8f7d9 Advanced SG instance wizard: Fix back button
Fixes back button for select SG step, when using SG-enabled advanced
network.
2013-01-31 16:07:50 -08:00
Kelven Yang 64d794ea36 Restore old caching policy on DAOs under Spring configuration 2013-01-31 16:00:13 -08:00
Sheng Yang 5cb9df91a1 Merge branch 'ipv6'
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
frank 8416d81b99 Merge branch 'ucs' into javelin
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	plugins/pom.xml
	utils/src/com/cloud/utils/exception/CloudRuntimeException.java
	utils/src/com/cloud/utils/exception/RuntimeCloudException.java
2013-01-31 14:44:07 -08:00
joesan 44d1397d36 fix CS-1080 2013-01-31 13:04:36 -08:00
Murali Reddy e7a554fc6a Merging events framework branch into master. This commit will bring
following changes

   - introduced notion of event bus with publish, subscribe, unsubscribe
     semantics

   - a plug-in can implement the EventBus abstraction to provide event
     bug to CloudStack

   - A rabbitMQ based plug-in that can interact with AMQP servers to
     provide message broker based event-bug

   - stream lines, action events, usage events, alerts publishing in to
     convineance classed which are also used to publish corresponding
     event on to event bus

   - introduced notion of state change event. On a state change, in the
     state machine corrsponding to the resource, a state change event is
     published on the event bug

   - associated a state machined with Snapshot and Network objects

   - Virtual Machine, Volume, Snaphost, Network object state changes wil
     result in a state change event
2013-02-01 01:37:24 +05:30
Likitha Shetty 64b00d0b34 [EC2 Query API] Remove the registration step since query API does not require the certificate
https://reviews.apache.org/r/8742/

While checking if the user keys exists and also while retrieving the secret-key for signature generation (Query API only), make a change to directly check in the 'cloud' DB instead of the 'cloudbridge' DB.
With this change user will not require to register the keys before making EC2 Query API calls against CS. The registration process to make EC2 SOAP API calls will remain the same.
2013-01-31 12:00:39 -08:00
Likitha Shetty f18828d7d8 [EC2 Query API] AttachVolume fails with 'Permission Denied: Invalid Signature' error.
https://reviews.apache.org/r/8480/

In AWSAPI while forming the signature to validate an API, url-encode every parameter name with UTF-8 encoding scheme.
2013-01-31 12:00:37 -08:00
Likitha Shetty 61f24d8a16 [EC2 Query API] RunInstance and DescribeInstances throw NumberFormatException error when called using AWS Java SDK
https://reviews.apache.org/r/8483/

AWS Java SDK doesn't expect a string value in the AmiLaunchIndex response element for RunInstances and DescribeInstances response.
2013-01-31 12:00:35 -08:00
Likitha Shetty d738c81a46 [EC2 Query API] DescribeAddresses fails with Null Pointer Exception.
https://reviews.apache.org/r/8492/

As a part of EC2 Query API support, resolve the NPE obtained when DescribeAddresses is called
In EC2Engine modify DescribeAddresses implementation to be consistent with the other Describe* API implementation
2013-01-31 12:00:32 -08:00
Likitha Shetty de517d95b0 [EC2 Query API] AuthorizeSecurityGroupIngress and RevokeSecurityGroupIngress return false even when the request is successful.
https://reviews.apache.org/r/8513

If the response is not null and if all the ruleid's(permissions) are present return true.
2013-01-31 12:00:30 -08:00
Likitha Shetty b514735c7b [EC2 Query API] AuthorizeSecurityGroupIngress fails with 'Server.InternalError 431 Invalid protocol' error.
https://reviews.apache.org/r/8468

Before making the AuthorizeSecurityGroupIngress CloudStack API call, parse the string arguments 'FromPort' and 'ToPort' as an integer.
2013-01-31 12:00:28 -08:00
Likitha Shetty bea669d091 [EC2 Query API] RevokeSecurityGroupIngress fails with 'EC2ResponseError'.
https://reviews.apache.org/r/8466/

[EC2 Query API] Provide DescribeKeyPairs Query API support in CS AWSAPI.
https://reviews.apache.org/r/8465/
2013-01-31 12:00:25 -08:00
Min Chen 6a6d93c309 Fix a bug in listStoragePools api where SQL exception is thrown when a
parameter is passed.
2013-01-31 11:56:48 -08:00
Rohit Yadav 4f7bf192ce INSTALL: Add port info used by CloudStack or components
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-31 11:47:23 -08:00
Kelven Yang 1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Kishan Kavala a33d8f9601 Fixed listRegions serach by id, name 2013-01-31 23:25:29 +05:30
Kishan Kavala c607e03f0e Merge branch 'master' into regions 2013-01-31 22:31:25 +05:30
Kishan Kavala e7341313e9 Added unit tests 2013-01-31 22:28:09 +05:30
Pranav Saxena cae89c61f5 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-01-31 20:39:53 +05:30
Pranav Saxena 5d8e1f0dff Enabling Egress Rules Feature on the UI 2013-01-31 20:39:09 +05:30
Kishan Kavala c17c7007f4 Added RegionServiceImpl to DefaultComponentLibrary 2013-01-31 18:26:54 +05:30
Prasanna Santhanam 1b922e816c Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second"
Reverted as per discussion at http://s.apache.org/NOm

This reverts commit 5060f98268.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-31 18:15:41 +05:30
Kishan Kavala 8b1a5b1de2 - Separated RegionServiceImpl and RegionManagerImpl
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
Pranav Saxena 3cbce11b78 Fixing a label in network offering 2013-01-31 18:01:42 +05:30
Prasanna Santhanam e06a8569a2 propagate storagetype fix from commit e49b3b to diskOffering
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Sun Dec 9 23:13:24 2012 -0800

    marvin: storagetype reference only when attr present

    reference the storagetype only when present. storagetype is reqd
    only for devcloud style tests

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-31 16:03:43 +05:30
Jessica Tomechak 9b05d55515 Docs. CLOUDSTACK-192. Remove documentation on XenServer hotfix notification, as the feature was not approved for inclusion in this release. 2013-01-30 22:15:33 -08:00
Sheng Yang ed777bb7f3 IPv6: Check startipv6, endipv6 and ip6Gateway with ip range 2013-01-30 22:13:46 -08:00
Jayapal b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Jayapal 48fdc25daa CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 10:57:30 +05:30
Sheng Yang f57cbaacd6 IPv6: Fix VlanIpRangeResponse 2013-01-30 20:01:04 -08:00
Sheng Yang f45576bce5 IPv6: Fix missed AddressFormat in nic table 2013-01-30 19:46:30 -08:00
Prachi Damle 3c75d53f2f more change to fix awsapi deployment with maven and jetty and Spring 2013-01-30 18:16:45 -08:00
Rohit Yadav ae3d8aa018 rat: Fix apache license
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:44:41 -08:00
Sheng Yang 4adc974ab7 IPv6: Disable untested features 2013-01-30 17:43:29 -08:00
Rohit Yadav d7ad2da7e0 server: Fix network refactor regressions for CLOUDSTACK-297
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:53 -08:00
Harikrishna Patnala b21595c10d CLOUDSTACK-297: Reset SSH key to access VM
This feature provides resetting a SSH key for an existing VM which means,
setting the old ssh key that is assigned to the VM previously with the new ssh
key.

Signed-off-by: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:44 -08:00
Sheng Yang ed547d91f7 IPv6: Rename public_ipv6_address to user_ipv6_address 2013-01-30 17:05:47 -08:00
Prachi Damle c5b2a65598 Removing the merge conflict statements from git. 2013-01-30 17:04:57 -08:00
Kelven Yang 526bb01b04 Fix awsapi issues in Spring wiring 2013-01-30 16:43:40 -08:00
Marcus Sorensen 15906c03ca Summary: add/remove/update default nics feature
Description: Adds API calls updateDefaultNicForVirtualMachine,
addNicToVirtualMachine, and removeNicFromVirtualMachine. These are
intended to allow a user to modify a VM's configuration post
deployment, to adjust the networks to which the VM belongs.

BUG-ID: CLOUDSTACK-645
Submitted-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359494800 -0700
2013-01-30 17:43:21 -07:00
Likitha Shetty 99556a4f30 CLOUDSTACK-617: Unable to edit a sub-domain. Change UpdateDomain to be consistent with CreateDomain i.e. before this operation, while checking if the domain-name is unique, search under the parent domain instead of searching under the ROOT domain.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 16:40:48 -08:00