apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 18:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,941 Commits 317 Branches 325 Tags
Commit Graph

1231 Commits

Author SHA1 Message Date
Rohit Yadav
78d70d349b Merge branch 'master' into api_refactoring 
- Applies Isaac Chian'gs fix (CLOUDSTACK-648) to allow user change their password
- TODO: Fix response, only partially applied

Conflicts:
	api/src/org/apache/cloudstack/api/response/UserResponse.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-25 09:51:17 -08:00
Isaac Chiang
5aefd77f77 Fix for CloudStack-648 
Signed-off-by: Gavin Lee <gavin.lxh@gmail.com>
 2012-12-26 00:00:58 +08:00
Prasanna Santhanam
1f1a13448f simulator: resurrect simulator hypervisor as plugin 
Multiple fixes:
1. changes to the mvn configuration
    a. include simulator to client.war
    b. activate simulator by profile
2. templates for simulator
3. developer prefill for simulator
    a. Use deplydb-simulator to setup simulator db
4. Inherit components-simulator.xml from components.xml
5. ListVolumesCommand missed for MockStorageManager
6. Include simulator properties into utils/db.properties

TODO:
 Secondary storage VMs don't come up because ComponentLocator doesn't
retain a unique set of adapaters by name. Fix this in subsequent
checkin.
 2012-12-23 19:28:57 -08:00
Rohit Yadav
296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 13:54:46 -08:00
Rohit Yadav
94e7add7aa client: Re-add missing license header in client/cloudstack-ui.launch 
Partially reverts Min's change; e7fa1a86fb

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 02:47:27 -08:00
Min Chen
e7fa1a86fb Create DB views to improve ListHostsCmd performance. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-22 21:47:05 -08:00
Rohit Yadav
2140ff55ea api: Refactor and move VPN related api cmd classes to command.user.vpn 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-22 16:13:37 -08:00
Kelven Yang
877e16029c Fix a few Spring issues to Bootstrap javaline server 2012-12-21 16:49:27 -08:00
Rohit Yadav
6b04f326f0 api: Enable UTF-8 URI encoding for tomcat 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-17 20:43:37 -08:00
John Kinsella
5658fc4249 CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform references 
Tried to remove any references to license agreements, EULA, Citrix,
or CloudPlatform. Tested through devcloud, didn't see decreased UI
functionality.
 2012-12-16 20:39:03 -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
Laszlo Hornyak
988ccfc45d removed some unused database connection properties 
Signed-off-by: Laszlo Hornyak <lhornyak@redhat.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2012-12-13 22:46:29 -08:00
Rohit Yadav
503082a49e api: Add ACL adapter for components.xml 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-10 17:27:11 -08:00
Rohit Yadav
e398b1e47a api: Refactor command and response classes to org.apache.cloudstack.api.* 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-07 19:23:24 -08:00
Rohit Yadav
af28c06998 api: move and group all under command, org.apache.cloudstack.command.* 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-07 18:30:54 -08:00
Rohit Yadav
947ac982bc api: fix apidocs build bug 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 17:38:12 -08:00
Rohit Yadav
5d998a616b api_refactor: move forgotten apis, uncomment and fix mappings 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 11:32:10 -08:00
Rohit Yadav
089db9c631 api_refactor: capacity, hypvsr, alert and cert apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 11:25:56 -08:00
Rohit Yadav
780eb95830 api_refactor: swift, ldap and vlan apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 11:13:46 -08:00
Rohit Yadav
28305904e8 api_refactor: move cluster apis to admin package 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 11:04:24 -08:00
Rohit Yadav
6c2ed5cb66 api_refactor: move pod apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 11:02:57 -08:00
Rohit Yadav
e763fd7d36 api_refactor: move userkeys api to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:59:26 -08:00
Rohit Yadav
1f1ac79a6c api_refactor: move disk and service offering to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:53:42 -08:00
Rohit Yadav
ecc8249365 api_refactor: move cfg admin apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:50:26 -08:00
Rohit Yadav
ab4fac54e5 api_refactor: move admin level domain apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:44:40 -08:00
Rohit Yadav
c3853677c5 api_refactor: move zone apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:41:10 -08:00
Rohit Yadav
7f61d29c37 api_refactor: move zone and hypervisor user level apis to appropriate pkg names 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:36:26 -08:00
Rohit Yadav
cc386b791b api_refactor: move storagepool api to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:32:58 -08:00
Rohit Yadav
163fe7b8c3 api_refactor: move systevm apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:28:37 -08:00
Rohit Yadav
1b1d91dc4f api_refactor: move admin level account apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:25:20 -08:00
Rohit Yadav
2a7fa674c7 api_refactor: Move host apis to admin pkg 
- Moved host related apis to admin pkg
- Change namespace to org.a.cs.api, fix mappings in commands-prop.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:21:10 -08:00
Rohit Yadav
c59de6cbde api_refactor: router apis for admin pkg 
- Fix missing api mapping in commands.prop
- Refactor package namespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 15:23:31 -08:00
Rohit Yadav
55f2bd810a api_refactor: move template api preparetemplate to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 15:15:26 -08:00
Rohit Yadav
ceddaf122c api_refactor: refactor user apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:55:58 -08:00
Rohit Yadav
0799052d70 commands-ext.properties.in: remove duplication, same in commands.properties.in 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:40:45 -08:00
Rohit Yadav
e07106db0b api_refactor: usage apis to admin.usage pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:31:31 -08:00
Rohit Yadav
0bbe82e8e1 api_refactor: move usage apis in parts to admin.usage 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:29:31 -08:00
Rohit Yadav
55364478e5 api_refactor: move vpn related apis to user.vpn 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:24:26 -08:00
Rohit Yadav
8d8285a8d4 api_refactor: vpc admin apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:13:09 -08:00
Rohit Yadav
c24118e7e8 api_refactor: move network api for admin pkg from cloud-server to cloud-api 
- Remove a lot of junk
- Fix commands.prop.
- Move apis from cloud-server to cloud-api
- Rename with org.apache.cloudstack namespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:06:13 -08:00
Rohit Yadav
678181ac35 api_refactor: move network api for admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 13:59:54 -08:00
Rohit Yadav
99875a165f api_refactor: admin apis for vpc 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:44:27 -08:00
Rohit Yadav
dd5a36fcd2 api_refactor: refactor for autoscale apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:42:07 -08:00
Rohit Yadav
2121fbd469 api_refactor: refactor network apis for admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:38:40 -08:00
Rohit Yadav
feb342ad23 api_refactor: refactor autoscale apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:30:37 -08:00
Rohit Yadav
456b852c0c api_refactor: refactor loadbalancer apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:25:20 -08:00
Rohit Yadav
8773fc2a55 api_refactor: refactor volume apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:20:48 -08:00
Rohit Yadav
25b5aadb4e api_refactor: refactor firewall apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:17:06 -08:00
Rohit Yadav
5cd1f4b6c2 api_refactor: ip address apis refactoring 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:14:06 -08:00
Rohit Yadav
46ed598894 api_refactor: resource (limit) apis, move capability and cloud identifier 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:11:16 -08:00