98af424053
Merge branch 'master' into object_store.
2013-05-23 18:00:15 -07:00
f5732fe3bf
Consolidate code to use UriUtils.validateUrl instead of repeating code
...
several places.
2013-05-21 16:50:02 -07:00
79dc83d1ac
blocker bug in dnsmaq config
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-21 17:49:05 +05:30
9350441dd3
remove bogus self assign to parent
...
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-05-21 12:19:03 +05:30
f7c1b711ad
merge to master
2013-05-16 23:56:20 -07:00
15be97772e
PVLAN : Implementing PVLAN deployment capability for VMware deployments in cloudstack.
2013-05-16 14:50:16 -07:00
62a9daa5d6
Properly invoke parent constructor to default Answer result to true.
2013-05-15 15:52:46 -07:00
a0c3d280b4
merge to master
2013-05-15 00:40:53 -07:00
879a954b98
delete snapshot at the backend
2013-05-14 21:58:07 -07:00
68ffe1c706
fix bug in create volume from snapshot
2013-05-14 16:38:02 -07:00
3424ac86ad
Fix size issue for template created from snapshot.
2013-05-13 17:45:22 -07:00
2d950e2858
CLOUDSTACK-768: ACL on private gateway
2013-05-13 19:24:23 +05:30
f84b6abde0
merge with master
2013-05-13 17:30:42 +05:30
052c24c4d1
CLOUDSTACK-702: Multiple ip ranges in different subnets.
...
This feature enables adding of guest ip ranges (public ips) form different subnets.
In order to provide the dhcp service to a different subnet we create an ipalias on the router. This allows the router to listen to the dhcp request from the guest vms and respond accordingly. Every time a vm is deployed in the new subnet we configure an ip alias on the router. Cloudstack uses dnsmasq to provide dhcp service. We need to configure the dnsmasq to issue ips on the new subnets. Added a new class dnsmasqconfigurator which generates the dnsmasq confg file, this file replaces the old config in the router.
The details of the alias ips are stored in db in the nic_ip_alias table. Every time a new subnet is added one of the ip from the subnet is used to configure the ip alias.
I have pushed the code to https://github.com/bvbharatk/cloud-stack/tree/Cloudstack-702 , also rebased the code with master.
I need to test the code for advanced sg enabled network using kvm.
I have added the unit test
Marvin tests are at https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=53e4965
Also accomodated some of the changes suggested by koushik.
corrected the import statements. renamed the IpAlias command to createIpAlias command.
This feature supports only ipv4
2013-05-13 17:06:44 +05:30
8d53b1ef05
merge with master
2013-05-13 16:36:41 +05:30
e2449cfcf0
CLOUDSTACK-763: Added replaceNetworkACLList API. Added support for ACL action allow/deny and also number
2013-05-13 12:03:38 +05:30
c11dbad9c9
merge master
2013-05-11 15:28:43 +05:30
993187622e
fix compile, after rebase to master
2013-05-10 20:39:02 -07:00
342624e0eb
Merged with head
2013-05-10 16:33:57 -07:00
3047929367
Merged
2013-05-10 16:21:43 -07:00
15fc4e137d
add license header
2013-05-10 11:40:11 -07:00
42e25a22fc
refactor kvm/vmware resource code
2013-05-09 23:10:05 -07:00
a83b87b7e5
Set template size for S3 template downloader.
2013-05-09 22:49:14 -07:00
f965e2d892
Download system template while adding S3 image store is working.
2013-05-09 21:49:12 -07:00
292e77b96b
Fix marvin test to add S3 image store and cache storage.
2013-05-09 16:19:06 -07:00
8ad517c028
Append template unique name for S3 key for template sync.
2013-05-08 17:58:52 -07:00
dc5d2f45e9
Make copyFromS3ToNFS flow work.
2013-05-08 17:39:46 -07:00
3b45bc9c30
Make S3 register template work.
2013-05-08 11:12:26 -07:00
ac7be218d5
creat template from volume/snapshot, and then create vm from template works now
2013-05-07 20:18:19 -07:00
5aeca646ae
make create template from volume/snapshot work
2013-05-07 20:18:19 -07:00
3315b23595
Relax url port validation and some MockLocalNfsSecondaryStorageResource
...
fix.
2013-05-07 13:34:27 -07:00
f5d5526d41
Fix unit test to test NFS template download flow.
2013-05-06 18:02:52 -07:00
572e71e57d
Moved most of the VOs and DAOs from server package into engine-schema as well
2013-05-06 16:34:26 -07:00
f6913b5088
Removed files that are no longer used and further separated out the files in the core project
2013-05-06 16:34:21 -07:00
ad2777c547
Moved agent commands to core and out of api
2013-05-06 16:34:20 -07:00
e0d8f01ecd
Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema.
2013-05-06 16:34:16 -07:00
0d78209b73
Address various UI requirements by introducing provider constants.
2013-05-06 15:12:33 -07:00
4db84fb45e
Remove the hard-coded package assumption in Command serialization.
2013-05-06 15:11:42 -07:00
af5bf94b43
CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-06 20:58:32 +01:00
7ad263b67e
Revert previous workaround for ListTemplateCommand, which is correct
...
after updating the systemvm.iso on devcloud.
2013-05-06 11:29:57 -07:00
a221ecb484
Workaround an issue of null url when ListTemplateCommand is received on
...
SSVM side, also fix a bug in listTemplates with id passed.
2013-05-04 23:09:23 -07:00
bb7a72b7d6
Add unit test for DataTO/DataStoreTO serializer/deserializer adapter.
2013-05-03 17:42:39 -07:00
e0ab845e92
Add gson adapter to serialize/deserialize DataTO and DataStoreTO.
2013-05-03 17:29:12 -07:00
23db72d8b4
S3 template download test is working except state transition part.
2013-05-03 14:59:13 -07:00
c60c373a38
Modify DownloadCommand to pass DataTO.
2013-05-02 23:05:19 -07:00
87fafb7287
Add S3 register template integration test.
2013-05-02 15:20:46 -07:00
1f1467974f
CLOUDSTACK-1828 Source Nat on private gateway feature
2013-05-02 15:40:15 +05:30
f101241050
Apply patch for https://reviews.apache.org/r/10892/
2013-05-01 17:40:38 -07:00
37cbe8890f
refactor snapshot
2013-04-29 18:51:13 -07:00
35264f7087
Add Download progress support for S3 template/volume download.
2013-04-29 17:07:25 -07:00
85e73d18f5
Refactor message bus facitlity to avoid confusing with event bus for external notification, planning to use it in VMSync
2013-04-29 14:36:03 -07:00
5b7ea8b0fe
Remove DeleteObjectFromSwiftCommand, which can be achieved through
...
DeleteTemplateCommand.
2013-04-26 17:52:50 -07:00
c2e9be8d31
Handle DeleteVolumeCommand for S3.
2013-04-26 16:45:11 -07:00
471ad51080
Handle Volume type in DownloadCommand.
2013-04-26 16:34:23 -07:00
91bfbdf1c4
Handle ListTemplateCommand in NfsSecondaryStorageResource for various
...
data store provider.
2013-04-26 12:25:06 -07:00
efb4471dc9
CLOUDSTACK-2196 and CLOUDSTACK-2126: fix missing async job status in
...
listXXX api and incorrect async job status in other async api.
Conflicts:
server/src/com/cloud/api/query/vo/AccountJoinVO.java
2013-04-25 17:40:18 -07:00
d1642a489c
=initial changes
2013-04-25 18:29:57 +05:30
4c174a6867
Fix DeleteSnapshotBackupCommand to pass dataStore information.
2013-04-24 17:30:38 -07:00
0a976d5fd5
Change Upload table to store dataStoreId instead of hostId.
2013-04-24 15:20:09 -07:00
8d29cdf804
Remove SnapshotVO.getSecHostId and SnapshotVO.setSecHostId references
...
from codebase to use SnapshotDataStoreVO.
2013-04-24 11:54:42 -07:00
b0caae6b33
CLOUDSTACK-1086: DeployVirtualMachine userdata enhancements
...
Description:
Currently, userdata sent over to the DeployVMCmd and
updateVMCmd commands can be upto 2K in length, whether
sent over GET or POST. We remove this limitation for
POST to change this limit to 32K. Also enabling lazy
load on userdata to improve performance during reads
of large sized userdata from user VM records.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-04-24 13:42:38 +05:30
b8c5c67fbc
add copycommand at resouce side
2013-04-22 19:12:50 -07:00
29687663e8
Rename SnapshotStrategy to SnapshotService to have consistent naming
...
convention for Template, Snapshot, Volume. Also rename CopyCmd to
CopyCommand to follow internal command naming convention.
2013-04-22 16:15:57 -07:00
abf40435f3
refactor downloadlistener, sync system vm templates when adding a new image store
2013-04-21 22:46:02 -07:00
6f70fe28e8
Trigger system vm template download while adding image store. Just a
...
code skeleton, waiting for some code in EndPoint.
2013-04-19 19:37:06 -07:00
21ce3befc8
Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-19 11:36:42 +05:30
7ba1a8fa21
Populate hypervisor_type column in registering ISO by referring it from
...
guest os id to make listIsos and listTemplates implementation more
consistent.
2013-04-18 13:52:35 -07:00
ef30ee52ee
add copy stuff from s3 into nfs cache storage
2013-04-18 13:44:49 -07:00
1fe5d7c886
need to download image to cache storage from s3/swift on mgt server for default system vm templates
2013-04-18 01:56:34 -07:00
fe4f53bfcd
Fix SecStorageSetupCommand for Nfs image store.
2013-04-17 17:16:01 -07:00
9584815d4f
CLOUDSTACK-1941: introduced "default" flag to account/user objects. Admin/System accounts that come with the CS install are default, and can never be removed. All accounts created by the CS admin, have default flag set to false, and can be removed at any time.
2013-04-17 12:04:18 -07:00
fe3b01ece1
Update DataObjectInStore interface and unify implementation of
...
ImageDataFactory, VolumeDataFactory and SnapshotDataFactory
implementations.
2013-04-17 11:40:57 -07:00
0da2da852b
Fix the flow of deleteTemplateCmd.
2013-04-16 12:03:12 -07:00
593337565e
Add S3 code to handle DownloadCommand for registerTemplate.
2013-04-15 14:44:39 -07:00
accfccd83e
Summary: Add support for nested hypervisors to the VmWare resource.
...
Add a flag VmDetailConstants.NESTED_VIRTUALIZATION_FLAG
Add an advanced config uption VmwareEnableNestedVirtualization
Depending on the settings of the flags and the capabilities of the target hypervisor the nested virtualization option will be set on guest VMs. It's a global setting intended only for developers to support cloud-in-a-cloud deployments.
2013-04-12 13:49:42 +02:00
bb64672715
Refactor DownloadMonitorImpl code, move some functionalities to
...
TemplateServiceImpl and VolumeServiceImpl.
2013-04-11 18:09:42 -07:00
b646e43a1a
use hypervisor capabilities to control if vm snapshot is enabled for hypervisors
2013-04-10 12:36:42 +08:00
2e6c65fd34
QuickCloud: sanitize logs for normal running of agents outside systemvm
2013-04-09 14:45:27 -07:00
e7983b25cc
QuickCloud: Enable secondary storage daemon to run outside the system vm
2013-04-09 14:45:25 -07:00
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
61754cd987
CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack
...
Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-18 11:36:19 +05:30
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
a49261c3b1
CLOUDSTACK-24: mipn feature for basiczone
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 10:24:22 +05:30
e35ce6587a
CLOUDSTACK-1461: Don't set dns server for non-default ipv6 network
...
The non-default parameter can be used by ipv4 as well in the future.
2013-03-08 17:43:23 -08:00
f539f40e35
CLOUDSTACK-874: Ability to delete Events and Alerts
...
This feature will provide the functionality to delete or archive
the Alerts/Events.
Delete or archive alerts APIs are available only for root-admin,
delete or archive events are available for regular users.
2013-03-08 11:59:53 -08:00
bd4508589b
Revert "CLOUDSTACK-874 Ability to delete Events and Alerts"
...
This reverts commit 5e4c2c8a9e
2013-03-08 14:28:23 -05:00
5e4c2c8a9e
CLOUDSTACK-874 Ability to delete Events and Alerts
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-03-08 10:52:40 -08:00
a1fdb0c2d4
CLOUDSTACK-241: Remove API sync. Merge changes from 4.1 branch. Converted tabs to spaces.
2013-03-08 19:02:41 +05:30
409ec9c6b6
CLOUDSTACK-1426: We has strong implication that VO must implement an interface, otherwise EntityManagerImpl can't the vo
2013-03-07 18:25:57 -08:00
19c6d8054b
CLOUDSTACK-1535: kvm agent will silently ignore many exceptions
...
Current kvm agent will silently ignore many exception, and there's no
way to see what really happened. This patch will log in trace level log
that was silently ignored. And also, it will fix huge bare Exception
catch, which is very harmful because it also catches RuntimeException.
2013-03-06 10:22:44 -08:00
b12aebefee
Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"
...
This reverts commit e0019eccd9
2013-03-04 23:32:52 +05:30
e0019eccd9
CLOUDSTACK-658 - Adding Scalevm command and XS related changes
2013-03-04 14:47:55 +05:30
9d043cba81
CLOUDSTACK-1350 Management server Stop and start causes previously downloaded ISOs to redownload
2013-02-27 17:25:01 +08:00
8e360f342d
CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support
2013-02-26 18:39:23 -08:00
e37fdce125
CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil.
...
Converted tabs to spaces in the related files.
Verified account, user and domain APIs.
2013-02-26 14:21:21 +05:30
cd291f6b4b
From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001
...
From: Vijayendra <vijayendra.bhamidipati@citrix.com>
Date: Mon, 25 Feb 2013 14:37:27 -0800
Subject: [PATCH] CS-670: Configurable setting to use linked clones or not on
VMware
Description:
Providing support for creation of user VMs as full clones on ESX.
Putting in unit tests for VO and Dao classes introduced in this commit.
Signed-off-by: Vijayendra <vijayendra.bhamidipati@citrix.com>
---
core/src/com/cloud/vm/UserVmCloneSettingVO.java | 50 ++++++
.../hypervisor/vmware/manager/VmwareManager.java | 3 +
.../vmware/manager/VmwareManagerImpl.java | 18 +-
.../hypervisor/vmware/resource/VmwareResource.java | 117 +++++++++----
server/conf/migration-components.xml | 1 +
server/src/com/cloud/configuration/Config.java | 1 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 184 ++++++++++-----------
.../com/cloud/vm/dao/UserVmCloneSettingDao.java | 37 +++++
.../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 74 +++++++++
.../vm/dao/UserVmCloneSettingDaoImplTest.java | 62 +++++++
.../UserVmCloneSettingDaoTestConfiguration.java | 52 ++++++
.../test/resources/CloneSettingDaoTestContext.xml | 42 +++++
setup/db/db/schema-410to420.sql | 9 +
13 files changed, 527 insertions(+), 123 deletions(-)
create mode 100755 core/src/com/cloud/vm/UserVmCloneSettingVO.java
create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDao.java
create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java
create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java
create mode 100644 server/test/resources/CloneSettingDaoTestContext.xml
2013-02-25 14:57:57 -08:00
0f532c4b3a
rebase to master
2013-02-21 11:22:49 -08:00
ff047e75d3
refactor snapshot, move existing snapshot code into its own snapshotstrategy
2013-02-21 11:22:49 -08:00
0b86b33c56
rebase to master
2013-02-21 11:22:48 -08:00
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
bc493bd39b
CLOUDSTACK-672: Set VMware cluster max. limit based on HV version
...
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
2013-02-15 16:19:40 +05:30
fe44e39dfd
CS648 ckeck in missing VO file
2013-02-14 10:01:38 +08:00
f542c320d3
Removed a bunch of missing files and useless imports
2013-02-13 15:41:27 -08:00
13a4c0670e
CLOUDSTACK-1176 1) remove 'final' modifier from id attribute in SnapshotVO 2) make state setter method comply with convention
2013-02-07 13:41:49 +08:00
d65bfc56cd
CLOUDSTACK-1174 rename field status-> state to comply with javabean convetion
2013-02-06 15:54:15 +08:00
7b75f0d990
Sync master to javelin one more time
2013-02-01 11:37:33 -08:00
9ea90c3359
Merge branch 'master' into regions
...
Conflicts:
client/tomcatconf/components.xml.in
server/src/com/cloud/api/ApiResponseHelper.java
2013-02-01 11:38:16 +05:30
96c24930ae
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-01 08:45:53 +05:30
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
e7a554fc6a
Merging events framework branch into master. This commit will bring
...
following changes
- introduced notion of event bus with publish, subscribe, unsubscribe
semantics
- a plug-in can implement the EventBus abstraction to provide event
bug to CloudStack
- A rabbitMQ based plug-in that can interact with AMQP servers to
provide message broker based event-bug
- stream lines, action events, usage events, alerts publishing in to
convineance classed which are also used to publish corresponding
event on to event bus
- introduced notion of state change event. On a state change, in the
state machine corrsponding to the resource, a state change event is
published on the event bug
- associated a state machined with Snapshot and Network objects
- Virtual Machine, Volume, Snaphost, Network object state changes wil
result in a state change event
2013-02-01 01:37:24 +05:30
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
c607e03f0e
Merge branch 'master' into regions
2013-01-31 22:31:25 +05:30
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
d3089ba2a5
Merge branch 'master' into regions
2013-01-29 11:50:49 +05:30
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
8f66d266b3
IPv6: Enable VR's ability to provide DHCPv6 service
2013-01-26 23:14:42 -08:00
1f57d925eb
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:41:59 +05:30
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
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
Min Chen
Bharat Kumar
Dave Brosius
Edison Su
Vijayendra Bhamidipati
Edison Su
Jayapal Reddy
Nitin Mehta
Kishan Kavala
Alex Huang
Wei Zhou
Kelven Yang
Devdeep Singh
Alena Prokharchyk
Hugo Trippaers
Mice Xia
Chiradeep Vittal
Anshul Gangwar
Sheng Yang
Sanjay Tripathi
Chip Childers
Hiroaki Kawai
frank
Koushik Das
Alex Huang
Murali Reddy
Marcus Sorensen
Prachi Damle
Prasanna Santhanam
Rohit Yadav