1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
fe9398dc73
Summary: Fix S3 from trying to upload directories found in template dirs
...
Detail: The S3 upload code fails on directories in the templates dir, such as
"KVMHA" that gets created for KVM. This skips directories in the templates dir.
BUG-ID: CLOUDSTACK-1056
Bugfix-for: 4.1 (master)
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359390176 -0700
2013-01-28 09:22:56 -07:00
aa7b3e0f6d
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
...
Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -08:00
94e8090bf3
Deploy, Start, Stop, Destroy VM orchestration service changes
2013-01-22 12:54:04 -08:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
4a9cf4b4a8
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-18 15:59:24 -08:00
1283712d93
replace spring injection in nfssecondarystorage
2013-01-18 15:10:08 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
070856affd
CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
b77503b5bd
Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446796 -0700
2013-01-17 11:19:56 -07:00
1ff7a147bd
Revert "Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn"
...
This reverts commit 1a2e69fb22
2013-01-17 11:17:43 -07:00
1a2e69fb22
Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446410 -0700
2013-01-17 11:13:30 -07:00
497dcd5044
Get rid of PlugService annotation, replace it with Spring standard injection in command classes
2013-01-16 18:44:44 -08:00
727fab71cb
Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run
2013-01-16 14:16:01 -08:00
339c09bdef
Remove unused fields in VMInstanceVO.java
2013-01-15 18:28:51 -08:00
df684261cf
Put command classes under Spring injection framework
2013-01-15 18:07:19 -08:00
a2dab60236
deprecate storage provider in StroragePoolVO
2013-01-15 18:07:19 -08:00
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
f40e7b7511
removed componentlocator and inject
2013-01-10 11:05:20 -08:00
cf8de7ee17
Removed all the .project files
2013-01-08 14:11:00 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
a4f4c98670
OrchestrationService: some changes for DeployVM
2013-01-08 11:53:54 -08:00
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
057ac12d23
Enforce InternalIdentity interface on all VO classes that impls long getId()
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:09:44 -08:00
b75d92419e
api: Enforce InternalIdentity interface on AsyncJobVO
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:09:44 -08:00
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
503db14127
Add back Identity interface to most VO class to avoid cast error in
...
ApiDispatcher.setupParameter call.
2012-12-22 22:35:09 -08:00
024f0d95dd
api: Use Identity interface instead of java reflect to getId
...
- Add new interface method to getId
- Fix method definition in AsyncJob
- Get rid of mechanism to getId using reflect, use Identity interface
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
290dc79366
Populate uuid for uploadVO in create case.
2012-12-20 22:33:43 -08:00
b14b39a69f
Remove IdentityProxy from BaseResponse, ExtractResponse. Now
...
IdentityProxy is only referenced in CreateCmdResponse, which involves
some async job logic change. Since it is not impacting list performance,
will leave it there for now.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 16:52:52 -08:00
1d729578d4
Remove IdentityProxy from Response classes.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 23:16:38 -08:00
4b75132aa2
Remove IdentityProxy from Response classes.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 16:33:12 -08:00
1aa30f03e7
Remove IdentityProxy from AutoScale responses.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 11:19:36 -08:00
79f8c104eb
Remove IdentityProxy from GuestOSResponse and GuestOSCategoryResponse.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 18:01:31 -08:00
e017dc2c00
commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44
...
Author: Min Chen <min.chen@citrix.com>
Date: Mon Dec 17 17:42:30 2012 -0800
Remove IdentityProxy from AlertResponse and AsyncJobResponse.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 17:44:39 -08:00
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
0be6e2e02b
bug CS-14982: Make traffic sentinel metering zones configurable. Global config default will be used when no zones are listed while adding Traffic Sentinel Host
...
status CS-14982: resolved fixed
reviewed-by: Nitin
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-12-17 15:18:31 +05:30
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
6fc3bc3760
api_refactor: refactor vpn and vm apis
...
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:27:02 -08:00
5edfc2760a
refactor: remove redundant imports, fix trailing chars
2012-12-03 13:54:37 -08:00
c8832cd4b6
Commit https://reviews.apache.org/r/8075/
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2012-11-19 12:02:26 +01:00
d79f1f6fdc
Replace Adapters and PluggableServices, use Spring to load them
2012-11-07 15:03:24 -08:00
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
91e68b5f2c
A bunch of .project changes again
2012-11-04 19:25:03 -08:00
1c0e2cf3f5
Summary: Implement Static NAT for KVM VPC
...
Detail: SetVPCStaticNatRules was one command that was left off of the initial
VPC implementation. This adds it in.
BUG-ID : CLOUDSTACK-426
Reviewed-by: Marcus Sorensen
Reported-by: Marcus Sorensen
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1351698124 -0600
2012-10-31 09:42:04 -06:00
f92ce72639
Correct dependency errors
2012-10-24 11:12:40 -07:00
059f605ace
add more interfaces
2012-10-22 17:50:51 -07:00
7f104b1feb
[PATCH] CLOUDSTACK-335: fix lb for vpc on kvm
2012-10-12 18:58:46 -07:00
Kelven Yang
Jayapal
Marcus Sorensen
Prachi Damle
Edison Su
Alex Huang
Edison Su
Koushik Das
Prasanna Santhanam
Rohit Yadav
Min Chen
kishan
Hiroaki Kawai