31 Commits

Author SHA1 Message Date
Edison Su
f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Prachi Damle
a2eb7bab1e CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
- Changes merged from planner_reserve branch
- Exposing deploymentplanner as an optional parameter while creating a service offering
- changes to DeploymentPlanningManagerImpl to make sure host reserve-release happens between conflicting planner usages.
2013-05-16 15:02:17 -07:00
Edison Su
a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Nitin Mehta
7b46599942 Fixing apidocs adding the new category meta data apis 2013-05-13 23:24:20 +05:30
Nitin Mehta
c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Edison Su
993187622e fix compile, after rebase to master 2013-05-10 20:39:02 -07:00
Prasanna Santhanam
fad55c5bea Fix the apidocs for cisco ASA device
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-17 11:07:10 +05:30
Prasanna Santhanam
0b17b624db Fixing the apidoc for the new api dedicatePublicIpRange
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-12 23:27:42 +05:30
Prachi Damle
fd23b36c11 Integration testcase and the config file needed, that runs with marvin. 2013-04-11 13:23:13 -07:00
Chiradeep Vittal
1c33a3ee80 Make apidoc generation less verbose -- makes it hard to figure out what is going on with the rest of the build
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-09 10:54:44 -07:00
Edison Su
3ed6200ef8 move default primary storage plugin into its own pom 2013-03-20 17:21:40 -07:00
Prasanna Santhanam
792db8b5cc simulator: removing cyclic dependency from simulator
The database creator caused a cyclic dependecny in the simulator which
is removed with this commit. Additionally the simulator profile is now
merged with developer profile and a test for server health is included

Steps to run:
$ mvn -Pdeveloper clean install
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator
$ mvn -pl client jetty:run

To deploy an adv. zone and test the server health:
$ mvn -Pdeveloper,marvin -Dmarvin.config=`find . -name simulator.cfg` -pl :cloud-marvin test

Conflicts:
	pom.xml

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-20 10:36:43 +05:30
Alena Prokharchyk
7a54458e17 CLOUDSTACK-1502 Fixed the api-doc build component caused by new API commands:
addIpToNic
removeIpFromNic
listNics

1) Removed trailing whitespaces from commands.properties file for the commands above
2) Created a new category "Nic" in gen_toc.py for the new commands
2013-03-04 16:19:08 -08:00
David Nalley
3902f505ee CLOUDSTACK-1420 - updating publican brand files with text notice of trademarks 2013-02-26 20:50:10 -05:00
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Prasanna Santhanam
a4510efc24 maven: parent pom of tools/* projects is tools/pom.xml
Fixes broken builds for tools

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-18 10:26:49 +05:30
Prasanna Santhanam
05437d0e97 maven pom: put apache cloudstack tools together in umbrella pom
minor pom refactor to put all the tools under one placeholder pom.
Also adds a profile for marvin to run deployDataCenter via mvn options.

$mvn -Pdeveloper,marvin -pl :cloud-marvin -Dmarvin.config=<path/to/config>

OR
$cd tools/marvin
$mvn -Pmarvin -pl :cloud-marvin -Dmarvin.config=path/to/config

will deploy the datacenter using the marvin.config property's value

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-15 20:53:41 +05:30
David Nalley
9c87970d1f setting the version for apidocs to 4.2.0 2013-02-02 05:56:19 -05:00
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
Rohit Yadav
7374056493 Revert "apidoc: Remove api discovery from toc"
This reverts commit 66514c00efad5c93a2b0996f1e79222cbff9bd48.
2013-01-14 20:55:13 -08:00
Rohit Yadav
c5984278ca apidoc: Fix apidoc
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08: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
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
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
6e86fac8e5 Summary: Add autoscale categories
Detail:  Every new API that doesn't have  a valid category prefix needs
to be include in the gen_toc.py script for apidocs, marvin and
cloudmonkey to build.

BUG-ID:  CLOUDSTACK-501
Reviewed-by: mvn clean install -P developer
Reported-by: Rohit Yadav <bhaisaab@apache.org>
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1353063359 +0530
2012-11-16 16:25:59 +05:30
Rohit Yadav
086b2e15af apidocs: remove whitespace while passing commands.in for apidocs
Due to whitespaces, apidocs was not able to process and generate commands.xml
with APIs listed in ext and virtualrouter .in files. This in turn affects marvin
code generation of cloudstackAPI and cloudmonkey.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-08 16:33:04 +05:30
Chip Childers
000cc72042 CLOUDSTACK-422: XSL files missing license header
Added license headers to the apidoc XSL files that were fooling RAT.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-31 14:13:48 -04:00
Prasanna Santhanam
5b43d245a7 Summary: Extending API doc pom to package
Detail: Create tarball of apidocs for distribution from jenkins
% mvn -Pdeveloper package

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1351321002 +0530
2012-10-27 12:26:42 +05:30
Edison Su
b57be3389e add apidocs/devcloud projects 2012-10-21 00:01:47 -07:00