Mice Xia
42fbf24f86
Remove @author tag from non third-party source files in server folder
2012-08-13 15:17:31 +08:00
Alena Prokharchyk
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
Alena Prokharchyk
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
Alex Huang
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
Alena Prokharchyk
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Alena Prokharchyk
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
Sheng Yang
d90be0d9bc
S2S VPN: CS-15748: Deleting customer vpn gateway when delete account
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-07-30 15:34:41 -07:00
Sheng Yang
fd9ef34a0f
CS-15719: Fix state change when stopping
2012-07-27 16:28:06 -07:00
bfederle
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
kishan
f2bbf62d9d
Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only.
2012-07-18 14:20:04 -07:00
Alena Prokharchyk
7c2b123d94
Merge branch 'master' into vpc
2012-07-16 15:43:16 -07:00
Alena Prokharchyk
7a5efcc2e8
CS-15579 - perform check when account/domainId is passed to list call by the regular user
2012-07-13 15:59:15 -07:00
Alena Prokharchyk
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
David Nalley
e87558256c
Patch from Chip Childers
...
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
Alena Prokharchyk
634cd78baa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
2012-06-28 17:41:40 -07:00
Alena Prokharchyk
b03265bc76
VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)
2012-06-28 10:18:14 -07:00
Alena Prokharchyk
5ecdad7399
VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC
...
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2012-06-28 10:17:34 -07:00
Alena Prokharchyk
66e14e2627
Applied patch https://reviews.apache.org/r/5522/diff/
2012-06-25 21:19:48 -07:00
saksham
f6d16d0ab5
CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention.
...
Reviewed-by: Alena Prokharchyk
2012-06-18 10:18:30 -07:00
Alena Prokharchyk
929997f54e
AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.
...
When the last rule is removed for vpc ip, networkId is set to null
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
api/src/com/cloud/api/commands/EnableStaticNatCmd.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/rules/RulesService.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:18:24 -07:00
Alena Prokharchyk
b9a4e79277
1) Added search by vpcId to listRouters/listNetworks Apis
...
2) Don't allow to add new networks/implement existing ones for VPC in Disabled state. Disabled state indicates that there was unsuccessful attempt to remove the VPC, and the further cleanup will be taken care of by cleanup thread.
Conflicts:
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-06-15 14:09:37 -07:00
Alena Prokharchyk
737543ce3e
CS-15025
...
listTemplates: made executable filters to work for regular user
2012-05-21 15:35:10 -07:00
David Nalley
59436be4ee
fixing line endings in server
2012-04-07 20:13:10 -04:00
Alena Prokharchyk
25e85e177e
bug 14589: don't accept empty username/firstname/lastname in update/createUser apis
2012-04-04 12:55:02 -07:00
frank
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
Alena Prokharchyk
96cdc408d4
bug 14103: mark account for cleanup only in cleanupAccount and disableAccount method, not in the callers methods
...
status 14103: resolved fixed
2012-03-05 16:19:12 -08:00
Alena Prokharchyk
fa0e25d146
bug 14080: do EQ instead of LIKE search when search for duplicated users during the user update
...
status 14080: resolved fixed
2012-03-01 15:11:46 -08:00
Alena Prokharchyk
6b9abf832b
bug 13944: when delete the account, expunge detached volumes on the backend
...
status 13944: resolved fixed
Reviewed-by: Frank Zhang
2012-02-22 17:59:22 -08:00
Alena Prokharchyk
2fb10fe9d7
bug 13700: delete projects as a part of domain cleanup
...
status 13700: resolved fixed
reviwed-by: Frank
2012-02-15 16:34:50 -08:00
Alena Prokharchyk
d55850526c
Don't change the domain state when the domain can't be removed (cleanup=false and there are resources referencing it)
...
Reviewed-by: Edison Su
2012-02-14 17:17:10 -08:00
Alena Prokharchyk
17349dfe12
bug 13695: deleteAccount - remove account from projects as a part of account cleanup process
...
status 13695: resolved fixed
Reviewed-by: Frank
2012-02-14 14:06:49 -08:00
Alena Prokharchyk
d5532d7de0
Update apikey/secretkey in transaction
2012-02-13 11:11:56 -08:00
Alena Prokharchyk
cad392cd68
bug 13335: fixed listProjectInvitations by projectId
...
status 13335: resolved fixed
2012-02-07 13:16:27 -08:00
Alena Prokharchyk
1490e45a1c
Fixed format style in a bunch of files (replaced tabs with spaces as a part of it)
2012-02-03 13:49:11 -08:00
Alena Prokharchyk
c09faa109d
bug 13296: release public ip addresses in the basic zone during the account cleanup
...
status 13296: resolved fixed
2012-01-25 11:26:37 -08:00
Alena Prokharchyk
88d3f1ba03
bug 13295: apply specific security check for the network
...
status 13295: resolved fixed
Reviewed-by: Will Chan
2012-01-25 10:57:24 -08:00
Nitin Mehta
f558aa07c5
Bug 12740: Allow root admins and system user to bypass the ACL layer.
...
Reviewed-By: Kishan
2012-01-25 12:29:04 +05:30
Alena Prokharchyk
83400cd15f
bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account
...
status 12776: resolved fixed
2012-01-17 13:40:37 -08:00
Alena Prokharchyk
bda032b874
bug 12760: generate vm.destroy event when vm goes from Stopped to Expuning state
...
status 12760: resolved fixed
2012-01-17 10:38:52 -08:00
Alena Prokharchyk
f0c4980dff
bug 13110: use Ternary data structure when build search criteria
...
status 13110: resolved fixed
2012-01-16 14:15:28 -08:00
Alena Prokharchyk
a5900368b6
bug 13023: fixed listAccounts to return all accounts the user is authorized to see
...
status 13023: resolved fixed
2012-01-16 11:45:02 -08:00
kishan
b589e49263
Bug 12929: Added domain_id to event table. Populate domain_id while persisting events. Cleanedup EventUtils.
...
Status 12929: resolved fixed
Reviewed-By: Nitin
2012-01-12 16:16:06 +05:30
Alena Prokharchyk
c581506103
bug 12306: list* command revamp
2012-01-09 10:07:42 -08:00
Abhinandan Prateek
4f9cbdaadb
bug 11303: passing the request params to the authenticators, callingh authenticators in a configurable chain
2012-01-02 14:55:26 +05:30
Alena Prokharchyk
8d27ecf4de
bug 12635: enable project account when activate the project
...
status 12635: resolved fixed
2011-12-19 12:23:41 -08:00
Alena Prokharchyk
a12c358842
bug 12624: don't allow to delete the account when he is the owner for project(s)
...
status 12624: resolved fixed
2011-12-19 12:02:29 -08:00
Alena Prokharchyk
4cb6fcc17a
bug 12591: fixed updateDomain
...
status 12591: resolved fixed
2011-12-16 11:54:47 -08:00
kishan
3503c37f68
updated license
2011-12-15 16:51:55 +05:30
kishan
c3ed426837
bug 12206: Added op_user_stats_log table to store historic user stats. Network stats update thread will update aggregate bytes and log the entry in this table. Mgmt server with min id will run this job.
...
status 12206: resolved fixed
reviewed-by: Nitin
2011-12-15 16:46:41 +05:30
Alena Prokharchyk
033afe05a9
listRouters: don't list Project routers when projectId is not specified in the call
2011-12-07 12:59:15 -08:00