apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,398 Commits 304 Branches 324 Tags
Commit Graph

395 Commits

Author SHA1 Message Date
Rohit Yadav
38eaa04b98 Pull changes from master into javelin 
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts

Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:02:54 -08:00
Marcus Sorensen
d8ebd5e4f9 Summary: Change url of tiny linux in devcloud-kvm.sql 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357930366 -0700
 2013-01-11 11:52:46 -07:00
Rohit Yadav
66514c00ef apidoc: Remove api discovery from toc 
Based on eb40d2337e0ae10876a27dfbc22575be8e9d593d

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 09:46:18 -08:00
Prasanna Santhanam
eb40d2337e apidoc: fixing the api doc failure 
remove api-discovery_commands.properties since the plugin returns the
listApis call as a map directly. not needed for api doc generation.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-01-11 17:04:30 +05:30
Alex Huang
d6f44a4d6a merged from master 2013-01-10 15:55:42 -08:00
Marcus Sorensen
1c59dae708 Summary: Add devcloud-kvm files 
Detail: Working on getting a KVM-based devcloud so that development that
requires the KVM hypervisor can be simpler. This adds some setup devcloud files.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357852438 -0700
 2013-01-10 14:13:58 -07:00
Alex Huang
b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Rohit Yadav
b59638e5ae apidoc: Fix apidoc building to generate for new plugin as well 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-08 19:59:47 -08:00
Alex Huang
30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Rohit Yadav
c13f0199f4 cli: Cosmetic fix for prompt of cloudmonkey 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-06 17:30:00 -08:00
Rohit Yadav
f1c15f0c2e cli: Remove unused method, fix welcome msg, prompt 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-05 02:11:45 -08:00
Rohit Yadav
c7563cb7bd cli: Show progress during polling for async jobs 
If asyncblock is set to true, prints dots as polling requests are made.
When result is obtained, dots are wiped and result is printed.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 15:17:06 -08:00
Rohit Yadav
9a66beb658 CLOUDSTACK-717: Fix response json handling in cloudmonkey 
- Fixes response handling
- Sorts alphabetically, count and id are on top if available
- Fix colors

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 15:17:06 -08:00
John Burwell
e4583ced2e S3-backed Secondary Storage 2013-01-02 10:28:47 -08:00
Prasanna Santhanam
bab974c3bc marvin : cloudstack-version is not reqd for json load 
To build back cloudstack response we don't need to load the
'cloudstack-version' string, only the response
 2012-12-26 19:22:17 -08:00
Rohit Yadav
503a5f2ccd cli: Get rid of deprecated sets, go functional, use filter() 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-21 11:21:22 -08:00
Chip Childers
67f9467c5d CLOUDSTACK-697: Reordered the LICENSE and NOTICE file content (as well as descriptor.xml). 
Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	LICENSE
	tools/whisker/descriptor.xml
 2012-12-21 10:35:50 -05:00
Rohit Yadav
13944a0e5e cli: Cosmetic fixes for cloudmonkey and setup.py dependency version fix 
- Fixes shell class name to CloudMonkey
- Fixes prettyprint version req. to 0.6

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-20 16:34:36 -08:00
Rohit Yadav
8f51c630bd CLOUDSTACK-545: Tabularize cloudmonkey's response using filter=<fields,> argument 
- Adds new cloudmonkey config field, tabularize
- If tabularize is set to true, all the list of dict in response are printed as
  table
- The columns of the tables can be filtered using the filter= argument, for ex:
  list domains listall=true filter=id,name,path
- filter arg will take comma separated values, if they have space put them under
  quotes
- Empty filter argument will cause it to print the whole table
- Multiple fields with the same name will cause it to print the column again
- In case there is a typo in the field, that column is skipped. It takes an
  intersection of response dict keys and filter keys provided
- Uses opensource prettytable library to pretty print tabular data

TODOs:
- Handle recursive table printing for nested list of dicts
- Colorize table columns if community wants such a feature

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-20 16:33:08 -08:00
John Burwell
264a0670a8 - [CLOUDSTACK-509] S3-backed Secondary Storage - Adds S3 configuration support to Marvin - Moves configuration of global options to occur creation of zones since the values of global options impact the configuration and zone enablement processes 2012-12-19 16:09:25 -08:00
John Burwell
14f589702a CLOUDSTACK-660: Fixes traffic label configuration in Marvin 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-12-18 13:25:24 -05:00
James Martin
7c56a81bdd devcloud: Fixed regression for network.conf commit 97fe053e2e 
Fixes regression for network.conf, commit:
commit 97fe053e2e1c3fbaf891f300809fa0b926a0ea89
Author: Chip Childers <chip.childers@gmail.com>
Date: Mon Aug 13 11:12:01 2012 -0400

Removed ASF license header from network.conf, because XCP doesn't respect comment lines in this file

This seemed to have been re-introduced during the merge in of my patch.  This file has no been removed
completely and is created in-line through the puppet module.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-17 13:16:32 -08:00
Rohit Yadav
0f2a0950b6 cli: extract apicmd response using the apiname+response key 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-16 22:10:54 -08:00
James Martin
0661f9b814 Added fix to force apt to do a "apt-get update" before packages are installed. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-16 12:29:49 -08:00
Rohit Yadav
be6acc719a rat: Apply missing license for devcloud puppet file 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 23:41:00 -08:00
Rohit Yadav
89dc874f6f rat: Fix license on recently added new files in tools/devcloud 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 22:23:09 -08:00
Rohit Yadav
eddb3dfc92 devcloud: Move build scripts to src/, fix README and rm Gemfile.lock 
- Move build scripts to src/
- Fix README.md
- Remove and ignore Gemfile.lock
- Fix tabs in boxer.sh
- Move to src/

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:39 -08:00
James Martin
e46aa61068 Removed starting of cloudstck from buildcloudstack 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:39 -08:00
James Martin
6d22df9256 Added script for starting cloudstack. Added python-mysql.connector package. renamed script to buildcloudstack. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:39 -08:00
James Martin
355df8affb made Vagrantfile headless again. puppet manifests now (mostly) pass puppet-lint tests. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
069b8507f3 Adding info. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
4367497000 Updated readme. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
a990f7abe4 Successfully building devcloud now. Added option in params.pp for compiling cloudstack or not. moved ebtables stuff to devcloudinitial update build scripts in builddevcloud.sh.erb 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
7340433e51 Iptables file must be puppeted in the xenbox stage so it exists when the network is started in the devcloud phase. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
0555b79e8d Updated to suppor 2 nics. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
7902a69872 Change interfaces as per devcloud2 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
f55c230d89 Updated readme, adding rvmrc. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
791bf3c242 Default source should be devcloudbase-xen. Source "devcloud" only used when importing a successfully built devcloud. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin
b996aff418 Merge in of cleanup work. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:37 -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
Prasanna Santhanam
ceea53cd8f marvin: remoteSSHClient logger handler 
send the logs to the console stream
 2012-12-13 19:22:49 -08:00
Prasanna Santhanam
fb5ea25a4d marvin: remoteSSHclient logs 
Adding logging for commands sent, and executed with results returned
frmo the remote host.
 2012-12-13 15:58:36 -08:00
Prasanna Santhanam
f05cd36634 marvin: assertions with messages for common.py 2012-12-13 15:25:39 -08:00
Prasanna Santhanam
fd6be7a37b marvin: establishing some defaults 
when logging in just use defaults if no service dict values are provided
 2012-12-13 14:09:20 -08:00
Rohit Yadav
1551b982c4 cli: Handle command breaks, ctrl+c, don't break the shell 
- Fix handles shell loop
- Handles any control breaks without breaking the shell
- Handles ctrl+c to start afresh on the shell

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-12 15:21:03 -08:00
Prasanna Santhanam
864ab37e13 marvin lib: changes for accomodating vpc related apis 
new apis for the integration lib for VPCOffering, VPC, NetworkACL Apis.
Also some extra checks from for avoiding KeyErrors in the Services dict.
 2012-12-12 11:07:28 -08:00
Prasanna Santhanam
e49b3b27de marvin: storagetype reference only when attr present 
reference the storagetype only when present. storagetype is reqd only for
devcloud style tests
 2012-12-09 23:13:24 -08:00
Prasanna Santhanam
7d4e65740b marvin: assertion check when fetching featured templates 2012-12-09 22:15:38 -08:00
Prasanna Santhanam
3ba8dc455f Smoke Tests: incorrect self reference in setUpClass 
should be cls.apiClient and not self.apiClient
 2012-12-09 22:15:37 -08:00
Prasanna Santhanam
8466ff1e1f Marvin: Provide a userApiClient for executing with user permissions 
The getUserApiClient attribute in cloudstackTestClient provides a user level
api client that executes all API calls with permissions of a given user instead
of the default admin
 2012-12-09 22:15:30 -08:00