Darren Shepherd
efbfae723e
Switch to setter injection for extensibility
...
Various classes are using member injection to inject extensible objects.
Really those object should come from an AdapterList that is injected in.
This patch switches the code to use setter injection that will later allow
spring to inject an AdapterList or something similar to allow
extensibility.
2013-09-30 09:45:07 -07:00
Alex Huang
b60eef3e82
Added comments and finished off the work
2013-09-28 07:53:28 -07:00
Alex Huang
e8cac2c5d8
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
2013-09-28 07:53:26 -07:00
Alex Huang
e2988902c9
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
2013-09-28 07:53:25 -07:00
Alex Huang
af8832f6bd
Unified both the SearchBuilder and SearchCriteriaService
2013-09-28 07:53:24 -07:00
Alex Huang
a05ec6df33
Fixed up the agent separation. Added comments for config packaging.
2013-09-06 15:40:39 -07:00
Alex Huang
8f556e6d88
Made changes to configuration. Eliminated ConfigValue and only use ConfigKey
2013-09-06 15:40:38 -07:00
Alex Huang
8e5249df62
Moved NetworkManager to NetworkOrchestrationService
2013-09-06 15:40:31 -07:00
Alex Huang
494ea5052f
Made IpAddressManager a manager
2013-08-19 14:13:31 -07:00
Alex Huang
4ba359c3fe
Moved VirtualMachineManager into engine
2013-08-19 14:13:28 -07:00
Min Chen
c675f826e5
CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied
...
to Staging storage during snapshot creation.
2013-08-14 18:12:53 -07:00
Harikrishna Patnala
2868d4b336
CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm; Zone host is ready, but secondary storage vm template: 3 is not ready on secondary storage: 2
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-11 20:34:39 +05:30
Harikrishna Patnala
5404bf6063
CLOUDSTACK-4123: 3.0.6 to ASF 4.2 Upgrade: On Adding VMWare Cluster to the Setup, 3.0.6 System VM Template for VMWare is downloaded instead of 4.2
...
Updating the new system template URLs for the existing templates during upgrade to 4.2.
If new 4.2 system template is registered before upgrade then marking the old templates as removed during upgrade.
2013-08-10 18:02:49 +05:30
Alex Huang
5495f10bce
Revert "Reverting the range of commits that broke the build"
...
This reverts commit b59e3aaefc .
2013-08-08 15:02:40 -07:00
Prasanna Santhanam
b59e3aaefc
Reverting the range of commits that broke the build
...
This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang
5287f4c9ec
Got everything running through testing
2013-08-07 16:41:06 -07:00
Alex Huang
942f282a6e
Moved config into it's own package
2013-08-07 16:41:02 -07:00
Harikrishna Patnala
506f2a4b94
CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm CLOUDSTACK-3631: Enhance System vm deployment retry mechanism
...
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-08-05 18:19:16 +05:30
Harikrishna Patnala
f12adfff8a
CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU based on the presence of tools in the template
...
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-08-01 12:20:48 +05:30
Alex Huang
a4cea4ebf2
Removed schema from the dependency of many components
2013-07-29 10:55:19 -07:00
Alex Huang
111febc567
Fixed up the rest of the management server code that calls clustermanager
2013-07-25 19:57:45 -07:00
Alex Huang
395cbcc023
Move the rest of the generics out of virtualmachinemanager
2013-07-25 19:00:25 -07:00
Alex Huang
9bc5870f01
Removed the remove method. Not sure why we added to VirtualMachineManager
2013-07-23 18:24:58 -07:00
Alex Huang
5297a071d2
Changed virtual machine stop to use uuid
2013-07-22 20:06:04 -07:00
Alex Huang
6ac361e6a2
Removed VM generic from VirtualMachineGuru. Part of the cleanup to make vmsync a simple vm manager that doesn't understand the different types of vms
2013-07-22 16:32:59 -07:00
Alex Huang
1325014a03
Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms.
2013-07-22 11:48:11 -07:00
Alex Huang
7928963d16
Changed start to use uuid instead of generic vm start
2013-07-22 11:46:33 -07:00
ahuang
541f9d7f9c
Changed allocate method to be virtual machine type agnostic
2013-07-17 15:58:46 -07:00
ahuang
11e1e585b1
UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch
2013-07-16 11:24:21 -07:00
ahuang
17984a3f8c
Removed the plug and unplug method from VMGuru. Why should VMGuru understand how to plug and unplug nics? Part of componentizing the vmsync work
2013-07-15 11:00:58 -07:00
Wei Zhou
d65f47c76a
CLOUDSTACK-3438: update CPVM SSL certificate for both Premium and non-Premium cases
2013-07-10 12:20:57 +02:00
Min Chen
18aeef3ef1
Merge branch 'master' (up to commit
...
c30d9be3ce ) into object_store.
2013-06-12 11:20:32 -07:00
Anthony Xu
19a1116df2
Merge branch '4-2-advanced-zone-security-group'
2013-05-28 11:03:56 -07:00
Edison Su
f7c1b711ad
merge to master
2013-05-16 23:56:20 -07:00
Mice Xia
6d57393629
instead of using '==', use equals() to test Long value equality
2013-05-16 16:00:02 +08:00
anthony
b32d7c026c
CLOUDSTACK-737,
...
allow to add security group enabled networks in security group enabled zone
2013-05-15 14:53:48 -07:00
Nitin Mehta
c11dbad9c9
merge master
2013-05-11 15:28:43 +05:30
Alex Huang
3047929367
Merged
2013-05-10 16:21:43 -07:00
Alex Huang
572e71e57d
Moved most of the VOs and DAOs from server package into engine-schema as well
2013-05-06 16:34:26 -07:00
Min Chen
7543f314a7
Remove more VMTemplateHostDao references.
2013-04-23 17:12:21 -07:00
Edison Su
abf40435f3
refactor downloadlistener, sync system vm templates when adding a new image store
2013-04-21 22:46:02 -07:00
Kelven Yang
34f8f795e1
CLOUDSTACK-2039: Improve console access security with 128-bit AES encryption and securely-randomized key generation
2013-04-15 16:52:22 -07:00
Chiradeep Vittal
7b4e1953d8
QuickCloud: accidental commit, removing
2013-04-12 12:08:13 -07:00
Chiradeep Vittal
2e6c65fd34
QuickCloud: sanitize logs for normal running of agents outside systemvm
2013-04-09 14:45:27 -07:00
Chiradeep Vittal
271d232d62
QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package
...
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
2013-04-09 14:45:27 -07:00
Chiradeep Vittal
3d78019e57
QuickCloud: copy authorization code from ConsoleProxyManagerImpl
...
QuickCloud: refactor to avoid copy paste of authentication and startup code
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
790d2ce82e
QuickCloud: Remove reference to unused code
...
QuickCloud: remove some dead code in ConsoleProxyManager
2013-04-09 14:45:26 -07:00
Brian Spindler
469c4dd139
Removing ^M's from code.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-04 00:53:20 +05:30
Phong Nguyen
aa79ccf985
CLOUDSTACK-922: LXC Support in Cloudstack.
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-04-01 15:41:42 -07:00
Edison Su
409ec9c6b6
CLOUDSTACK-1426: We has strong implication that VO must implement an interface, otherwise EntityManagerImpl can't the vo
2013-03-07 18:25:57 -08:00
Edison Su
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
Kelven Yang
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
Prachi Damle
aa7b3e0f6d
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
...
Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -08:00
Edison Su
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
Kelven Yang
2c5859dbd4
Bring javelin back to the status of being able to start System VMs after another round of master branch merge
2013-01-18 19:15:32 -08:00
Alex Huang
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
Kelven Yang
17a94b20ec
Always use premium setting in ConsoleProxyManager
2013-01-17 18:23:06 -08:00
Chiradeep Vittal
cadca5fc0c
Merge branch 'master' into network-refactor-merge2
...
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-01-16 19:17:14 -08:00
Kelven Yang
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -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
Chiradeep Vittal
504264236c
Network-refactor: In preparation for moving the read-only interface NetworkModel
...
to the api project, ensure that all methods use interfaces from the api project.
By moving it to the api project, it lessens the dependency of plugins on the server components.
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
Chiradeep Vittal
5a830c4db0
Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager.
...
NetworkManager's exclusive focus is now
- handling plugins during orchestration, and
- to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -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
David Nalley
59436be4ee
fixing line endings in server
2012-04-07 20:13:10 -04: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