14bd345f1f
merge compiles
2013-01-09 04:41:27 -08:00
fc92f04c6b
ApiDispatcher: Remove unused methods which were for acl processing
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:18:35 -08:00
765504c070
ApiServer: Fix apidiscovery fail case, fix comment
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:18:35 -08:00
2c04dad529
ApiDiscovery: New plugin to help discover apis on mgmt server
...
- Introduces api/discovery plugin that helps discover apis on the mgmt server
- It's a pluggable service, therefore has it's own api-discovery_commands.properties
where the discovery api, listApi can be blacklisted (by removing it), or it's
role mask can be changed
- By default its response has all the apis
- Changes in other parts of the code to make it work, viz. components.xml, pom.xml,
and in ApiServer where it is used as an adapter to get apiname, cmd mappings
The ApiDiscoveryService interface is a contract that the implementing class will
provide:
1. A means to get all the apis as a list of response, plugin is free to implement
the response class, as long as it extends on the BaseResponse:
ListResponse<? extends BaseResponse> listApis();
2. Provides a map of apiname as the key and cmd class as the value:
Map<String, Class<?>> getApiNameCmdClassMapping();
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
d760271945
ApiDispatcher: Get rid of reflections, reuse utils' ReflectUtil
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
539d94b4a6
ApiXmlDocWriter: Reuse methods from ReflectUtil
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
cc23a23324
Fix startup sequence for classes that have due Manager/Adapter interfaces
2013-01-08 18:42:12 -08:00
b274c570f9
Cleanup places that use explicit wiring of the components
2013-01-08 17:45:33 -08:00
d22229eb9d
Remove updateUuids code in ConfigurationServerImpl (which is not the
...
right approach to populate uuid column since it will impact upgrade as
well), and populate UUID column in seed data sql script.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 17:12:14 -08:00
7f3a748d6c
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-08 14:46:38 -08:00
32e67f60d4
Work with Spring proxy-ed object
2013-01-08 14:24:19 -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
74c15a22a0
Create DB view for ListStoragePools API performance optimization.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 12:33:18 -08:00
a4f4c98670
OrchestrationService: some changes for DeployVM
2013-01-08 11:53:54 -08:00
992fa473be
convert existing singleton objects into Spring loadable bean components
2013-01-08 11:07:22 -08:00
b96bb8feb9
Hook log4j to Spring bootstrapped Javelin server
2013-01-07 18:21:58 -08:00
0894822651
DB view dao cleanup, and introduce global configuration parameter for
...
entity detail batch query size to remove hard-coded
VM_DETAILS_BATCH_SIZE.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-07 16:40:31 -08:00
559933f062
First page of Javelin management server bootstraped by Spring is able to show now
2013-01-07 15:54:18 -08:00
af1abe4056
Forgot some element adapters + dont add JuniperSRX by default
2013-01-07 15:21:57 -08:00
e262eef296
Fix mocks
2013-01-07 15:21:49 -08:00
c876f02c6f
Clean up some unused imports
2013-01-07 15:21:36 -08:00
cf90685985
Remove old applyRules implementation
2013-01-07 14:26:09 -08:00
f4da21998c
WIP : extract NetworkService
...
WIP : move stuff between network manager and network service.
at this point there is about 700 lines of duplicated code
WIP: Leave creation of default offerings to NetworkManager init
WIP: clean up imports
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-07 14:25:03 -08:00
a948a89378
Sync updates: Merge branch 'master' into api_refactoring
...
Conflicts:
server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-07 10:38:43 -08:00
13de3ca253
Enable default sorting for listVirtualMachines and listRouters to keep
...
back compatible.
2013-01-07 10:26:33 -08:00
3ffbc4320a
CLOUDSTACK-595 : Recreate root volume scenarios doesn't work in vmware
...
Issue seen during system vm template upgrade and restoreVM command
scenarios for vmware. In these cases CS tries to recreate root disk with
same name as the existing one, in case of vmware this results in creation
of vmdk file with same name for both existing and new root volume.
This results in undesired behavior when storage cleanup thread tries to
cleanup old volume. Made the vmdk file name unique by adding the volume
id to it. This will ensure that during volume recreation in the scenarios
mentioned vmdk will get created with a new name and there will be
no undesired side effects of running the storage cleanup thread.
2013-01-07 16:18:05 +05:30
5502f4b20c
Corrected response object in Traffic Monitor APIs Implementation annontation as TrafficMonitorResponse
2013-01-07 12:32:24 +05:30
39b829bffe
api: ACL annotation and checkAccess removal refactor for StopVMCmd
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:19:49 -08:00
96b9164e4b
Fix ACL processor and methods in ApiDispatcher and their usages
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:18:45 -08:00
19cf665094
ApiServer: Fix debug output for role based user access checking
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 16:51:14 -08:00
ed0637b8c2
api: Refactor move acl to org.apache.cloudstack
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:30:58 -08:00
6f6ed85839
ApiXmlDocWriter: Fix apidocs generation based on new commands.properties syntax
...
Makes it backward compatible to old syntax as well
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:01:09 -08:00
e17e68f0af
server: Fix base template*cmd class imports and names
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 14:47:00 -08:00
b720675bfe
Merge branch 'master' into api_refactoring
...
Getting ready for merge request for master, sync changes
Conflicts:
client/tomcatconf/commands.properties.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 01:11:16 -08:00
aa9701a10c
CLOUDSTACK-799: Redundant router: Speed up RvR status update
...
The basic idea behind this is, deploy a fix sized threadpool for updating RvR
status, then using producer/consumer model. There is a global configuration
router.check.poolsize(10 by default) to control the pool size.
Using pool size 100 for 1000 RvR is tested with simulator and works well.
Also we can adjust the global configuration option router.check.interval to e.g.
60s from default 30s to mitigate the issue.
2013-01-05 21:02:37 -08:00
21d6cd304b
server: Reformat DomainChecker
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 17:00:13 -08:00
6a112bd64c
api: Rename Validator to Validate, cosmetic fixes
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:52:53 -08:00
b00ed17f4b
server: Cosmetic fix for methodname in ApiDispatcher
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:40:59 -08:00
63481ecb34
CLOUDSTACK-212: Move api response classes to cloud-api under org.apache.cloudstack
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:27:36 -08:00
73a0c3e07f
api: Refactor move storagepool apis to storage pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 15:32:58 -08:00
f07a98a740
api: Refactor and move s3 to api.command.admin.storage
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 15:30:38 -08:00
5119785cf7
Get latest changes, merge branch 'master' into api_refactoring
...
Conflicts:
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 22:21:20 -08:00
a64b386714
Move applyRules to the rightful place(s). Not sure why applyIps is required during applyRules, so we still have a reference back into a (simplified) applyRules in NetworkManager
2013-01-04 19:22:53 -08:00
42c8c73ab6
CLOUDSTACK-306: Introducing IpDeployingRequester and implement inline mode
...
For LB device in inline mode, the ip deployer(the owner of public ip) is the
firewall in front of it, not itself. So check if it's inline or not, if it's
inline, return the firewall as ip deployer
2013-01-04 19:18:03 -08:00
177e157cbf
CLOUDSTACK-306: Move inline mode parameter from device to network offering
...
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
2013-01-04 19:17:58 -08:00
717f9dcd4d
CLOUDSTACK-306: Implement SRX firewall
...
Use SRX firewall filter as SRX firewall. The old security policy mechanism
cannot be used as IP based. This would enable SRX's ability to control traffic
for F5 behind it.
2013-01-04 19:17:50 -08:00
dea8227001
server: Exclude ListPerf test in as it requires real MS and DB
...
Excluded test as per test author's comment:
"Currently we commented out this test suite since it requires a real MS and Db running"
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 18:25:13 -08:00
0659c21f2d
Get latest changes, Merge branch 'master' into api_refactoring
2013-01-04 17:22:57 -08:00
65a1284e83
srx: Annotate api classes, remove IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 17:00:10 -08:00
4dd5f14e76
f5: Annotate f5 cmd classes, remove IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 16:49:27 -08:00
e37f458a8d
Rationalize the interface by injecting all service providers by the service provider interface instead of assuming everybody implements NetworkElement. This is step 2 and includes all the plugins
...
import cleanups - remove unneeded and add explicit classes
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 15:13:47 -08:00
3529c47248
Rationalize the interface by injecting ipDeployers. This is step 1 and includes 2 service providers - Remote AccessVPN and S2S VPN
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 15:08:55 -08:00
0428b30a5a
Fix reflections cmd class loading in ApiServer
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 14:35:05 -08:00
2e9c55f8f6
More Spring issues to bootstrape javalin server
2013-01-04 14:25:12 -08:00
b0a1a47d48
Not all network service providers need to be NetworkElements. NetworkElements are only those that are interested in L2 events. Since only NetworkElements were injected, and only in NetworkManagerImpl, this has led to all kinds of contortions. As a first step, enable individual service providers to be injected.
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 12:14:49 -08:00
0055d80211
CLOUDSTACK-771: maven: add mysql version reference to enable non-snapshot builds
...
If you update your build to build a version with a name not ending in -SNAPSHOT,
you are required to declare versions on all your depdendencies. There is already
a cs.mysql.version property, this patch makes sure it is used where appropriate.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-04 12:20:06 -05:00
7240204a50
Pass on the destination host in StartCommand
...
I added this in commit bc94948e06110903a91a
2013-01-04 14:37:23 +01:00
6929bd9473
server: Don't silently ignore uuid param translation for required param in case they fail
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 22:32:47 -08:00
98d5719b57
server: Make ApiDispatcher backward compatible to not throw error on incorrect params
...
Incorrect params are silently ignored in 4.0 and before. The fix would log the error
in debug log, but will continue processing. In case of an issue with uuid or param
an empty response is sent, for ex. in case of deleted entities as well.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 22:32:46 -08:00
daeb4abcca
Create DB views for AsyncJobResponse to speed up listAsyncJobsCmd.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-03 15:35:26 -08:00
ff8fdbd194
Add missing @Id annotation to id fields for all the join VOs to support
...
findById call.
2013-01-03 14:12:15 -08:00
01701b1d9c
Missing two files in last check-in
2013-01-03 14:11:16 -08:00
25d14418b9
Replace Adapters<T> with standard List<T> to work with Spring injection
2013-01-03 13:33:52 -08:00
edb00bb613
Merge branch 'master' into api_refactoring
2013-01-03 08:32:56 -08:00
cc3d692ab8
Summary: Remove useless and commented code
2013-01-03 11:57:37 +01:00
580bf857ff
server: ApiServer inits with processing cmd classes to fill apiname:class mapping
...
- Add maven dependency reflections (wtfl license, apl compliant)
- Use reflections to recurse and get apiname:class mapping
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 18:43:59 -08:00
65e4f00a10
Annotate api name on usage related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 18:43:58 -08:00
ebfb90e217
Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-02 17:38:58 -08:00
bc8e0af0a3
plugin: ACL Static Role Based api access checker
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 17:06:19 -08:00
d235859168
Fix PluggableService to provide interface for ACL adapters etc. to get configs
...
- Fix interface to return array of strings, or filenames
- Fix StaticRoleBased ACL adapter to process config files by going through all pluggable services
- Refactor interface names
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 16:29:39 -08:00
d8d87adc22
Merge branch 'master' into api_refactoring
...
Conflicts:
api/src/com/cloud/api/commands/ListS3sCmd.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 13:57:55 -08:00
e2078ec6e4
Solve Spring loading issues with a few Dao and Manager components
2013-01-02 13:55:26 -08:00
e4583ced2e
S3-backed Secondary Storage
2013-01-02 10:28:47 -08:00
e936c32a04
Fixed problems with inject checkin
2012-12-28 16:24:54 -08:00
259e6d5f74
Fix a few Spring bootstrap issues
2012-12-27 17:46:52 -08:00
623e7389ef
api: Make APIServer backward compatible to accept both uuid and id for pre 3.x apis
...
- Allow both uuid and id in param for pre 3.x apis
- Enforce uuid as param for all >= 3.x apis
- Use regex to better match uuid param
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-27 15:24:17 -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
7a7fe583e0
Rename Implementation annotation to APICommand
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:55:34 -08:00
a18464dbe5
Rename @Entity to @EntityReference used in Response classes
...
- Renames to @EntityReference as @Entity is too general and used in javax's pkg
- Remove redundant imports
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:34:35 -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
21c1623a03
Create DB view for Volume to speed up ListVolumesCmd.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-25 17:08:50 -08:00
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
5aefd77f77
Fix for CloudStack-648
...
Signed-off-by: Gavin Lee <gavin.lxh@gmail.com>
2012-12-26 00:00:58 +08:00
beb2fccf1c
api: Finally get rid of IdentityMapper annotation processing in ApiDispatcher
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:06:36 -08:00
9d3ab8ded7
server: Get rid of db helpers that work with IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:04:32 -08:00
e849d70af1
api: Annotate some juniper-src apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:41:10 -08:00
a4fed07a7e
api: Annotate usage related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:33:30 -08:00
a5dddb4a83
api: Extend or Implement InternalIdentity's getId method on a lot of VOs and Interfaces
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 16:52:35 -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
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
5d8e106602
api: Add method in ApiDispatcher to be reused for both UUID and List<Uuid>
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 18:57:26 -08:00
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
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
08892c51a3
api: Fix jobid and entitytype for BaseResponse and QueryAsyncJob*
...
- Fix jobid serialization issue that broke the UI
- Fix AsyncJob Result and Response
- Get rid of getUuid(), setUuid(), just use getId, setId for uuid...
- All uuids from over the wire are UUIDs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
877e16029c
Fix a few Spring issues to Bootstrap javaline server
2012-12-21 16:49:27 -08:00
96c7bbeb86
Update the router status after start network
...
Start network can possible start the router as well. If it's already started by
start network, then we won't need to start it again.
2012-12-21 15:22:07 -08:00
9f257aa60b
Using different MAC for a pair of redundant routers
...
In the past, we use same MAC address therefore once MASTER is down, the packet
to the same MAC would go to BACKUP ASAP.
But now we also have arping after BACKUP become MASTER, which should update the
ARP cache of public gateway router quickly. Though it would be a little
delay(likely less than 1 second), it's still fine for different MAC.
And it would solve some cache issue for same mac on vSwitch different ports.
2012-12-21 15:21:53 -08:00
f4a90a151f
Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring
2012-12-21 15:11:54 -08:00
3ae5986b87
Update DB version during DB deploy
...
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
3. Added to schema-40to410.sql Upgrade40to41.java
Conflicts:
server/src/com/cloud/upgrade/dao/Upgrade40to41.java
setup/db/create-schema.sql
setup/db/db/schema-40to41.sql
setup/db/db/schema-40to410.sql
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-21 15:11:05 -08:00
03b47cb501
api: Temp. fix to be backward compatible to old way of id passing
...
For some apis, the param=-1 is used to evaluate conditionals. Allow -1 to be passed
for now. This is a APITODO/FIXME to fix stuff in service layer and then only get rid of it.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 14:41:14 -08:00
8acc85ca53
Update DB version during DB deploy
...
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
3. Added to schema-40to410.sql Upgrade40to41.java
2012-12-21 15:27:00 +05:30
d72f8a695d
Add new global configuration option to enable user specify guest OS DHCP policy
...
This is improvement of:
commit 1ca493e4fa
2012-12-20 19:21:02 -08:00
53e6825b74
CLOUDSTACK-689: Clean stop pending flags when VR start/stop
2012-12-20 18:51:01 -08:00
e4dbc2033f
Add upgrade script from 4.0 to 4.1.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 18:18:06 -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
a88ce6bb7f
Remove IdentityProxy from CloudException and ExceptionResponse.
2012-12-19 23:49:44 -08:00
98b022a430
Remove IdentityProxy from plugin response classes.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-19 13:09:02 -08:00
e397f23f6b
Revert "Guard null pointer exceptions."
...
This reverts commit fc56e29a3e
2012-12-19 11:23:09 -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
fc56e29a3e
Guard null pointer exceptions.
2012-12-18 22:26:38 -08:00
7b6132e8e2
api: Skip empty uuid processing in ApiDispatcher for received params
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 18:16:18 -08:00
a9df2cb0f5
api: Fix NullPointerException for listProjects in ProjectJoinDaoImpl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:18 -08:00
434258080f
api: Fix NullPointerException in ApiResponseHelper for DomainResponse
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:17 -08:00
22ee4200c3
api: Fix findByXId to findByUuid in EntityManager and ApiDispatcher
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:17 -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
16be94e9d7
Remove IdentityProxy from OfferingResponse, FirewallResponse,
...
FirewallRuleResponse, HypervisorCapabilitiesResponse, IPAddressResponse.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 12:02:08 -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
a390b273ae
Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring
2012-12-18 10:07:51 -08:00
5fdce84e81
api: Process UUID and Parameter annotations in ApiDispatcher
...
- Use @Parameter's entityType and type annotation fields
- Use @Entity annotation in Reponse class to get table info for Dao
- Use findByXId to process all entities and translate UUID to ID
- Handle error in reflection method invoking
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:16:33 -08:00
837d21bb2d
api: Implement findByXId in GenericDaoBase and EntityManagerImpl
...
Declare and define findByXId() in GenericDao and EntityManager.
This method would return a VO by UUID and EntityManager's interface would
take in the VO Interface.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:10:36 -08:00
3d344738b1
Fix ControlledEntityResponse interface to remove IdentityProxy for
...
projectId and domainId.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 23:24:08 -08:00
57eda4e3f4
Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring
2012-12-17 23:03:55 -08:00
d54d8cbcd7
api: Fix ApiServer's handle() which runs on integration.api.port
...
- Fix URI parsing using apache hc
- Remove bloated c-like parsing code
- Fix param processing
- TODO: To use Guava's multimap
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:51:51 -08:00
5572707ec6
maven: Bump httpcore version, add guava and httpclient dependency
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:44:48 -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
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
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
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
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
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
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
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
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
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
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
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
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
82a17a413b
CLOUDSTACK-505: Removed logging of deployVirtualMachine and resetPasswordForVirtualMachine commands.
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-13 16:00:30 -05:00
88b7af18e6
api: Revert "Move all the DB view DAOs from cloud-server to cloud-api for future api-server package."
...
Reverting commit as we don't want the daos to move to cloud-api.
We'll eventually breakout cloud-server and create cloud-api-server for the standalone
api server.
This reverts commit 7597a38f7a
2012-12-13 09:42:28 -08:00
7597a38f7a
Move all the DB view DAOs from cloud-server to cloud-api for future api-server package.
...
BUG-ID: CLOUDSTACK-527
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-13 09:28:42 -08:00
7dbdf786cc
api: FIXME for api access checker adapter
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-12 14:21:38 -08:00
472f4f91b9
Refactor ListProjectInvitationsCmd and ProjectInvitationResponse.
2012-12-12 09:04:43 -08:00
3661f7f992
Fix several bugs of new refactored list apis.
2012-12-11 17:37:16 -08:00
9c93fee0dc
Refactor ListProjectAccountCmd and ProjectAccountResponse.
2012-12-11 15:49:15 -08:00
c455cf9271
api: refactor common code to get classname for an api in ApiServer
...
- Refactor common code to get classname from apiname
- Fix search mechanism within api access checker adapter to:
* check permissions
* get class name for an apiname
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:17:47 -08:00
79b54e6ac1
api: Fix obj injections in ApiServer
...
- Inject classes using Inject annotation
- Don't misuse component locator
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:16:25 -08:00
6ce68b93cc
api: Fix APIAccessChecker and StaticRoleBasedAPIAccessChecker
...
- Add getCmd api interface in APIAccessChecker adapter to get cmd properties
- Add mechanism in StaticRoleBasedAPIAccessChecker to get config properties
- Add public interface to get the cmd properties for the adapter impl
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:10:36 -08:00
f4892fbb84
api: remove those evil extra newlines
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 13:38:32 -08:00
8735716ba0
Refactor ListProjectsCmd and ProjectResponse.
2012-12-11 12:51:08 -08:00
432ea9c7d4
CLOUDSTACK-265: provide option to turn-off automatic public IP association for each VM when using EIP service.
...
- introduces Capability in the network offering, which
decides when EIP service is enabled, by defualt public IP
should be assigned to the VM or not
- default network offering with EIP/ELB service will still work with old EIP
semantics, i.e) assign a public IP to each VM on start
2012-12-11 23:06:13 +05:30
c83323fea7
api: Refactoring ListUsersCmd and UserResponse.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:45:40 -08:00
8c4096dc59
api: Have apiserver injected by component locator
...
- Instantiate apiserver by injection, so all its entities are also created and injected
- Make the constructor protected
Thanks to Alex for helping out on this one.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:38:44 -08:00
2146687112
api: initialize vars in constructor of StaticRoleBasedAPIAccessChecker
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:28:06 -08:00
151a7643ce
api: Don't silently fail apiserver instance initialization
...
- ApiServer instance assumes cloudstartup servlet will initialize it
- Check and log if initialization fails
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 16:27:33 -08:00
8fbbc76466
api: minor fixes in ApiServlet
...
- Reusing local variable for string splitting/processing
- Fix comments
- Fix indentations
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 16:19:40 -08:00
293665fafb
api: Add license headers for APIAccessChecker and StaticRoleBasedAPIAccessChecker
...
- Fix license headers
- Fix tabs, trailing whitespaces
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:29:33 -08:00
1cf8b86ce5
api: Load InstanceGroupJoinDao to component Library
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:17:07 -08:00
bba96254f5
Refactoring ListVMGroupsCmd and InstanceGroupResponse.
2012-12-10 13:59:20 -08:00
238c55fb6e
CLOUDSTACK-596 : DeployVM command takes a lot of time to return job id Issue happens while deploying VM in advanced zone and 'networkids' parameter is not passed to deployVM command. In this case CS tries to identify a default guest network to be used for deploying VM. This logic is not optimized and latency increases with increase in user accounts and guest networks. Optimized logic for getting default network.
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-12-10 15:02:53 +05:30
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
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
30941c2d31
api: Refactoring ListEventsCmd and EventResponse, and create Event db view.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 16:54:45 -08:00
57c9b4c6b1
Figured out how to add annotations to jackson
2012-12-07 15:21:22 -08:00
41268d1237
api: Fix test failure in cloud-server
...
Added newly added dao class as part of list api optimizations to be picked up
by the locator.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 15:06:51 -08:00
acf7afd7f5
api: Refactor ResourceTagResponse and ListTagsCmd, add db view for ResourceTag.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:57:52 -08:00
8a313d7f84
api: SecurityGroupResponse and SecurityGroupRuleResponse refactoring
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 16:04:48 -08:00
eba353099e
api_refactoring: Fix build issue with api_refactoring branch.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 15:00:48 -08:00
da6e81aa21
api_refactoring: Fix build issues and incorrect imports
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 13:48:20 -08:00
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
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
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
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
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
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
ecc8249365
api_refactor: move cfg admin apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:50:26 -08:00
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
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
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
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
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
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
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
7fcfcdf91e
Summary: check-in for L4-L7 network services in the shared network in
...
the advanced zone
Details:
1). Added validation to check the Vlan Id specified in the createNetwork()
does not overlap with any of the vlan's used by isolated networks or
shared networks in the zone.
2). state change for shared network with services to go to 'Setup' state
on network shutdown instead of 'Allocated'
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
2012-12-06 13:06:18 +05:30
d4c604cfd8
Summary: partical check-in for L4-L7 network services in the shared
...
network in the advanced zone
Details : ensure that CIDR specified for shared network does not overlap with any
CloudStack generated CIDR's for isaolated guest networks when using
external networking devices
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 12:29:38 +05:30
0de5a145e4
Summary: partical check-in for L4-L7 network services in the shared
...
network in the advanced zone
Summary: change 'shared network' in advanced zone with L4-L7 services to go through network
implement phase. Add ACL checks to associate IP to shared network in the
advanced zone
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 11:55:19 +05:30
28bbf6c527
Summary: partical check-in for L4-L7 network services in the shared network in the advanced zone
...
Details:
- changed associateIPAddr API to accept shared network Id and account Id. Ip will be owned by tuple (account Id, network Id)
- chaged createNetwork API to accpet CIDR when network offering has external networking device providers
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared
network in the advanced zone
2012-12-06 11:55:19 +05:30
b0ce8fd4ff
api: Optimize and improve api, db call perfomance
...
This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 20:06:20 -08:00
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
ceddaf122c
api_refactor: refactor user apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:55:58 -08:00
ba8e61bfb5
api_refactoring: for network api refactoring move interfaces so it works
...
Move ExternalNetworkDeviceManager to cloud-api, as server depends on cloud-api
The api refactoring of one of the api required this interface
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:53:16 -08:00
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
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
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
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
dd5a36fcd2
api_refactor: refactor for autoscale apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:42:07 -08:00
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
feb342ad23
api_refactor: refactor autoscale apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:30:37 -08:00
456b852c0c
api_refactor: refactor loadbalancer apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:25:20 -08:00
8773fc2a55
api_refactor: refactor volume apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:20:48 -08:00
25b5aadb4e
api_refactor: refactor firewall apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:17:06 -08:00
5cd1f4b6c2
api_refactor: ip address apis refactoring
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:14:06 -08:00
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
7f9c490b5a
api_refactor: move listzones and listcapabilities to dc
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:06:34 -08:00
a34fc1f1a7
api_refactor: move listcapabilites to dc
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:44:17 -08:00
658cf56120
api_refactor: move diskoffering to offering
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:38:53 -08:00
6fe1b5f9b0
api_refactor: move diskoffering to offering
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:37:14 -08:00
1b8dc65f3a
api_refactor: refactor user (vpn) apis
...
- Fix refactored apis, mappings in commands*.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:27:47 -08:00
cabbc7bd7d
api_refactor: refactor disk api (only user)
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:31:03 -08:00
ea79162615
api_refactor: refactor configuration api for normal user
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:29:17 -08:00
28df57ec75
api_refactor: refactor serviceoffering apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:27:19 -08:00
73d1099c76
api_refactor: rename sg to securitygroup
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:25:22 -08:00
1e51d6c1ab
api_refactor: refactor guest os (guest) apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:19:39 -08:00
b673c21174
api_refactor: refactor job (async jobs) apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:12:17 -08:00
7ac48798b4
api_refactor: refactor event apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:05:54 -08:00
add1b9b055
api_refactor: refactor register apis
...
- Split register apis across template, iso and ssh pkgs
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:54:19 -08:00
316e7f226a
api_refactor: refactor tag apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:48:48 -08:00
37cd76ee81
api_refactor: refactor ssh apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:44:14 -08:00
9a0df30766
api_refactor: refactor account apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:42:13 -08:00
46353e0916
api_refactor: refactor vmgroup apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:35:30 -08:00
a033cf1bfc
api_refactor: refactor snapshot apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:19:12 -08:00
0df9538fb7
api_refactor: refactor security group (sg) apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:11:17 -08:00
3e0b2164be
api_refactor: refactor template apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:05:44 -08:00
e0b4430070
api_refactor: refactor iso apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
- Note: copyIso uses copyTemplate, refactor copyTemplate
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:01:29 -08:00
47ae62e44a
api_refactor: refactor network apis
...
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 22:47:07 -08:00
ac1ea7616a
api_refactor: refactor vpc apis
...
- 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:44:40 -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
7857b1f62a
CLOUDSTACK-573: check if external provider enabled, only when finalize the service/provider list for the network
2012-11-30 13:07:01 -08:00
1aa4ad6a3c
CLOUDSTACK-572: Advance SG enabled zone - allow deploying vm in SG disabled Account specific networks
...
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-30 12:47:37 -08:00
a2306f4917
some more poc work
2012-11-29 16:10:09 -08:00
073863249a
Some ACL POC work
...
Conflicts:
server/src/com/cloud/api/ApiDispatcher.java
2012-11-29 16:09:47 -08:00
6036f73725
Removed that darn exceptions when cloudstack is running in windows. It's a simple or check that was written as an and check
2012-11-29 13:35:23 -08:00
a28f4cac3c
HttpClient needs releaseConnection method call
...
reviewboard: https://reviews.apache.org/r/8186/
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-29 20:23:30 +01:00
e4a5173199
CLOUDSTACK-505: Do not log the command response object for the createSSHKeyPair command.
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-29 12:24:42 -05:00
5724f1ca96
fix build
2012-11-26 11:49:51 -08:00
e436d4327f
create volume from template unit test is passed
2012-11-26 11:42:34 -08:00
55447c2572
CLOUDSTACK-424: Fix NPE while updating user data
...
Replace newlines in userdata only when it's not null.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-21 18:27:11 +05:30
550f4fbcdc
create template/primary data store is done
2012-11-20 18:57:19 -08:00
573d13dd7c
starting unit test
2012-11-20 18:57:19 -08:00
2a0d0104bd
maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only
...
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-20 09:27:07 +01: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
88180fc139
Summary: Direct template imaging for CLVM, bypass copy template to primary
...
Detail: Because of the way most other primary storage types work with cloudstack
(i.e. backing stores) CLVM actually copies the template to a local logical
volume on primary storage, then uses that. This causes all of your primary
storage to be littered with a copy of every template used. Since we're not
using these, dump the template direct to the newly created logical volume.
This is faster as well since the template is sparse; we're not creating a fat
template on primary storage and then copying that to a logical volume when we
deploy from template.
BUG-ID: CLOUDSTACK-508
Bugfix-for: 4.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1353221260 -0700
2012-11-17 23:47:39 -07:00
f25a78111f
CLOUDSTACK-493: 22x-30 upgrade for Advance SG enabled zone
...
* enable SG provider if the zone is SG enabled
* don't create public traffic type for the zone if there is no public network exist in the zone in 2.2.x
2012-11-16 10:00:45 -08:00
264f777a2d
Remove AutoScale entities while deleting autoscaled loadbalancer.
2012-11-16 12:56:32 +05:30
aea87da410
Autoscale:Sending the Counter params as list
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-11-16 11:07:24 +05:30
affc162556
AutoScale: Fixing issues that occurred during rebase with master
2012-11-16 11:04:37 +05:30
527b5c8ee2
Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep
2012-11-16 10:57:00 +05:30
35b0e086d4
enable Autoscale VMs to be named as Autoscale-LB-<lbname>
2012-11-16 10:56:59 +05:30
57416188a2
Enabling aUtoscale VMs to be provisioned in a loadbalancer's network
2012-11-16 10:56:59 +05:30
bf1e6ed991
CS-15644-Autoscale: Implemented UUIDs for templateId-serviceOff Reviewed-By:Vijay
2012-11-16 10:56:58 +05:30
3e32a29048
Autoscale:Changes for addressing AutoScale bugs CS-15930, CS-15931, CS-15934, CS-15935
2012-11-16 10:56:58 +05:30
c1b4bc448c
AutoScale. Check vm group's interval during update with existing policiy's duration
2012-11-16 10:56:58 +05:30
d2155890cc
CS-16168:AutoScale- Deletion of Account doesn't delete the AutoScale LB rule
2012-11-16 10:56:57 +05:30
58db4d0d88
CS-15729:AutoScale. Aligning the NetScaler response time counter, and correcting duration check against interval
2012-11-16 10:56:57 +05:30
68fc64cfe9
CS-16159-Fixing the license headers
2012-11-16 10:56:56 +05:30
6daff57fdd
CS-15744:Incorrect error message with disable autoscaleVmgroup operation- patch sent by Deepak Garg (deepakgarg.iitg@gmail.com)
2012-11-16 10:56:45 +05:30
e9a4a7b1e6
CS-15745:Incorrect error message with update autoscaleVMgroup :patch-sent by Deepak Garg (deepakgarg.iitg@gmail.com)
2012-11-16 10:56:45 +05:30
f96810b9ae
AutoScale. Adding default counters
...
Conflicts:
server/src/com/cloud/server/ConfigurationServerImpl.java
setup/db/create-schema.sql
setup/db/db/schema-304to305.sql
2012-11-16 10:56:44 +05:30
dda4d39b55
AutoScale changes in Apache master
2012-11-16 10:56:44 +05:30
7a3ffb47e6
Add pipeline concept to RPC facility, fix javelin build issue
2012-11-15 16:15:24 -08:00
4c86b1545d
CLOUDSTACK-424: Update userdata should propagate to VR
...
The code that would propage userdata to router, when updateVirtualMachine api
is called, was missing. As per the docs [0], userdata should be a base64 encoded
string upto 2KB which is put on domr's html directory adn using HTTP GET the
userdata information can be obtained from the domr.
The updateVirtualMachine api [0] would accept a base64 encoded string
and decoded and put into the domr's /var/www/html/userdata/<uservm ip>/user-data
file. The operation does not require the VM to be in stopped state, though it is
advised to stop and call this api in case the user vm has a script which gets
the userdata information from domr while starting.
For example, this script can be used to fetch the data:
server_ip=$(grep dhcp-server-identifier /var/lib/dhclient-eth0.leases | tail -1 | awk '{print $NF}' | tr '\;' ' ')
wget http://${server_ip}/latest/user-data
This feature can be useful, for example to use into puppet facts [1], or to do
automation and horizontal scaling etc. based on userdata.
[0] http://incubator.apache.org/cloudstack/docs/api/apidocs-4.0.0/domain_admin/updateVirtualMachine.html
[1] http://geek.jasonhancock.com/2011/11/09/cloudstack-userdata-into-puppet-facts/
BUG-ID : CLOUDSTACK-424
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>
Reported-by: Nick Wales
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-15 18:43:51 +05:30
fe460fac43
Upgrading a network that has Network offering SRX/F5 inline mode to a network offering that has all service provided by VR does not give proper error message: Hence correcting the error message
2012-11-15 13:52:54 +05:30
2cae511464
Connnect event bus to messaging layer
2012-11-14 19:28:59 -08:00
2914985837
Fixed json response to return "size" parameter (resources count in the system) when pageSize=0 is specified
2012-11-14 15:01:48 -08:00
6d9cafbf35
DeployVm: when SG enabled network is passed to the command, but no SG list is defined in the request, add the vm to SG enabled network automatically
...
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-14 15:01:35 -08:00
74622a4dc3
Fixed listNetworks for the case when a) caller is an admin 2) projectId=-1 is specified - admin wasn't able to list networks belonging to regular users' projects
2012-11-14 14:59:51 -08:00
499a28cb43
Removed redundant imports from VolumeHostDao
...
Signed-off-by: Laszlo Hornyak <lhornyak@redhat.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1352883689 +0530
2012-11-14 14:31:29 +05:30
b38d9b82b6
CloudStack messaging refactoring skeleton
2012-11-13 17:59:39 -08:00
67490f75e6
Display the reason which failed certificate generation fails
...
within cloud.server.ConfigurationServerImpl.generateDefaultKeystore
Description:
The reason which failed in generation of the certificate is not displayed now.
At that time, IOException which does not include the reason is raised.
In order to solve the problem quickly, the reason should be included in the message.
(Now)
WARN [cloud.server.ConfigurationServerImpl] (main:) Would use fail-safe keystore to continue.
java.io.IOException: Fail to generate certificate!
at com.cloud.server.ConfigurationServerImpl.generateDefaultKeystore(ConfigurationServerImpl.java:490)
(Fix)
WARN [cloud.server.ConfigurationServerImpl] (main:) Would use fail-safe keystore to continue.
java.io.IOException: Fail to generate certificate!: sudo: sorry, you must have a tty to run sudo
at com.cloud.server.ConfigurationServerImpl.generateDefaultKeystore(ConfigurationServerImpl.java:490)
Testing Completed:
mvn clean install
mvn -pl :cloud-client-ui jetty:run
And generation of the certificate was made to fail, checked it.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-09 14:25:44 -05:00
f365426b99
temp changes
2012-11-08 23:37:30 +05:30
d118a3d764
Fixed the bug in xml response serializing (introduced while resolving merge conflict)
2012-11-07 17:17:17 -08:00
d79f1f6fdc
Replace Adapters and PluggableServices, use Spring to load them
2012-11-07 15:03:24 -08:00
453b31f3f4
Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring
2012-11-07 15:03:23 -08:00
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
476e771c1c
SSH key changes
2012-11-05 11:24:33 -08:00
b101dc7279
KVM agent connet:
...
* send StartupAnswer right after StartupCommand is recieved
* if post processor going wrong, send out readycommand with error message to agent, then agent will exit
2012-11-05 10:00:16 -08:00
91e68b5f2c
A bunch of .project changes again
2012-11-04 19:25:03 -08:00
d8fbb0dd13
maven: enable jvm heap size for forked surefire test processes
...
Any forked process that runs from maven surefire plugin gets it own separate
heap which may cause build issues. Patch fixes the issue by explicity args to
the surefire plugin for cloud-server.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-03 18:42:51 +05:30
1f458983af
CS-16310: don't process Disconnect when:
...
* attache is not forForward()
* and the Disconnect came through cluster notification event
The fix will prevent delayed AgentDisconnect cluster notification processing.
2012-11-02 10:51:39 -07:00
013102c028
CS-16611: when expunge Async job, expunge corresponding sync queue items
...
Conflicts:
server/src/com/cloud/async/AsyncJobManagerImpl.java
server/src/com/cloud/async/dao/SyncQueueItemDao.java
2012-11-02 10:51:29 -07:00
fe41325e96
ApiResponseSerializer - replaced all occurrences of string concatenation with StringBuffer.append
...
Conflicts:
server/src/com/cloud/api/response/ApiResponseSerializer.java
2012-11-02 10:50:04 -07:00
04a3c4ffdc
Removed unneeded if statement from VpcVirtualNetworkApplianceManagerImpl
2012-11-02 10:47:34 -07:00
efb5f85aad
CS-16594: when request is cancelled by the remote peer, in addition to cancelling the request, unblock the agent queue if the request is the current request
2012-11-02 10:47:24 -07:00
a5077968db
CS-16592: process handleConnectedAgent in a separate thread pool
2012-11-02 10:47:14 -07:00
3948d7d7c5
CS-16213: skip agent rebalancing when the management server doesn't own the host any more
2012-11-02 09:59:37 -07:00
62607c9a75
HandleDisconnect - don't update the DB when the disconnect event is happening as a part of MS Cluster notification
...
Reviewed-by: Frank Zhang
2012-11-02 09:59:37 -07:00
36babbfcac
CS-16213: agent LB - don't process Disconnect event from other management server in cluster, if the recipient is the future owner of the host. The disconnect will be handled during the rebalance host connection process itself.
...
Reviewed-by: Kelven Yang
2012-11-02 09:59:37 -07:00
705130e42c
CS-16499: removed useless txn.commit statement. Used to call it to ensure that the lock() on nic object will get removed even in case when we don't do the DB update. But our Transaction code does it automatic
2012-11-02 09:59:37 -07:00
597bc8c66c
CS-16499: forgot to add @DB to releaseNic() call
2012-11-02 09:59:36 -07:00
7bd7884f57
CS-16499: releaseNic - lock the nic row in the DB before checking its state. Hold the lock till the nics attributes + nicCount is updated
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-11-02 09:59:36 -07:00
772f660c33
Changed the create database steps to be create from a single create-schema.sql and then apply database modifications
2012-11-01 13:40:15 -07:00
db6c8f0176
CLOUDSTACK-439: Fixed typos and changed direct attached to shared network IPs
2012-11-01 14:12:49 -05:00
3423c5d74f
add volume service skeleton
2012-10-30 17:34:46 -07:00
f65b268a2e
Active the testrun by default in maven
...
Exclude the tests that need a database, these should move to the
integration test phase or use an in memory database maybe.
2012-10-30 14:15:07 +01:00
bd58ceccd8
Summary: Make the authenticator responsible for encoding the password and add a SHA256 salted authenticator
...
The authenticators now have an encode function that cloudstack will use to encode the user supplied password before storing it in the database. This makes it easier to add other authenticators with other hashing algorithms. The requires a two step approach to creating the admin account at first start as the authenticators are only present in the management-server component locator.
The SHA256 salted authenticator make use of this new system and adds a hashing algorithm based on SHA256 with a salt. This type of hash is far less susceptible to rainbow table attacks.
To make use of these new features the users password will be sent over the wire just as he typed it and it will be transformed into a hash on the server and compared with the stored password. This means that the hash will not go over the wire anymore.
The default authenticator in components.xml is still set to md5 for backwards compatibility. For new installations the sha256 could be enabled.
2012-10-30 12:56:56 +01:00
d70154609a
Wire up injection for dynamically constructed objects
2012-10-29 16:16:07 -07:00
a2d50c7e43
fix build
2012-10-29 12:55:15 -07:00
ce60cfee85
CS-16585: cloudstack 3.0 API - listProjects API - throw an API error if account is specified but domain is not.
2012-10-29 11:19:29 -07:00
e24456f487
[CLOUDSTACK-415] Workaround this problem for now
2012-10-29 09:26:14 +01:00
e59726ad95
[CLOUDSTACK-359] Hook up the other side of the event propagation
2012-10-26 14:25:14 +02:00
a388a748d0
Added a database creator class. not working yet. Edison will look at it
2012-10-25 17:34:54 -07:00
7b7f4cd1fd
CLOUDSTACK-409: ThreadLocal Transaction and its db connection got reset for user managed db connnection, causing ClusterHeartBeat thread frequently trying to get db connection. Add unit test to test user managed transaction.
2012-10-25 13:06:50 -07: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
b57be3389e
add apidocs/devcloud projects
2012-10-21 00:01:47 -07:00
8e59b3acfb
Architecture refactoring - Stateless management server - Spring Framework initiatives, add missing files
2012-10-19 15:32:24 -07:00
214bbf3ebd
CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup
...
Conflicts:
api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
server/src/com/cloud/network/element/CiscoNexusVSMElement.java
server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/element/NetscalerElement.java
server/src/com/cloud/network/element/OvsElement.java
server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/storage/StorageManager.java
2012-10-17 17:26:19 -07:00
c40aac0add
Add Mock managers for Regio API server
2012-10-17 17:02:13 +05:30
f0f33bf4da
Added Mock ApiServer, Regions API calls with api keys
2012-10-17 14:16:36 +05:30
a9fab0526b
CLOUDSTACK-348: decrement resource count when the network gets removed
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-10-16 16:18:36 -07:00
9d07ad8ecb
CLOUDSTACK-304: default number of concurrent snapshots is NULL (unlimited) - to provide backwards compatibility for existing customers.
...
Conflicts:
setup/db/db/schema-305to306.sql
2012-10-16 11:25:05 -07:00
3f5733cea7
CS-16412: fixed count for following commands:
...
listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes
Conflicts:
api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
api/src/com/cloud/api/commands/ListConditionsCmd.java
api/src/com/cloud/api/commands/ListCountersCmd.java
api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
api/src/com/cloud/network/as/AutoScaleService.java
server/src/com/cloud/network/as/AutoScaleManagerImpl.java
server/src/com/cloud/network/as/dao/CounterDao.java
server/src/com/cloud/network/as/dao/CounterDaoImpl.java
server/src/com/cloud/projects/ProjectManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-10-15 18:16:59 -07:00
0a7d03c90b
javelin is revived
2012-10-15 15:42:59 -07:00
112143def6
add templateprofile
2012-10-15 14:10:49 -07:00
1d458c7a2d
CLOUDSTACK-347: ipAddressResponse/NetworkResponse API - return vlan info only when the caller is ROOT admin
2012-10-15 11:39:38 -07:00
8f2d9a09e5
CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands
...
Fixes the count in commands:
listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes
Conflicts:
api/src/com/cloud/api/commands/ListVMsCmd.java
api/src/com/cloud/api/commands/ListVolumesCmd.java
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2012-10-12 13:58:59 -07:00
5d7509e964
Merge DB query builders from master
2012-10-11 18:24:33 -07:00
5fee891162
merge from master
2012-10-11 17:42:25 -07:00
513b680d96
CLOUDSTACK-316: if public network is not specified, set to guest network
2012-10-11 16:46:23 -07:00
6dd5c3fd42
CLOUDSTACK-70: Improve restart network behaviour for basic network
...
If cleanup=true, network elements and resources are shutdown and
reimplemented. Else, shutdown/reimplementation is skipped. Enabled
cleanup checkbox in CS UI.
For both cases, VRs are only deployed for Pods with no running
or starting VRs and Pods having running or starting user vms.
New DAO helpers introduced:
HostPodDao: listByDataCenterIdVMTypeAndStates
DomainRouterDao: listByPodId and listByPodIdAndStates
VMInstanceDao: listByPodId and corrected definition of listByTypeAndState
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 19:33:26 +05:30
339aa41442
CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.
...
Conflicts:
core/src/com/cloud/async/AsyncJobVO.java
core/src/com/cloud/async/SyncQueueVO.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/async/AsyncJobManagerImpl.java
server/src/com/cloud/async/SyncQueueManager.java
server/src/com/cloud/async/SyncQueueManagerImpl.java
server/src/com/cloud/async/dao/SyncQueueDao.java
server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
server/test/com/cloud/async/TestSyncQueueManager.java
setup/db/create-schema.sql
2012-10-10 13:40:00 -07:00
c36744a18c
Fixed deployVR - used to fail in case when system.vm.default.hypervisor was set to not NULL value
2012-10-10 13:05:39 -07:00
839929b9b2
Fixed lineendings and trailing whitespaces in a bunch of files
...
Conflicts:
core/src/com/cloud/async/SyncQueueItemVO.java
core/src/com/cloud/async/SyncQueueVO.java
server/src/com/cloud/async/dao/SyncQueueDaoImpl.java
server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
2012-10-09 17:17:36 -07:00
290e8954f7
Removed more unused imports in Snapshots code
...
Conflicts:
server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
2012-10-09 17:07:03 -07:00
823f0c9669
Fixed ipAssoc and createNetworkACL (for vpc) commands - didn't work in Project scenario
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
2012-10-09 16:26:26 -07:00
43b406279a
listTemplates/listIsos - template filter "all" can be specified by admin only. Throw an error when user tries to use it
2012-10-09 16:23:05 -07:00
c9aa9a5557
CLOUDSTACK-287: don't allow API call against system account (adding users to system account is prohibited; can't delete/update System account)
...
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2012-10-09 09:37:27 -07:00
ffa5276222
Fixed CLOUDSTACK-287
...
1) Always fail to authenticate system user.
2) DB - always create system user with RANDOM not null password
3) Don't allow modifying (setting api/secretKeys, etc) system user via API
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
setup/db/db/schema-305to306.sql
2012-10-09 09:37:27 -07:00
a5bca0999a
CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance
2012-10-08 14:05:05 +08:00
436960d2aa
Fixed unittest
2012-10-05 15:38:20 -07:00
fa81f27254
CLOUDSTACK-271: when check for vnet conflicts against existing physical networks, skip the networks with null vnet ranges
2012-10-05 15:10:31 -07:00
be2017849a
CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process.
2012-10-05 15:10:31 -07:00
5cd7fb8408
CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException "
2012-10-05 11:42:04 -07:00
15f6fbbee4
CLOUDSTACK-251 :
...
when host is reconnected, CS try to make sure the host can access primary storage,
CS only do this when primary storage is UP, and even host cannot access primary storage,
that is okay, do not throw exception, just print a warning message
2012-10-04 11:31:53 -07:00
4e1f3f9410
CS-16426 For network offerings with IP conserved mode off, LB/PF/StaticNAT rule creation fails if the first rule is firewall
...
fixes, accidental modification of network services map object corresponding to a public IP
2012-10-03 17:18:00 -07:00
89779cceb8
Merge branch 'master' into regions
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/user/UserVO.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/user/AccountManagerImpl.java
setup/db/create-schema.sql
2012-10-03 14:09:01 +05:30
78c08de467
Removed unused imports (that caused a dependency on xapi)
2012-10-02 10:30:26 -07:00
b7a93be47e
Added license header to Upgrade40to41.java
2012-10-02 13:06:59 -04:00
f16b5103d8
Merge some stuff from maven-waf branch into master
2012-10-01 15:04:08 -07:00
93aaa5f975
Provide an (for now) empty upgrade path so the server will start.
2012-10-01 14:07:24 -07:00
aa6355ffe6
Updated master to 4.1.0
...
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer -DdevelopmentVersion=4.1.0-SNAPSHOT
2012-10-01 11:00:55 -07:00
11fe086ada
Fixing CLOUDSTACK-226: don't allow physical networks with overlaping vnet ranges, belong to the same zone. Fixed create and update physical network code
2012-09-28 13:11:20 -07:00
dc64fcab93
Removed unused code that was commented out in SnapshotManagerImpl- you can alway retrieve it back from the history if needed
...
Conflicts:
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2012-09-27 11:13:37 -07:00
efab2f413b
Removed more unused imports in Snapshots code
...
Conflicts:
server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
2012-09-27 11:12:53 -07:00
c27b44e7f7
Removed unused imports from snapshot manager
2012-09-27 10:50:48 -07:00
6875f48966
Validate port ranges in PF rule only when startPort != endPort in private or public range
2012-09-27 10:50:30 -07:00
bbbccc0a7b
Port ranges for PF rules: public port start should be equal to ending port start; the same applies to end ports
2012-09-27 10:50:04 -07:00
4fcf64dd74
updated regions branch with changes from master
2012-09-27 17:04:59 +05:30
39d394a8e8
Propogate Domain and User commands
2012-09-27 16:44:12 +05:30
daeac9ec57
CLOUDSTACK-215 CPVM load balance didn't work, VNC console sessions go to one CPVM and ignore other CPVMs
2012-09-27 13:03:09 +08:00
3c25d0ea67
CLOUDSTACK-202 Can't create VM from ISO, when in VPC
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2012-09-27 10:07:15 +08:00
6540ff8fa1
bug CLOUDSTACK-198: VPN user add, on failure remove user currently being added only, other users will remain in Add state
2012-09-26 13:54:49 +05:30
2da5b448a1
CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start (add exception handling)
2012-09-26 14:51:17 +08:00
7e75140537
CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start
2012-09-26 14:05:37 +08:00
51041e4f77
Fixed security problem in listAccounts call (regular user could see other accounts' info when domainId was passed in to listAccounts call)
2012-09-25 10:44:22 -07:00
a82ee7715e
CLOUDSTACK-191: Update checking for updateCustomerGateway
...
Reviewed-by: Anthony Xu
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-09-24 17:47:09 -07:00
a01304e65b
CLOUDSTACK-123: fix NPE
2012-09-18 16:43:05 -07:00
955cbd97bc
CLOUDSTACK-10 Deleting a disconnected primary storage results in partial removed state
2012-09-18 11:18:44 +08:00
387c6fc135
Merge branch 'master' into javelin
2012-09-17 15:31:37 -07:00
16c1fd9288
CLOUDSTACK-116 Guest Network created in a Sub Domain which doesn't have a network domain suffix, is assigned the network domain suffix of the zone instead of that of the Parent domain of the Sub domain
2012-09-17 21:23:41 +08:00
ff81fda4e0
adding missing import that should have been part of commit b28749f2b1
2012-09-17 13:18:32 +05:30
b28749f2b1
upgrade external devices support from 2.2.14 to network offering framework
2012-09-17 11:39:41 +05:30
db9cc97ab3
Brought over new changes from master
2012-09-13 11:43:22 -07:00
06b7d80fec
latest changes
2012-09-13 11:31:54 -07:00
cfc2b85651
Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-13 14:18:14 -04:00
a9559cbb67
When a VM is force deleted and the host is not available then CS simply marks the state in db as "Destroyed/Expunging". The VM is still running on the host and once it becomes available again there is a discrepancy in state of the VM. In this scenario the VM is removed from the host when the next full cluster sync happens.
2012-09-13 16:34:53 +05:30
5532f58bbc
remove cloud.com license headers
2012-09-13 12:34:32 +08:00
55bcfaf805
CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI
2012-09-13 11:21:11 +08:00
fe8a2992a2
Elimiate mystery guestIp in IpAddressTO
...
Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks
2012-09-12 15:42:48 -07:00
a56631bc66
bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed.
...
Also after the maximum attempts are reached the user account is disabled
2012-09-12 19:35:24 +05:30
cd77e42a71
Closing open transactions from SecurityGroupWorkDao
...
reviewed-by : Prachi Damle
2012-09-12 18:48:33 +05:30
2307117a24
Fixed unittest
2012-09-11 17:38:31 -07:00
9445c9e73b
CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup)
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-09-11 17:38:30 -07:00
331598243c
Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code)
2012-09-11 17:38:29 -07:00
63ab0c2728
Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton.
2012-09-11 17:38:28 -07:00
1c96ef41c1
CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.
2012-09-11 17:38:27 -07:00
4a8ffe34e2
CS-16239: don't try to pull key information if the key was removed in the system
...
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user
Conflicts:
server/src/com/cloud/api/ApiDBUtils.java
2012-09-11 17:38:24 -07:00
2404d3493d
CS-14277
...
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
Following changes are made:
- Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
- Create/delete of data volume on local storage
- Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
- Migration of VM instance is not supported if it uses local root or data volumes.
- Migrate is not supported for local volumes.
- Zone level config to enable/disable local storage usage for service and disk offerings.
- Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
- Deploy VM command validates service and disk offerings based on local storage config.
- Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:38:15 -07:00
452e34908f
Fix the output of instance-id and vm-id to UUID
2012-09-11 17:38:06 -07:00
88f85b29c2
Replace db-id by UUID for user VM's vm-id.
2012-09-11 17:38:05 -07:00
b02551dcf6
Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails"
...
This reverts commit ecd1ac214c
2012-09-11 17:38:02 -07:00
efd0905fbd
only check ISO which is downloaded status
2012-09-11 17:37:58 -07:00
e5a16f40cd
CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails
...
If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-11 17:37:05 -07:00
3afc9cc630
Add KVM to hypervisor types allowed in VPC
...
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
2012-09-11 17:33:24 -07:00
e1b3f0cf87
CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process.
...
- Using temp to not affect the return value for the method.
2012-09-11 17:33:00 -07:00
4e29e0d5c3
CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed.
...
Making sure host disconnect is called.
2012-09-11 17:32:59 -07:00
c876a66b3f
Fixed unittest
2012-09-11 17:26:20 -07:00
f5c9397327
CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup)
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-09-11 17:05:04 -07:00
d0c526fdcd
Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code)
2012-09-11 17:03:11 -07:00
6fd7da8f56
Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton.
2012-09-11 17:03:11 -07:00
cc80d09d77
CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.
2012-09-11 16:58:09 -07:00
acd08e61e6
CS-16239: don't try to pull key information if the key was removed in the system
...
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user
Conflicts:
server/src/com/cloud/api/ApiDBUtils.java
2012-09-11 14:37:25 -07:00
65eeeaf071
CS-14277
...
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
Following changes are made:
- Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
- Create/delete of data volume on local storage
- Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
- Migration of VM instance is not supported if it uses local root or data volumes.
- Migrate is not supported for local volumes.
- Zone level config to enable/disable local storage usage for service and disk offerings.
- Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
- Deploy VM command validates service and disk offerings based on local storage config.
- Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:22:43 +05:30
4b8fb79ef6
Fix the output of instance-id and vm-id to UUID
2012-09-10 18:02:34 -07:00
663e250334
Replace db-id by UUID for user VM's vm-id.
2012-09-10 18:01:08 -07:00
d6b6529951
Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails"
...
This reverts commit ecd1ac214c
2012-09-10 16:34:21 -07:00
0442917381
only check ISO which is downloaded status
2012-09-10 13:30:25 -07:00
ecd1ac214c
CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails
...
If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-10 14:13:24 +05:30
24fa14845b
Add KVM to hypervisor types allowed in VPC
...
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
2012-09-07 15:39:23 -07:00
60f130c509
CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process.
...
- Using temp to not affect the return value for the method.
2012-09-06 16:31:00 -07:00
61a19eb089
CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed.
...
Making sure host disconnect is called.
2012-09-06 16:30:50 -07:00
1d0a10c69e
Merged master over to javelin to get new poms and maven build
2012-09-05 14:31:24 -07:00
86427559cb
CS-16269: Fix savePassword on one stopped RvR
2012-09-05 13:46:44 -07:00
51cc301fef
CS-16222: send password reset command only to the element responsible for the userdata service in network
...
Reviewed-by: Sheng Yang
2012-09-04 13:41:10 -07:00
f509efe2d8
cloudstack 3.0 - API response serializer - change XML serialized string's encoding from ISO-8859-1 to UTF-8 to support more characters - fix "L10N: DE, ES, FR, JA, KO, SC: Garbage characters appear when using localized characters in Subscriptions page" (Reviewed-by: Brian)
2012-09-04 11:43:29 -07:00
dd07d1598f
Fix Bug CloudStack-9 can not change OS preference from OS to none
2012-09-04 20:51:03 +08:00
73cc474157
add secondary storage provider
2012-09-02 19:26:20 -07:00
083cef37f1
CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.
...
Reviewed-By: Alena
Changes:
- Removing unnecessary search over op_host_capacity table in StorageCapacitylistener.
2012-08-31 13:40:18 -07:00
3d0069bb56
CS-16158 : Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.
...
Changes:
There is an unnecessary search over capacity table that scans entire table.
2012-08-31 13:40:17 -07:00
39a676c496
Correct license header mainly for patches folder
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree. If https://issues.apache.org/jira/browse/LEGAL-146
results in a different opionion from the members, then we
will end up having to do something more drastic anyway.
2012-08-31 10:50:46 -04:00
2fd99fe955
Deleted files
2012-08-30 09:59:27 -07:00
6309253de1
Deleted some useless files
2012-08-30 09:59:25 -07:00
d3921139ed
Patch from Gavin Lee: Change license to ASL2.0 in server and tools
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-08-30 10:36:29 -04:00
f7acd8fed8
Create random version for StartupCommands in dev env setup
2012-08-30 08:47:02 +02:00
79ebffe4f3
CS-13594: Download template is unable to handle multiple SSVMs per zone
...
Reviewed-by: Kishan
2012-08-29 15:25:00 +05:30
eb4a3cf6c8
bug CS-15398: fix for basic zone dns issue in multiple pods
2012-08-29 14:33:27 +05:30
2300310243
Messaging facility initials for new architecture
2012-08-28 17:58:45 -07:00
f6f1be62b9
configuring tomcat maven plugin too
2012-08-28 23:58:06 +02:00
f218003607
Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack
2012-08-28 23:30:57 +02:00
8c3450b503
CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI.
2012-08-28 13:52:42 -07:00
ff7c964a66
Add ability to do jetty:run in eclipse
2012-08-28 09:16:44 -07:00
43e4de429e
Fix up some dependencies
2012-08-28 09:03:25 -07:00
5e0ede8bd9
bug 13946: reducing poll interval
2012-08-28 12:22:46 +05:30
38e26f8dbd
IpAssoc: when set ROUTER_GUEST_IP, get network id from associatedNetworkId field of the ip address instead of networkId as networkId is the id of the public network the ip belongs to
...
Reviewed-by: Sheng Yang
2012-08-27 16:26:32 -07:00
82cb1095dc
CS-16188: S2S VPN: Limit VPN customer gateway name duplicate checking within account
...
Reviewed-by: Anthony Xu
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-27 16:11:36 -07:00
fbdc7fc59f
CS-16178 - when remove PF rule, in VPC setup make sure if the rule is the last one for the network, disassociate it from the network
...
Reviewed-by: Sheng Yang
2012-08-27 13:46:36 -07:00
48806fcc54
VPC: CS-16179 - only offerings in Enabled state can be used for VPC creation
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-27 11:11:55 -07:00
3609e44b58
commit for https://reviews.apache.org/r/6608/
2012-08-27 10:39:49 -07:00
93ac01db0b
Fixed unittest
2012-08-27 09:46:56 -07:00
a06ed5728c
remove intermediate parent poms
2012-08-27 16:43:24 +02:00
3aa469da2a
groupdId is now org.apache.cloudstack
2012-08-25 09:20:21 +02:00
0d9b81aac6
that was an unused import not a missing dependency
2012-08-25 00:44:14 +02:00
e7b4e15b42
add missing dependency
2012-08-25 00:37:25 +02:00
5ef60aceb1
%s/tab/ws/
2012-08-25 00:03:23 +02:00
4a4007e652
Add license
2012-08-24 11:18:54 -07:00
ebc0fa458a
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-24 11:18:54 -07:00
490e87a617
Fix small compilation issue encountered when building with maven
2012-08-24 11:18:53 -07:00
f826971fea
Maven config, initial commit
2012-08-24 11:18:52 -07:00
e3f2cf908a
Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor
2012-08-24 15:57:18 +02:00
4ea36b82e9
propogate account changes to other Regions
2012-08-24 15:59:59 +05:30
a08ae8e42c
[ASFCS40]CS-15586: Public Vlan for an account fails in case of multiple Physical networks
...
Changes:
- Since Now a zone can have multiple physical networks, we need to find the physical network Id from the networkOffering's tag and zoneId and trafficType when we create a guest network
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-23 18:18:12 -07:00
d06d6dae72
add maven eclipse project files from Darren
2012-08-23 17:55:20 -07:00
aec6b4af48
[ASFCS40]Upgrade to 4.0: host_details unique key addition needs IGNORE keyword to correct the duplicates
2012-08-23 17:52:04 -07:00
9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
2f6cc4b0cb
Add license
2012-08-23 14:26:26 -07:00
ad54ed1790
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
f78aa9d98a
Fix small compilation issue encountered when building with maven
2012-08-23 14:26:25 -07:00
b8e95e435f
Maven config, initial commit
2012-08-23 14:26:25 -07:00
3298a481a8
For assignVM, marking older snapshots removed in db
2012-08-23 12:22:02 +05:30
6f26894eaf
Fix for a corner case during fullsync where it tolerates a VM to exist on two clusters by virtue of it’s current host id and last host id (being on two diff clusters).
2012-08-23 12:13:53 +05:30
3ada5e4a46
VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-22 11:53:59 -07:00
4a2796d7c7
CS-16123: applied the patch from https://reviews.apache.org/r/6723/
...
original committer: Mice Xia
2012-08-22 09:39:19 -07:00
a5248f1cfc
Fix for dns issue in multiple pods
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-22 16:48:41 +05:30
b42a813ff1
bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh
...
status CS-16112: resolved fixed
Conflicts:
patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
2012-08-22 12:00:02 +05:30
0b31a0af62
[ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0
2012-08-21 16:27:57 -07:00
4bffd71d71
[ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch.
2012-08-21 16:27:54 -07:00
cd0004bb86
CS-16111 - DB upgrade; fixed foreign keys names
2012-08-21 15:38:17 -07:00
e252de4999
PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address
...
Reviewed-by: Frank Zhang
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-21 15:35:40 -07:00
2bf5c99bc6
CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-08-21 15:31:07 -07:00
7d0ad98c93
More logging to lock operations on the network
2012-08-21 15:25:17 -07:00
14dd3f07d7
Fixed line endings in VirtualNetworkApplianceManagerImpl
2012-08-21 15:24:44 -07:00
7aa7d6e39f
CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift.
...
Reviewed-by: Kishan
2012-08-21 13:46:18 +05:30
481aae1ebc
add recreate.systemvm.enabled parameter to control recreating systemvm
2012-08-20 11:19:26 -07:00
ac9dee94ac
fix from Pradeep Soundararajan for removing build dependency on mysql-connector-java https://reviews.apache.org/r/6180
2012-08-20 13:38:19 -04:00
86d49e7aa0
CS-16060: Firewall service should be excluded from conserve mode checking
2012-08-17 17:05:04 -07:00
a8efbcda58
S2S VPN: Fix license headers
2012-08-17 16:52:06 -07:00
1cfcefd2fb
CS-16043: Using network based router rather than account for RVR detection
2012-08-17 16:52:06 -07:00
ea6f3eb6f9
CS-14253: Apply IP when firewall rule is in place
2012-08-17 16:52:06 -07:00
4cb7a100c6
Revert "bug 14484: Apply existed firewall rules when associating IP"
...
This reverts commit b409615a32
2012-08-17 16:52:06 -07:00
9059740dc1
HA worker thread needs to have its own worker thread configuration
2012-08-17 12:59:52 -07:00
f8bd05a1e3
Fixed regression in GuestNetworkGuru - get networkId from the network object passed to the method call instead of retrieving it from tne NicProfile when it wasn't set yet
2012-08-17 09:43:34 -07:00
691be5c60e
bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic
...
status CS-15577: resolved fixed
2012-08-17 17:07:13 +05:30
98ae204972
giving diff ip to VR
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-17 13:49:39 +05:30
48521e74e6
ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails.
...
Also, ELB feature using virtual router does not work and is deprecated currently.
2012-08-16 12:59:00 -07:00
ae5d22b4ab
bug CS-16036 ResourceManagerTest does not test what is says it tests
...
also fixes unit test failures
2012-08-16 12:11:41 -07:00
5b85edb961
bug CS-16034 getRandomIp can return -1 unexpectedly
...
also fixes unit test failures
2012-08-16 11:42:25 -07:00
335730dc65
CS-15999: added nics to domain router api response
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-16 10:50:09 -07:00
0bf6de3eb2
CS-16030: set UUID when persist public ip address
2012-08-16 10:13:39 -07:00
72f896044d
bug CS-15278: Download Volume fails in case of Multiple Secondary Storages. Correcting it to use the same secondary storage to copy the volume and creating the soft link
...
Reviewed-by: Kishan
2012-08-16 15:53:00 +05:30
7e093a949d
CS-15823 Failed snapshot should be marked as Error and cleanup asynchronously
2012-08-15 11:06:25 +08:00
fe3786341f
Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test
2012-08-14 13:47:04 -07:00
65c90227ae
bug CS-15648: For volumes created from snapshot, create usage event after successful volume
...
status CS-15648: resolved fixed
reviewed-by: Nitin
2012-08-14 11:58:07 +05:30
5060f98268
CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second
2012-08-13 17:45:38 -07:00
04bf1a33c6
apply patch https://reviews.apache.org/r/6572/
2012-08-13 17:28:41 -07:00
b3760350fe
VPC: CS-15805 - guest cidr should be RFC1918 complient
2012-08-13 17:17:06 -07:00
7120ce0717
Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)
2012-08-13 16:50:06 -07:00
62526a715a
Fixed unitest
2012-08-13 16:20:09 -07:00
4433c5a51a
Database upgrade from 302 to 40
2012-08-13 16:20:09 -07:00
71ead9ef4e
VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-13 14:03:39 -07:00
e74969fdec
VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-13 11:55:34 -07:00
ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
a50cf618ec
bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code.
2012-08-13 16:20:57 +05:30
42fbf24f86
Remove @author tag from non third-party source files in server folder
2012-08-13 15:17:31 +08:00
822cf3c9ee
VPC : typo in FirewallRuleVO
2012-08-12 10:55:21 -07:00
32f55f3e3c
Merge branch 'master' into vpc
2012-08-12 10:22:54 -07:00
ff773a8122
CS-15621: Using migrateVolumes method which does not perform input validation. Some input validation in the migrateVolume method prevented migration of volume in READY state. Also using volume disk offering to check if it is a local or shared one.
...
Verified on XS 6.0.2
Test scenario
- Created 2 shared primary storage pools
- Created data volume using shared disk offering
- Attached it to a running VM (created in one storage pool)
- Detached it (now it is in READY state)
- Created a new VM in stopped state (using deployVirtualMachine API with startVm=false)
- Attached the data volume to this new VM
- Started new VM (migrated volume scenario got hit when the planner assigned the other shared pool)
2012-08-12 17:05:28 +05:30
b61468d65c
Merge branch 'master' into vpc
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
d93c5d0531
VPC: CS-15950 - throw networkConflictException when try to create network rule for the ip address that is already in use for another service
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-10 16:37:33 -07:00
327b4833ce
S2S VPN: CS-15947: Add global config for S2S VPN VPN connection counts limitation
...
And subnets limitation for each customer gateway
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:24:35 -07:00
302c9048e8
S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:20:52 -07:00
830aec3562
S2S VPN: CS-15936: Prevent user from connecting to different customer gateway with overlapped subnets
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:20:52 -07:00
a4431b5740
S2S VPN: Use coma instead of semicolon for separating cidr list
2012-08-10 16:20:52 -07:00
263216caa5
Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).
...
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
2012-08-10 13:33:06 -07:00
ccac505944
Merge branch 'master' into vpc
2012-08-10 10:47:49 -07:00
5c349dd5e5
Fixed NetworkManagerImpl - tabs weren't replaced with spaces in some places
2012-08-10 10:45:38 -07:00
a74687128e
Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly
2012-08-10 16:50:47 +08:00
bd2a130251
fix unittest SecurityGroupManagerImpl2Test
2012-08-10 16:01:43 +08:00
6cddd1e767
Removed trailing whitespaces and fixed line endings in some files
2012-08-09 23:30:33 -07:00
3cf13c8b7c
Fixed unittest
...
Conflicts:
server/test/com/cloud/vpc/VpcApiUnitTest.java
2012-08-08 19:00:08 -07:00
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
a1f361904e
Reverted "Initialize user context from AccountManager" committed to master branch by mistake
...
This reverts commit da26302049
2012-08-08 15:26:45 -07:00
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
a5f99a2ca0
VPC: set event details in the method called by API
2012-08-08 11:52:46 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
da26302049
Initialize user context from AccountManager
...
Conflicts:
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-08 11:17:01 -07:00
a74c6e3104
fix CS-15814 Description of global configuration 'encode.api.response' is incorrect
2012-08-08 16:29:53 +08:00
2641b5d6b8
S2S VPN: Fix multiply remote side guest networks
2012-08-07 18:39:45 -07:00
c1c952b42b
should have used non url safe
2012-08-07 16:58:16 -07:00
5e0eb93fe6
S2S VPN: CS-15882: Only allow VPN connection between same account's gateways
2012-08-07 16:27:04 -07:00
a6a864a1a8
Removed Base64 file and use the apache version
2012-08-07 15:41:54 -07:00
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
d38e9eebed
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
a83c753354
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
2012-08-07 11:24:04 -07:00
cf64fda5d5
VPC: unittest preparation
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
972fe01aec
VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:21:53 -07:00
81ff7a09fd
CS-15875 resolved via patch from Andy Gross.
2012-08-07 14:10:11 -04:00
0a2b6436dd
bug CS-15859: put a check on volume limit
...
Author: Abhinandan Prateek <aprateek@apache.org>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-07 10:47:54 +05:30
6e7b4bc07b
S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-06 15:32:18 -07:00
a8cbba9e82
S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection
...
The owner would be always same as VPC owner.
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
setup/db/db/schema-304to305.sql
2012-08-06 15:21:54 -07:00
70d704c786
S2S VPN: Allow name to be modified in updateCustomerGateway
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-06 15:20:33 -07:00
1b5103c501
S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime
2012-08-06 15:19:26 -07:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
237d91d4c9
Removed @author tags in some classes
2012-08-03 14:25:17 -07:00
3496a73878
VPC: CS-15812 - fixed listVPCs by projectId
2012-08-03 14:23:56 -07:00
e7a1862867
VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
6eba8a818a
VPC: applyStaticRoutes - don't exclude static routes in Revoke state
2012-08-03 14:15:50 -07:00
78764c8b6e
License header updates for the server folder.
2012-08-03 09:41:27 -04:00
3c68f1f8e8
bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state
...
Reviewed-by: Kishan
2012-08-03 17:18:13 +05:30
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
befd6dd0c6
listVirtualMachines: implemented search by templateId/isoId
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/commands/ListVMsCmd.java
2012-08-02 18:15:13 -07:00
d6df2fdc64
VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend
...
Conflicts:
api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
api/src/com/cloud/api/response/AsyncJobResponse.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-02 18:12:19 -07:00
0588c9748c
VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
Alex Huang
Rohit Yadav
Kelven Yang
Min Chen
Prachi Damle
Chiradeep Vittal
Koushik Das
Kishan Kavala
Sheng Yang
Noa Resare
Wido den Hollander
Hugo Trippaers
John Burwell
Prasanna Santhanam
Isaac Chiang
Chip Childers
Marcus Sorensen
Hugo Trippaers
Edison Su
Simon Waterhouse
Vijayendra Bhamidipati
Murali Reddy
Alena Prokharchyk
Hiroaki Kawai
Edison Su
adefanti
Vijay Venkatachalam
Deepak Garg
Pranav Saxena
Laszlo Hornyak
Satoshi Kobayashi
Dave Cahill
Edison Xu
Joe Brockmeier
Jessica Wang
Kelven Yang
Mice Xia
Rohit Yadav
Anthony Xu
Marcus Sorensen
Manikanta Kattamuri
Saksham Srivastava
Fang Wang
Likitha Shetty
Gavin Lee
Darren Shepherd
Nitin Mehta
Jayapal
olivier lamy
Abhinandan Prateek
Darren Shepherd
Darren Shepherd
David Nalley
Mice Xia
tomoe@midokura.jp
Edison Su
Sheng Yang