Commit Graph

18 Commits

Author SHA1 Message Date
Prasanna Santhanam ed2ce27371 CLOUDSTACK-2652: requests module differs on Python 2.6
On 2.6 response.json returns the JSOn in the response while on 2.7
response.json() is a method. Since Marvin installs on both platforms
fixing the error appropriately

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-24 19:22:49 +05:30
Girish Shilamkar 4d0cea6626 CLOUDSTACK-2513: VPN tests refer to invalid connection.user in cloudConnection
cloudConnection object should always have "user" and "passwd" attributes.
And they are "None" while creating userAPIClient. As we already
have "user" and "password" for mgmt server.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-17 14:05:04 +05:30
Prasanna Santhanam b17be94cf5 don't let requests logs
requests logs to the logger making it hard to distinguish marvin logs
from http logs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-15 14:52:33 +05:30
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Prasanna Santhanam 4e9e7937ed Fix Vijay's test to use the marvin integratin libararies
Changes to marvin_request and base libraries to accomadate POST
requests.

Additional tests for sending userdata through GET Userdata tests - send
size>2k data via GET and POST.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-24 13:43:08 +05:30
Talluri 9572f57648 CLOUDSTACK-2135: fix the string formatting error in cloudstackConnection.py
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-22 19:35:22 +05:30
Prasanna Santhanam b12905b7a8 pep8 compliance for cloudstackConnection
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-18 07:44:25 +05:30
Prasanna Santhanam 167781ec01 refactor marvin to use requests instead of urllib2
Use python-requests [1] for Marvin. Requests enables graceful handling
of http connections. Marvin's cloudstackConnection has been refactored,
cleaned up to act as a single module for all kinds of cloudstack API
requesting.

TODO:
1. session based login mechanism of the UI should work from
cloudstackConnection
2. cloudmonkey can also reuse /import marvin.cloudstackConnection
3. More graceful handling of POST requests

[1] http://docs.python-requests.org/en/latest/

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-17 19:11:47 +05:30
Chiradeep Vittal e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
John Burwell e4583ced2e S3-backed Secondary Storage 2013-01-02 10:28:47 -08:00
Edison Su b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Chip Childers 2ee9253c78 CLOUDSTACK-514: Adding https and api path support to Marvin.
This is the first part of fixing CLOUDSTACK-514, and is hopefully
backward compatible with previous use of Marvin.  I added two new
parameters to the cloudstackConnection module, protocol and path.
Both have been defaulted to the previously *assumed* values.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-19 12:06:18 -05:00
Rohit Yadav 8ea2cc4e57 marvin: raise error so cli can pick it up
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-16 22:18:32 +05:30
Rohit Yadav d72d3ee22b marvin: check and use logger
Checks and only then calls logger

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-31 23:18:06 +05:30
Prasanna Santhanam ed113ca844 Correcting the imports for HTTPException 2012-07-30 15:32:34 +05:30
David Nalley ecf2cd57f9 fixing license headers in marvin 2012-07-04 18:45:08 -04:00
Prasanna Santhanam 7f470e8d2a Merge latest testClient fixes to marvin
reviewed-by: unittest
2012-04-12 18:10:32 +05:30
Prasanna Santhanam 5c37d144cc Package management for the python testclient christened Marvin
$ant package-marvin
will create a packaged source tarball of the testclient that is
redistributable and decoupled from the rest of the cloudstack build
reviewed-by: unittest
2012-04-11 18:24:20 +05:30