162 Commits

Author SHA1 Message Date
tuna
d935d3865a tuna 2013-12-09 23:33:14 +07:00
Alex Huang
433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Wei Zhou
09ca263afd fix apidocs build error 2013-11-08 16:02:59 +01:00
Min Chen
2ef4d5200c Merge branch 'master' into rbac. 2013-10-31 17:16:33 -07:00
Min Chen
6be228a438 CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary
storage to S3.
2013-10-28 21:01:31 -07:00
Min Chen
d84d62a1e0 Separate Admin and User command and response for ListVMsCmd. 2013-10-02 17:45:14 -07:00
Prasanna Santhanam
a987a8aca1 Fix apidoc build
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-09-11 09:40:48 +05:30
Ian Duffy
bdba0ddeed Bring up to date with master 2013-08-31 00:25:48 +01:00
Jessica
94849e274a CLOUDSTACK-4429. DOC. Fix broken link in header of API Reference TOC page. The link pointed to the Developer's Guide on the old doc site. Changed to point to the new doc site. Does not point to a specific doc version, so this text can be re-used without change for future software releases. 2013-08-21 16:15:42 -07:00
Chip Childers
320663df78 fixing build error with message Need to add a category for createCacheStore.xml to <https://builds.apache.org/job/cloudstack-apidocs-master/ws/tools/apidoc/gen_toc.py>:known_categories 2013-08-08 09:36:38 -04:00
Chip Childers
b9623155a1 Adding CacheStores category for API docs, to resolve: Exception: Need to add a category for listCacheStores.xml to /home/hudson/jenkins-slave/workspace/cloudstack-apidocs-master/tools/apidoc/gen_toc.py:known_categories 2013-08-07 15:53:44 -04:00
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
Min Chen
c8cafb91a7 CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 15:07:45 -07:00
Prasanna Santhanam
fd62a22b6b add deleteCacheStorage to TOC in API doc generator
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 8f153a65dd6d0aba42f118352652a4555c3641d6)
2013-07-26 09:47:01 +05:30
Ian Duffy
eaa4143371 Merge LDAPPlugin
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-25 17:54:52 +05:30
Alex Huang
bec53fb59a VMSync: Separating jobs from api 2013-07-03 11:22:40 -07:00
Sheng Yang
7e44f81273 UCS: Add missing beans
Also move the API to the right place
2013-06-27 14:54:45 -07:00
Sheng Yang
759269fcd8 Baremetal: Fix API's packages and categories 2013-06-21 09:48:30 -07:00
Prasanna Santhanam
6b34943622 Add listCacheStores to Image Store category
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-21 11:56:05 +05:30
Edison Su
f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
David Nalley
ef4c342d5c updating copyright year and mark text 2013-06-13 14:22:01 -04:00
David Nalley
3707f70812 removing unsused logos 2013-06-13 14:04:42 -04:00
David Nalley
5ee38b79ae Branding - moving the CloudStack logo in the apidocs to a properly apache-ified logo with TM symbol 2013-06-13 14:04:28 -04:00
Min Chen
18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3cea30339cfff40c1002906634291b373) into object_store.
2013-06-12 11:20:32 -07:00
Prasanna Santhanam
db655ae8c7 CLOUDSTACK-2810: Include new vmware APIs in discovery
Discovery plugin will detect APIs from pluggable services and map them
to those in commands.properties. Including the latter to complete the
mapping so listApis now returns these APIs.

Also included fix for API docs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 22:11:03 +05:30
Saksham Srivastava
17267794ad CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host. <Patch1>
This feature allows a user to deploy VMs only in the resources dedicated to his account or domain.

1. Resources(Zones, Pods, Clusters or hosts) can be dedicated to an account or domain.
   Implemented 12 new APIs to dedicate/list/release resources:
   - dedicateZone, listDedicatedZones, releaseDedicatedZone for a Zone.
   - dedicatePod, listDedicatedPods, releaseDedicatedPod for a Pod.
   - dedicateCluster, listDedicatedClusters, releaseDedicatedCluster for a Cluster
   - dedicateHost, listDedicatedHosts, releaseDedicatedHost for a Host.
2. Once a resource(eg. pod) is dedicated to an account, other resources(eg. clusters/hosts) inside that cannot be further dedicated.
3. Once a resource is dedicated to a domain, other resources inside that can be further dedicated to its sub-domain or account.
4. If any resource (eg.cluster) is dedicated to a account/domain, then resources(eg. Pod) above that cannot be dedicated to different accounts/domain (not belonging to the same domain)
5. To use Explicit dedication, user needs to create an Affinity Group of type 'ExplicitDedication'
6. A VM can be deployed with the above affinity group parameter as an input.
7. A new ExplicitDedicationProcessor has been added which will process the affinity group of type 'Explicit Dedication' for a deployment of a VM that demands dedicated resources.
   This processor implements the AffinityGroupProcessor adapter. This processor will update the avoid list.
8. A VM requesting dedication will be deployed on dedicatd resources if available with the user account.
9. A VM requesting dedication can also be deployed on the dedicated resources available with the parent domains iff no dedicated resources are available with the current user's account or
   domain.
10. A VM (without dedication) can be deployed on shared host but not on dedicated hosts.
11. To modify the dedication, the resource has to be released first.
12. Existing Private zone functionality has been redirected to Explicit dedication of zones.
13. Updated the db upgrade schema script. A new table "dedicated_resources" has been added.
14. Added the right permissions in commands.properties
15. Unit tests:  For the new APIs and Service, added unit tests under : plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/DedicatedApiUnitTest.java
16. Marvin Test: To dedicate host, create affinity group, deploy-vm, check if vm is deployed on the dedicated host.
2013-05-30 01:07:01 -07:00
Min Chen
98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Prasanna Santhanam
5fb1a16109 Fix apidocs build
Portable IP section added post portable IP merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 15:19:28 +05:30
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