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
22,016 Commits 304 Branches 324 Tags
Commit Graph

70 Commits

Author SHA1 Message Date
Min Chen
649d9d927f CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API 
(updateCloudToUseObjectStore) instead of two APIs.
 2014-01-08 17:25:13 -08:00
Alena Prokharchyk
b15431e574 CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller 2014-01-06 17:09:14 -08:00
Daan Hoogland
6d0dbf5968 check for BroadcastDomainTypes on sourceNatIp 2014-01-06 22:13:51 +01:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Alena Prokharchyk
78b1ac4126 CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page 
Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
	utils/src/com/cloud/utils/db/GenericDaoBase.java
 2013-10-31 15:25:57 -07:00
Daan Hoogland
2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Alex Huang
b8e79c30a8 Compile complete 2013-09-06 15:40:37 -07:00
Daan Hoogland
53d09c6f18 uri code per broadcast/isolation type , default is to accept anything as uri , vlan and lswitch need some extra tlc 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2013-08-15 14:26:26 +02:00
Alex Huang
5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387.
 2013-08-08 15:02:40 -07:00
Prasanna Santhanam
b59e3aaefc Reverting the range of commits that broke the build 
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-08-08 14:46:56 +05:30
Alex Huang
f6a2c817bc Unit test successful. Had to comment out a timing test from Amogh 2013-08-07 16:41:06 -07:00
Alex Huang
5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
Min Chen
151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Alex Huang
f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
Alex Huang
555211a080 Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine 2013-07-25 03:57:12 -07:00
Alex Huang
2d4464d2ba Applied review request 12685 2013-07-19 08:29:33 -07:00
Min Chen
98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Nitin Mehta
4eb310e926 iCLOUDSTACK-2321 
Fix the response of scaleVMCmd
Add Scale System vm command
 2013-05-17 17:43:43 +05:30
Nitin Mehta
5f0f1001be remove unwanted files 2013-05-12 14:30:10 +05:30
Nitin Mehta
c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Alex Huang
3047929367 Merged 2013-05-10 16:21:43 -07:00
Alex Huang
ad2777c547 Moved agent commands to core and out of api 2013-05-06 16:34:20 -07:00
Harikrishna Patnala
38b4f84f17 CLOUDSTACK-2146: system vm scaleup failed ;{ "scalevirtualmachineresponse" : {"errorcode":530,"cserrorcode":9999,"errortext":"Failed to scale vm"} } 
Only response generation for system vm scale up failed so fixed by changing the response object.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-05-03 16:49:08 +05:30
Min Chen
ff4c14ca63 Make old secondary storage APIs backward compatible. 2013-04-29 12:10:19 -07:00
Nitin Mehta
d1642a489c =initial changes 2013-04-25 18:29:57 +05:30
Jayapal
d5c3f87903 CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-25 15:16:26 +05:30
Harikrishna Patnala
eae22d2ffa CLOUDSTACK-741: Granular Global Parameters 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-19 10:36:52 +05:30
Nitin Mehta
3e4430d811 CLOUDSTACK-658 - Scaleup vm support for Xenserver 
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
 2013-03-28 16:43:37 +05:30
Edison Su
3ed6200ef8 move default primary storage plugin into its own pom 2013-03-20 17:21:40 -07:00
Deepti Dohare
d5cb32f159 Multiple Secondary Storage Issue 2013-03-14 21:08:27 -04:00
Kishan Kavala
2dd31f331d CLOUDSTACK-1636: Removed the concept of owner region. 
Removed region_id from user/account and domain tables.
Removed forwarding of api calls to owner region.
Removed api_key and secret_key from region table.
Included related DB upgrade changes.
 2013-03-14 11:53:40 +05:30
Jayapal Uradi
aedb8c478e CLOUDSTACK-24: mipn feature for isolated and vpc networks 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
 https://issues.apache.org/jira/browse/CLOUDSTACK-24
 2013-03-04 11:02:09 +05:30
Abhinandan Prateek
14791a9d8f Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes." 
This reverts commit f9d96c9169a50917143914ffb53e227c8673c50f.
 2013-03-01 22:29:47 +05:30
Jayapal Uradi
f9d96c9169 CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes. 2013-03-01 16:40:26 +05:30
Edison Su
a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Kishan Kavala
7d61ee6e99 CLOUDSTACK-1295 : Added usage unit tests 
Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db

Conflicts:
	setup/db/db/schema-40to410.sql
 2013-02-15 18:41:28 +05:30
Kelven Yang
7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Kishan Kavala
e7341313e9 Added unit tests 2013-01-31 22:28:09 +05:30
Alex Huang
fe6f0457d5 fixed unit tests from merge 2013-01-18 15:58:55 -08:00
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Marcus Sorensen
975021dda1 Summary: adding resizeVolume api call 
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.

BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
 2013-01-16 17:43:35 -07:00
Alex Huang
e54ed85926 getting it to compile 2013-01-08 14:39:05 -08:00
Rohit Yadav
c5abc180ab CLOUDSTACK-212: Move api/test pkg to org.apache.cloudstack 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-05 15:53:59 -08:00
Prasanna Santhanam
840da55520 api: Entities will extend InternalIdentity and Identity 
Entities correlated to the Identity and carry a uuid and those
correlated to InternalIdentity carry an id. Those entities that carry
both will correlated to Identity and InternalIdentity.

This refactors entities wherever possible to ensure the VO only
implements the first class entity.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2012-12-26 19:11:15 -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
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
Min Chen
348d3ae448 Conflicts: 
api/src/org/apache/cloudstack/api/response/AccountResponse.java

Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-17 15:41:56 -08:00