15975 Commits

Author SHA1 Message Date
Hugo Trippaers
78f7228cbe Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-02-02 12:20:55 +01:00
Hugo Trippaers
6c034673a8 Use align phases between the various packages. Not very handy to use a tgz file in the generate-resources phase when it is created in the package phase 2013-02-02 12:19:33 +01:00
Hugo Trippaers
0495f5309e Remove yet another test where the database was not properly mocked. FIXME 2013-02-02 12:18:51 +01:00
David Nalley
9c87970d1f setting the version for apidocs to 4.2.0 2013-02-02 05:56:19 -05:00
Hugo Trippaers
e04d8f3fcf We don't need logs in out source tree 2013-02-02 11:25:04 +01:00
Kelven Yang
8f70ee08e0 Fix the unsolved conflicts for doc build 2013-02-01 17:22:51 -08:00
Kelven Yang
e74f72be34 Fix the merge conflicts 2013-02-01 15:22:58 -08:00
Kelven Yang
296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Rohit Yadav
631b6fd46a CLOUDSTACK-1037: Make cloudmonkey awesome-er
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-01 14:34:49 -08:00
Kelven Yang
7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Koushik Das
77e3aade03 CS-CLOUDSTACK-606:
The issue happens randomly when hosts in a cluster gets distributed across multiple MS. Host can get split in following scenarios:
    a. Add host – MS on which add host is executed takes ownership of the host. So if 2 hosts belonging to same cluster are added from 2 different MS then cluster gets split
    b. scanDirectAgentToLoad – This runs every 90 secs. and check if there are any hosts that needs to be reconnected. The current logic of host scan can also lead to a split

    The idea is to fix (b) to ensure that hosts in a cluster are managed by same MS. For (a) only the entry in the database is going to be created except in case if the host getting added is first in the cluster (in this case agent creation happens at the same time) and then (b) will take care of connection and agent creation part. Since currently addHost only creates an entry in the db there is a small window where the host state will be shown as 'Alert' till the time (b) is scheduled and picks up the host to make a connection. The MS doing add host will immediately schedule a scan task and also send notification to peers to start the scan task.
2013-02-01 16:58:29 +05:30
Pranav Saxena
bd825109d8 Persistent Networks support - UI functionality 2013-02-01 16:41:29 +05:30
Koushik Das
777147ce8a CS-CLOUDSTACK-606:
The issue happens randomly when hosts in a cluster gets distributed across multiple MS. Host can get split in following scenarios:
    a. Add host – MS on which add host is executed takes ownership of the host. So if 2 hosts belonging to same cluster are added from 2 different MS then cluster gets split
    b. scanDirectAgentToLoad – This runs every 90 secs. and check if there are any hosts that needs to be reconnected. The current logic of host scan can also lead to a split

    The idea is to fix (b) to ensure that hosts in a cluster are managed by same MS. For (a) only the entry in the database is going to be created except in case if the host getting added is first in the cluster (in this case agent creation happens at the same time) and then (b) will take care of connection and agent creation part. Since currently addHost only creates an entry in the db there is a small window where the host state will be shown as 'Alert' till the time (b) is scheduled and picks up the host to make a connection. The MS doing add host will immediately schedule a scan task and also send notification to peers to start the scan task.
2013-02-01 15:34:41 +05:30
Devdeep Singh
e162876605 CS-16544: Create Snapshot (2nd time - reccuring) is failing on XenServer 6.1. The issue is that while backing up a snapshot when cloudstack tries to update the parent (of the backed up vhd), vhd-util isn't present at the desired location and setParent function in vmopsSnapshot fails. This issue is observed only on Xenserver 6.1. The reason for this is, when CloudStack connects to a Xenserver and executes the SetupCommand, it copies vhd-util tool to /opt/xensource/bin directory on the host. However, in vmopsSnapshot python file 'VHD_UTIL' is initialized to /usr/sbin/. The issue is not observed on 6.0.2 (and I guess previous versions) because vhd-util is present in /usr/sbin/ directory by default (after a clean install). Whereas, in Xenserver 6.1, vhd-util is present in '/usr/bin'. Fixed the issue by updating VHD_UTIL to point to /opt/xensource/bin/vhd-util in vmopsSnapshot file. 2013-02-01 15:25:26 +05:30
Likitha Shetty
13ee8d1865 Persistent Networks support
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 15:10:06 +05:30
Saksham Srivastava
482ea4a71e CLOUDSTACK-822: system.vm.password is not encrypted
Signed-off-by: Kishan Kavala <kishan@cloud.com>
2013-02-01 14:18:59 +05:30
Jayapal Uradi
6f89a843a8 CLOUDSTACK-1114: fixed listegressfirewallrule issue with networkid 2013-02-01 14:07:05 +05:30
Kishan Kavala
fc925022bd Upgrade changes for Region schema. Made region_id not null 2013-02-01 13:49:57 +05:30
Murali Reddy
bfc4f982fd adding missing license in one of the files of BigSwitch 2013-02-01 13:32:13 +05:30
Kanzhe Jiang
736b236eaf bigswitch controller support
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>

Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 12:42:04 +05:30
Kishan Kavala
2491ff1cff apidoc: Added Region category 2013-02-01 12:34:56 +05:30
Kishan Kavala
519ca619df Encode password using UserAuthenticator 2013-02-01 12:23:15 +05:30
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 894cb8f7d9fc8b5561754a9fa541fef8f235148a 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
Anthony Xu
65210f4e7e CLOUDSTACK-737
support multiple NICs in Security group in java side
2013-01-31 15:45:52 -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