Min Chen
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
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
James Martin
7c56a81bdd
devcloud: Fixed regression for network.conf commit 97fe053e2e
...
Fixes regression for network.conf, commit:
commit 97fe053e2e
Author: Chip Childers <chip.childers@gmail.com>
Date: Mon Aug 13 11:12:01 2012 -0400
Removed ASF license header from network.conf, because XCP doesn't respect comment lines in this file
This seemed to have been re-introduced during the merge in of my patch. This file has no been removed
completely and is created in-line through the puppet module.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 13:16:32 -08:00
Chip Childers
ba30500402
CLOUDSTACK-505: Added string cleaning to the start and end debug
...
log statements within the API servlet.
2012-12-17 15:13:59 -05:00
Chip Childers
44da7b1841
CLOUDSTACK-505: Reworked approach to cleaning request / response strings
...
As noted in the bug, several of the API command in question
are async calls. I've added a simple regex-based string cleaning
function, and have the request and response strings running through
it prior to being appended to the audit log.
Unit tests added for the new cleaning function as well.
The call to skip logging the createSSHKeyPair response remains intact
for now, although it should probably be scrubbed similarly to the
password fields.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-17 14:11:09 -05:00
Jessica Wang
d6694abf4d
CLOUDSTACK-656: cloudstack UI - network menu - guest network section - detailView - should have only one preFilter(). Consolidate 2 preFilter() into 1.
2012-12-17 11:03:49 -08:00
Marcus Sorensen
6ed1989133
Summary: Allow for custom storage adaptors based on pool type in KVM
...
Detail: Instead of using LibvirtStorageAdaptor for everything, you can create
your own storage adaptor and use it. We select storage adaptor based on storage
pool type, thus we needed to adjust LibvirtComputingResource to pass pool type
to everything in KVMStoragePoolManager. This in turn required that we pass the
info necessary to LibvirtComputingResource as well, so a few agent Commands were
modified.
Note this patch in and of itself shouldn't change any existing behavior, just
allow for new storage adaptors to be selected based on storage pool type.
Reviewed-by: Edison Su
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1355769696 -0700
2012-12-17 11:41:36 -07:00
Rohit Yadav
de8aa86542
api: Work in progress code in ApiDispatcher to process annotations
...
- All id params are now uuids, basically for documentation
- Use injections and not component locator
- Remove resourceType field checking, it's now called entityType
- Fix indents
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 10:00:27 -08:00
Likitha Shetty
cba97b1742
api_refactoring: add parameter annotation for user 'security-group'
...
- Add the entityType to the parameter annotation
- Annotate SecurityGroupRules response
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 09:57:04 -08:00
kishan
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
Rohit Yadav
0f2a0950b6
cli: extract apicmd response using the apiname+response key
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 22:10:54 -08:00
Rohit Yadav
f8a483fc5a
api: Include cloudstack-version in both xml and json api response
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 21:37:03 -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
Rohit Yadav
59fc89abe3
api: Fix ApiServer role base acl logic and response type value
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:13:29 -08:00
Rohit Yadav
429b430721
api: Fix DeployVMCmd to use only entityType and not resourceType
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:12:01 -08:00
Rohit Yadav
6db279583e
api: Remove resourceType, use only entityType
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:09:33 -08:00
Rohit Yadav
cc4030be41
api: Add UUID type to CommandType in BaseCmd
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:08:49 -08:00
James Martin
0661f9b814
Added fix to force apt to do a "apt-get update" before packages are installed.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 12:29:49 -08:00
Sebastien Goasguen
6507055ba1
Change in Dev Guide to add Maven and Tools Chapter
2012-12-15 00:29:12 -06:00
Rohit Yadav
be6acc719a
rat: Apply missing license for devcloud puppet file
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 23:41:00 -08:00
Rohit Yadav
89dc874f6f
rat: Fix license on recently added new files in tools/devcloud
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 22:23:09 -08:00
Rohit Yadav
eddb3dfc92
devcloud: Move build scripts to src/, fix README and rm Gemfile.lock
...
- Move build scripts to src/
- Fix README.md
- Remove and ignore Gemfile.lock
- Fix tabs in boxer.sh
- Move to src/
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:39 -08:00
James Martin
e46aa61068
Removed starting of cloudstck from buildcloudstack
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:39 -08:00
James Martin
6d22df9256
Added script for starting cloudstack. Added python-mysql.connector package. renamed script to buildcloudstack.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:39 -08:00
James Martin
355df8affb
made Vagrantfile headless again. puppet manifests now (mostly) pass puppet-lint tests.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
069b8507f3
Adding info.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
4367497000
Updated readme.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
a990f7abe4
Successfully building devcloud now. Added option in params.pp for compiling cloudstack or not. moved ebtables stuff to devcloudinitial update build scripts in builddevcloud.sh.erb
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
7340433e51
Iptables file must be puppeted in the xenbox stage so it exists when the network is started in the devcloud phase.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
0555b79e8d
Updated to suppor 2 nics.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
7902a69872
Change interfaces as per devcloud2
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
f55c230d89
Updated readme, adding rvmrc.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
791bf3c242
Default source should be devcloudbase-xen. Source "devcloud" only used when importing a successfully built devcloud.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin
b996aff418
Merge in of cleanup work.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:37 -08:00
Edison Su
716a5673d0
1st try to add async api in the storage component, it's ugly like hell
2012-12-14 18:25:40 -08:00
Jessica Wang
b7181bb426
CLOUDSTACK-642: cloudstack UI - Add Host step in zone wizard, Add Host diaog in hosts listView - call addHost API by type POST instead of type GET, remove parameters from URL.
2012-12-14 14:22:38 -08:00
Fang Wang
efa034e821
API-refactoring -- Add pod annotation, needed for the deployVM flow test.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 13:52:21 -08:00
Fang Wang
a2a3ef63c2
API refactoring -- add annotation for cluster group cmds and response.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 13:50:39 -08:00
Fang Wang
7ea690c74d
API refactoring -- add annotation for Account group and account response.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 13:49:38 -08:00
Fang Wang
27482045ce
API refactoring -- More parameter for counter group.
2012-12-14 11:52:08 -08:00
Fang Wang
44ef998cfc
api: Add Validator interface that will be used for the @Validator annotation
...
The @Validator (defined as @validate in wiki/FS) will do the following things:
- DBEntityValidator (verifies if the entity exists in the db or not)
- RangeValidator (min, max; limits)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 11:42:49 -08:00
Min Chen
c167ad45e3
Move view based VO and Dao classes to cloud-server module to hide the
...
details from API client, also extract query related methods into
QueryService interface.
2012-12-14 10:47:58 -08:00
Hugo Trippaers
859412c1ce
Fix headers
...
again....
2012-12-14 11:58:25 +01:00
Hugo Trippaers
2235776aed
Unittests for NiciraNvpGuestNetworkGuru
...
These unittests do not depend on the componentlocator but instead are
completely dependent on mock objects. This ensures that they can be run
standalone without any requirements on the environment.
Includes some fixes to NiciraNvpGuestNetworkGuru and GuestNetworkGuru
2012-12-14 10:41:36 +01:00
Edison Su
5df88d42c8
ix the add primary storage dialog so that when changing the protocol from RBD to another protocol the RBD fields will be removed.
2012-12-13 23:32:29 -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
Simon Waterhouse
0ba355fbc2
CLOUDSTACK-284: listVirtualMachines when zoneid passed
...
When zoneid is passed an no state is specified listVIrtualMachines does
not return the destroyed vms. This patch fixes the issue.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-13 23:06:07 -08:00
Atsushi Midorikawa
15704cfa6c
virtual router: edithosts.sh cleanup fails on existing hosts
...
The already deleted same hostname is not deleted from /etc/hosts of
vRouter.
vRouter's /etc/hosts format:
$ip $host
This patch fixes deletion logic below.
sed -i /"$host "/d $HOSTS
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-13 23:02:14 -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
Vijayendra Bhamidipati
8ced7da733
CLOUDSTACK-333: When Datacenter name in VCenter has spaces Primary Storage (VMFS) discovery will fail
...
Description:
Missed encoding of URI when discovering ESX cluster in vCenter.
Signed-off-by: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
2012-12-13 22:43:59 -08:00