apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,432 Commits 304 Branches 324 Tags
Commit Graph

229 Commits

Author SHA1 Message Date
Kelven Yang
17a94b20ec Always use premium setting in ConsoleProxyManager 2013-01-17 18:23:06 -08:00
Rohit Yadav
38eaa04b98 Pull changes from master into javelin 
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts

Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:02:54 -08:00
Rohit Yadav
83e7214b02 ConsoleProxyManagerImpl: Get rid of IdentityDao 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Alex Huang
56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang
0bcb64605f all built with the latest 2013-01-09 05:02:39 -08:00
Kelven Yang
b274c570f9 Cleanup places that use explicit wiring of the components 2013-01-08 17:45:33 -08:00
Alex Huang
30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Kelven Yang
e2078ec6e4 Solve Spring loading issues with a few Dao and Manager components 2013-01-02 13:55:26 -08:00
Rohit Yadav
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
Kelven Yang
d79f1f6fdc Replace Adapters and PluggableServices, use Spring to load them 2012-11-07 15:03:24 -08:00
Kelven Yang
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
Kelven Yang
aab02e2743 Add Spring annotation to major components 2012-11-07 14:53:39 -08:00
Mice Xia
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
Mice Xia
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
Mice Xia
7e75140537 CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start 2012-09-26 14:05:37 +08:00
Edison Su
a01304e65b CLOUDSTACK-123: fix NPE 2012-09-18 16:43:05 -07:00
Edison Su
481aae1ebc add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
Alena Prokharchyk
a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 2012-07-27 13:47:46 -07:00
kishan
468f2720eb bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:13:18 +05:30
Alena Prokharchyk
a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 2012-07-13 13:52:58 -07:00
Edison Su
8b7b838c8a CS-15544: recreate router if router filesystem is crashed 2012-07-11 16:14:28 -07:00
Alena Prokharchyk
353423acec Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-06 12:04:10 -07:00
Edison Su
27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -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
1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Edison Su
5f6387e113 add clouddev 2012-06-27 23:28:34 -07:00
Alena Prokharchyk
d9fd7e02a5 Plug nic support 
Conflicts:

	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
 2012-06-15 14:07:46 -07:00
Murali reddy
a4b0759c52 bug CS-14862: EIP/ELB - SSVM and CPVM should be given an ip address from the public ip address range. 
With this fix  both SSVM and CPVM will get public IP's in case of basic zone with EIP service.
A static NAT rule is implicitly configured on the EIP service provider to map public IP to a
guest IP address associated with SSVM/CPVM
 2012-05-21 20:18:37 +05:30
Kelven Yang
e8a5d51da7 Support console access through rebooting with XAPI session re-negotiation 2012-05-16 17:02:22 -07:00
Edison Su
9fa63cfe61 CS-14609 
turn on debug log, if zone is not ready to start ssvm/cpvm.
"Zone host is ready, but console proxy template" means system vm template is not in "Downloaded" state on secondary storage
"Primary storage is not ready" means the template is not been downloaded to primary storage, possible reasons: haven't add primary storage, or primary storage download is not finished/failed.
 2012-05-15 14:44:48 -07:00
Kelven Yang
c5083787c2 Hardening console proxy AJAX protocol to address security concerns 2012-04-19 12:10:33 -07:00
Alena Prokharchyk
b14bac0977 bug 14539: 1) introduced 2 new config parameters defining default offerings for ssvm and cpvm - consoleproxy.service.offering and secstorage.service.offering 
2) Added new api - changeServiceForSystemVm - to support service offering upgrade for system vms
3) Removed global config parameters that are not in use anymore: consoleproxy.ram.size, consoleproxy.cpu.mhz, secstorage.vm.ram.size, secstorage.vm.cpu.mhz
 2012-04-03 10:52:32 -07:00
frank
2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk
29c61e6341 bug 14369: remove host entry when destroy CPVM/SSVM instances 
status 14369: resolved fixed
 2012-03-20 14:10:18 -07:00
Alena Prokharchyk
fec3a87d09 bug 14388: don't return console proxy / ssvm service offerings 
status 14388: resolved fixed
 2012-03-19 14:50:09 -07:00
Kelven Yang
a72d419f8c bug 13679: cosmetic fix to remove NPE warning message from log. Reviewed-By: anthony 2012-02-14 12:08:50 -08:00
Edison Su
1ab89dd436 add cert chain in db, and also open the api to upload a cert chain 2012-02-09 14:56:40 -08:00
frank
890bfffe2f Bug 6849 - Randomize systemvm passwords (edit) 
status 6849: resolved fixed
 2012-02-03 17:28:58 -08:00
Kelven Yang
8060918805 bug 13428: upgrade newly issued realhostip certificate. Reviewed by: Anthony 2012-02-02 11:49:20 -08:00
anthony
3615b15c39 bug 13338: 
increate timeout for sshcheck to 10 minutes
if sshcheck fails, finalizeCommandsOnStart fails, no exception

status 13338: resolved fixed
 2012-01-26 12:22:24 -08:00
Edison Su
9bcb2affff bug 12139: add a way to specifiy which hypervisor used to start system vm: 
Admin can either configure system.vm.default.hypervisor which is a global configuration for all zones, or call updatezone add defaultSystemVMHypervisorType
status 12139: resolved fixed
 2012-01-10 15:11:50 -08:00
Kelven Yang
85ad8ffca3 rename com.cloud.identity package to com.cloud.uuididentity as a previous deleted com.cloud.Identity name make git confused with com.cloud.identity under linux systems 2012-01-05 14:52:16 -08:00
kishan
a2ed3fa5e2 bug 12337: encrypt Hidden category config values only 
reviewed-by: Abhi
 2011-12-20 15:07:22 +05:30
Alena Prokharchyk
bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
Alena Prokharchyk
87f5150e38 Basic zone is fixed and works with new NaaS now 2011-11-14 10:46:05 -08:00
Alena Prokharchyk
039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account - 
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
 2011-11-10 18:34:56 -08:00
Alex Huang
f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Kelven Yang
d9c41df1a1 Make console proxy support UUID 2011-11-03 16:24:08 -07:00
alena
3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -07:00