Harikrishna Patnala
40e7502bcb
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:21:23 +05:30
Harikrishna Patnala
3813189283
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:16:44 +05:30
Wei Zhou
023aac8bd1
CLOUDSTACK-3438: update CPVM SSL certificate for both Premium and non-Premium cases
2013-07-10 12:23: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