Commit Graph

196 Commits

Author SHA1 Message Date
Rohit Yadav
1ef12f4145 awsapi: fix duplicate variable
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-27 12:00:56 +05:30
Rohit Yadav
43f3d6ae19 services, awsapi: use better string comparision
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d08369ad06)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	awsapi/src/com/cloud/bridge/util/EC2RestAuth.java
	awsapi/src/com/cloud/bridge/util/RestAuth.java
2015-01-22 18:14:11 +05:30
Rohit Yadav
f47e32ec5f
cloudstack: change version to 4.3.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 19:08:36 +05:30
Rohit Yadav
2a72afdc48 Revert "Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path""
The revert was an error, sorry about that.
  - Rohit

This reverts commit 0aba9654f8.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-21 18:04:33 +05:30
Rohit Yadav
0aba9654f8 Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path"
This reverts commit c3c3bab41a.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-20 20:35:45 +05:30
Rohit Yadav
c3c3bab41a Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path
This reverts commit e6d00bcc66.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-20 14:04:43 +05:30
Rohit Yadav
e6d00bcc66 Revert "Updating pom.xml version numbers for release 4.3.2-SNAPSHOT"
This reverts commit 063bb8f5b4.
2014-11-18 16:04:33 +05:30
Sebastien Goasguen
063bb8f5b4 Updating pom.xml version numbers for release 4.3.2-SNAPSHOT
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-09-16 09:16:47 -04:00
Sebastien Goasguen
41c0eaa14d Updating pom.xml version numbers for release 4.3.1
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-09-04 16:47:57 +02:00
Sebastien Goasguen
a654894dbd Updating pom.xml version numbers for release 4.3.1-SNAPSHOT
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-08-25 09:16:27 -04:00
Edison Su
f304df0be9 Merge branch '4.3-forward' into 4.3 2014-06-04 16:25:13 -07:00
John Kinsella
76872f6283 CLOUDSTACK-6156: removing rampart maven dependencies from awsapi
The removed dependencies don't seem to be used in code, and their
presence is causing at least some people to be unable to build awsapi
and RPM packages.

Signed-off-by: John Kinsella <jlk@stratosec.co> 1395207698 -0700
2014-04-21 11:37:05 -06:00
Hugo Trippaers
9d6ba8e406 Addon on Davids fix. Fix runtime dependency in awsapi/pom.xml. Set dependency for mysql in juniper contrail to test, as it is only required for integration testing. 2014-02-24 10:08:01 +01:00
David Nalley
0c2ad0338e fixing the mysql client libraries dependency problem 2014-02-23 02:33:09 +00:00
Animesh Chaturvedi
70ba92fc14 Updating pom.xml version numbers for release 4.3.0
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-21 17:29:51 -08: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
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
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
Hugo Trippaers
cc6edbdbfe Fix a few warnings in the awsapi pom
Apply formatting
2013-09-21 15:49:54 +08:00
Kelven Yang
170e21246e apply https://reviews.apache.org/r/13732/
Signed-off-by: Kelven Yang <kelveny@gmail.com>
2013-09-04 14:49:46 -07:00
Anshul Gangwar
bf5e86eb22 CLOUDSTACK-2187: fixed by adding snmp-alerts and syslog-alerts plugin dependency to awsapi
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-08-08 10:28:43 +05:30
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
Alex Huang
c2752ba93c Removed mysql as any dependency 2013-07-26 20:35:48 -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
Alex Huang
b18c72626b Moved the SprintUtils which is for testing only to be in test directory. Changed pom.xml for different projects to use the utils test-jar. Removed some @Component annotations. Moved majority of the dependencies from cloudstack pom to utils pom 2013-07-18 21:53:51 -07:00
Likitha Shetty
58d648345e CLOUDSTACK-2777. Apache build should create jar file cloud-ec2.aar and package it under webapps7080/awsapi/WEB-INF/services 2013-07-09 15:24:41 +05:30
Likitha Shetty
24e9797807 CLOUDSTACK-3112. UserCredentials that is injected in AuthenticationHandler is not picked up 2013-07-08 15:37:57 +05:30
Likitha Shetty
4bf6c1e2f7 CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files
[Support for EC2 API version 2012-08-15]
2013-07-04 11:59:36 +05:30
Likitha Shetty
4cda7a5d97 CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files
[Support for EC2 API version 2012-08-15]
2013-07-04 11:58:23 +05:30
Likitha Shetty
26af71b23b CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files
[Support for EC2 API version 2012-08-15]
2013-07-04 11:11:21 +05:30
Likitha Shetty
d908f85749 CLOUDSTACK-1444. Fix EC2 Query API to support latest ec2 api version 2012-08-15 [Support for EC2 API version 2012-08-15]
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
2013-07-04 10:09:00 +05:30
Likitha Shetty
3cfaa92917 CLOUDSTACK-3258. In AWSAPI provide Tags support for resource 'security group'
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
2013-07-04 10:08:42 +05:30
Likitha Shetty
135b688a00 CLOUDSTACK-1444. Updated EC2SoapService and EC2SoapServiceImpl to be compatible with the java stubs generated from EC2 WSDL 2012-08-15.
- by adding stubs for the new EC2 APIs (unsupported by CS AWSAPI)
  - by setting the new EC2 API response elements
  - by adding support for the new EC2 API request elements
[Support for EC2 API version 2012-08-15]
2013-07-04 10:06:51 +05:30
Likitha Shetty
2570b66756 CLOUDSTACK-1444. Modified services.xml. [Support for EC2 API version 2012-08-15]
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
2013-07-04 10:01:34 +05:30
Likitha Shetty
33df54edaf CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
2013-07-04 10:01:19 +05:30
Likitha Shetty
e4ba348ef0 CLOUDSTACK-1444. Add 3 awsapi profiles 1. Download ec2 wsdl for 2012-08-15 2. Generate stubs (server and client) from the wsdl 3. Remove the ec2 wsdl [Support for EC2 API version 2012-08-15]
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
2013-07-04 09:58:54 +05:30
Likitha Shetty
c08b927b86 CLOUDSTACK-3295. Code should look for xes.keystore under cloud-awsapi-4.2.0-SNAPSHOT and not under generated-webapp. 2013-07-04 09:46:41 +05:30
Prachi Damle
6c9383bd76 CLOUDSTACK-3336 AWSAPI - createVolume API with custom size should prefer a non-tagged custom sized disk offering first over a tagged offering
Changes:
For createVolume API with custom size the awsapi component chooses the custom size disk offering present on CloudStack, sice CS createVolume API needs an offering Id.

But if there are multiple custom size disk offerings, and some of the offerings have tags, awsapi should try to choose a non-tagged custom offering first. There is a reason for people to tag a disk offering and using that on every user API call may not be preferable.

If all disk offerings are tagged however, awsapi will choose one of them.
2013-07-02 15:18:49 -07:00
Prachi Damle
4858bd1df3 CLOUDSTACK-3251 AWSAPI - runInstances should not error out if instanceType provided is a valid ServiceOffering on CloudStack
Changes: - If instanceType value corresponds to a valid serviceoffering on CloudStack, dont error out on runInstances even if thats not an AWS name
2013-06-27 15:59:26 -07:00
Prachi Damle
f88590f6db CLOUDSTACK-3218: AWSAPI - For runInstances, awsapi need not send networkId information in case of advance zone
Changes:
 awsapi will not pass networkId in case of Advance Zone and let CS identify which network to deploy VM in. The same case applies to allocateAddress API too.
2013-06-27 15:49:31 -07:00
Likitha Shetty
dc242039b3 CLOUDSTACK-305. Everytime a SOAP call is made some transactions are rolled back because the transactions are not committed. 2013-06-24 14:21:59 +05:30
Likitha Shetty
77674721ca CLOUDSTACK-308. ec2-describe-instances - Instance type should return right service offering name 2013-06-24 11:29:12 +05:30
Hugo Trippaers
84b92f890c Small fix to satisfy the xml validation requirements 2013-06-17 11:26:13 -07:00
Likitha Shetty
bbfa9bfcbd CLOUDSTACK-2862. EC2Engine is not injected correctly 2013-06-11 10:58:49 +05:30
Likitha Shetty
9a33fd181f CLOUDSTACK-2623. Provide appropriate AWS EC2 error codes in error thrown by CS AWSAPI. Since CS has very few generic errorcode groups, in AWSAPI parse the response message and translate the CS error to AWS EC2 error code.
Provide support for the following error codes -
AuthFailure, DependencyViolation, IncorrectState, InvalidAMIID.NotFound, InvalidAttachment.NotFound, InvalidDevice.InUse, InvalidFilter, InvalidGroup.Duplicate, InvalidGroup.InUse, InvalidGroup.NotFound
InvalidInstanceID.NotFound, InvalidKeyPair.Duplicate, InvalidKeyPair.Format, InvalidKeyPair.NotFound, InvalidParameterCombinatio, InvalidParameterValue, InvalidPermission.Duplicate, InvalidPermission.Malformed
InvalidSnapshot.NotFound, InvalidVolume.NotFound, InvalidVolumeID.Duplicate, InvalidZone.NotFound, MissingParameter, UnsupportedOperation, SignatureDoesNotMatch, InternalError, AddressLimitExceeded, InstanceLimitExceeded
VolumeLimitExceeded, Unavailable, ResourceLimitExceeded

CLOUDSTACK-2624. Support ModifyInstanceAttribute API in AWSAPI.
2 AWS instance attributes will be supported, 'InstanceType' and 'UserData'
As per AWS EC2, to modify both the attributes, the instance must be stopped. If not throw 'IncorrectInstanceState' error
2013-05-22 18:17:11 +05:30
Likitha Shetty
eb92135d55 CLOUDSTACK-2603. EC2RunInstances return xen or ovm as the response value for attribute "hypervisor" 2013-05-21 15:15:35 +05:30
Likitha Shetty
6217b0fb4c CLOUDSTACK-2600. Fix CS AWSAPI to add the below filters that are missing in DescribeImages API-
architecture
description
image-id
image-type
is-public
name
owner-id
state
tag-key
tag-value
tag:key
hypervisor
2013-05-21 12:10:52 +05:30
Likitha Shetty
503392119d CLOUDSTACK-2599. Fix EC2 Rest to support tag related EC2 API's - CreateTags/DeleteTags/DescribeTags 2013-05-21 11:33:33 +05:30
Likitha Shetty
8986e16e5f CLOUDSTACK-2576. AWS API not returning values in CFSimpleXML Object format.
PHP SDK calls the CFSimpleXML parser class to parse the response body into CFSimpleXML Object format.
In AWSAPI added an XML declaration during serialization of Axis beans to XML output
2013-05-20 15:01:57 +05:30
Likitha Shetty
046580fcf1 CLOUDSTACK-2552. Modify AWSAPI to decrypt db values using the decrypted database_key and not management_server_key 2013-05-17 13:16:04 +05:30