abhishek
d1b4034633
Mvoing console proxy manager to server
2010-08-26 10:30:52 -07:00
abhishek
88d41090ca
Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
2010-08-26 10:17:36 -07:00
abhishek
3a2930e383
Adding another manager
2010-08-26 10:16:51 -07:00
kishan
fb99f95d7c
bug 5730: update dns of systemVms during zone update
2010-08-26 21:02:37 +05:30
kishan
acb23b6158
bug 5904,5474: added listCapabilities API
2010-08-26 14:53:03 +05:30
Kris McQueen
479ff26051
Refactoring createZone to new API framework. The logic was entirely delegated to configuration manager, so pushed the logic there and removed the proxy method from Management server.
2010-08-25 18:26:38 -07:00
Kris McQueen
34a3c3ece2
Refactored createVlanIpRange to new API framework. Moved logic to configuration manager, including the association of the ip addresses on a vlan with the account for which the vlan is being created. On deployVirtualMachine, this association might happen as well, and now mgmt server calls config manager.
2010-08-25 18:26:38 -07:00
Kris McQueen
c085283c2e
Refactor createUser to new API framework. Consolidate the old createUser (GWT UI used this API) and createUserAPI into one createUser method since it's only called through integration API now. Return a UserAccount instead of a User in order to generate a response with all the information required. Also clean up some of the unused private template code from ManagementServer that was mistakenly left in from a previous refactor.
2010-08-25 18:26:38 -07:00
Kris McQueen
defae59126
Finish refactoring createTemplate to new API framework. The executor and result object from old framework still need to be deleted, but this commit moves all the business logic to the manager with validation in the createPrivateTemplateRecord and creating a snapshot if necessary in createPrivateTemplate. Additionally, added a find method on the template dao to check if the template name is in use for the account (this is part of the validation).
2010-08-25 18:26:38 -07:00
Kris McQueen
97f3068687
Work in progress refactoring createTemplate command to new API. The logic had been partially moved to the manager, still need to finish up moving the logic, then delete the unnecessary code.
2010-08-25 18:26:38 -07:00
will
f8c93cd5fa
Bug #:5975
...
Merge from 2.1.x
- Fixed issue where listAccounts only return one less than the actual number of accounts in the system. That is because the SQL query asks for X accounts, but the API filters out the SYSTEM account. The fix is to add the filter of the system account in the actual query itself rather than have the code do it.
Conflicts:
server/src/com/cloud/api/commands/ListAccountsCmd.java
2010-08-25 18:21:32 -07:00
Kelven Yang
23a38bc2be
Debug & Test template copy from secondary storage to primary stroage on vmware
2010-08-25 18:17:20 -07:00
abhishek
cf68dfb430
Refactored detach iso command
2010-08-25 15:33:06 -07:00
edison
3ab4651cf0
Issue #: 5978 5977 5971 5972
...
Status 5978: resolved fixed
Status 5977: resolved fixed
Status 5971: resolved fixed
Status 5972: resolved fixed
2010-08-25 15:27:34 -07:00
abhishek
37f6e794d9
Used the wrong base cmd
2010-08-25 14:54:38 -07:00
abhishek
74a8dc0aa8
Incremental checkin
2010-08-25 14:20:08 -07:00
abhishek
d8219225ea
Import cleanup
2010-08-25 13:54:31 -07:00
abhishek
82fbae2553
Refactoring the detach volume command
2010-08-25 13:53:43 -07:00
abhishek
46f69a604b
some more refactoring
2010-08-25 11:43:49 -07:00
abhishek
702658556b
Refactoring the delete zone cmd
2010-08-25 11:16:07 -07:00
Kelven Yang
0682d70ce6
add correct check sum to default vmware template records
...
Let StoragePoolMonitor be aware of vmware hypervisor
2010-08-25 11:07:27 -07:00
abhishek
c2f517fa81
Refactoring the delete vlan ip range cmd
2010-08-25 10:59:14 -07:00
Kelven Yang
0a401f7b91
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-25 09:40:57 -07:00
nit
6ae72df46a
bug 5905: Adding deviceId tag to the ListVolumes command when the volume is attached. status 5905: closed fixed
2010-08-25 11:44:54 +05:30
Kelven Yang
45cb68e7e2
add templates.vmware.sql
...
modify build to deploy vmware database records
2010-08-24 22:58:05 -07:00
Kelven Yang
49900a8985
1) Add VMDK format
...
2) Make console proxy servlet explictly return content-type header for console proxy page (this is a bug fix change)
2010-08-24 18:58:38 -07:00
jessica
895fb85162
check in for Alex.
2010-08-24 15:48:40 -07:00
Alex Huang
415bc8ae20
bug 5764: checkin before I switch to work on 2.1.x
2010-08-24 14:40:29 -07:00
Alex Huang
fb389e8cd6
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-24 00:01:09 -07:00
Alex Huang
20b26082db
bug 5764: changing from networkoffering to network profile
2010-08-24 00:00:43 -07:00
Anthony Xu
55e425361d
Merge branch 'lmaster'
2010-08-23 18:13:33 -07:00
Anthony Xu
0366dd093c
use slaveconnection instead of masterconnection for all host plugin calls.
...
tested by creating domr and user vm and migrating them
1. if you add host for kvm , you need specify kvm://ip_address, otherwiset there is no to differ kvm and xenserver hosts, edison cloud you please test this, may need some minor fixes.
2. if you want to session inside your plugin call, you can not use the one which is passed in, due to it is a slavesession, you need to call get_xapi_session() to get a new local session and use it. I have modified some of these, I may ignore some. Please let me know if you see XENAPI_PLUGIN_EXCEPTION.
2010-08-23 18:01:39 -07:00
abhishek
5a8313cc51
Detach volume command refactor incremental checkin
2010-08-23 17:41:22 -07:00
abhishek
7f771cbe24
bug 5883: Final checkin for volume lineage
...
status 5853: RESOLVED FIXED
2010-08-23 16:17:18 -07:00
abhishek
7454f0f24a
Incremental checkin for volume lineage
2010-08-23 16:02:45 -07:00
Alex Huang
e91617bc6f
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-23 15:10:15 -07:00
Alex Huang
bb06bc3d57
fixed merge conflict
2010-08-23 15:10:08 -07:00
abhishek
27b038efcb
Correcting hypervisor type enum
2010-08-23 14:07:35 -07:00
Alex Huang
e0165dd2ef
my changes
2010-08-23 13:59:23 -07:00
root
d2ffa6b68d
bug 5781: also reduce the scope of the global lock when updating storage capacity.
2010-08-23 13:41:22 -07:00
Kris McQueen
adce18b2c0
[merge from 2.1.x] Bug 5781: Only grab capacity global lock when accessing capacity tables. Once the queries are done, release the lock so that others can query for the data or update the data as needed.
2010-08-23 13:41:03 -07:00
Kelven Yang
f98e272d48
Remove an incorrect usage of @inject, it caused management server from being loaded
2010-08-23 12:25:47 -07:00
Kelven Yang
08ae56d360
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
...
Conflicts:
api/src/com/cloud/hypervisor/Hypervisor.java
build/build-cloud.xml
2010-08-23 12:12:45 -07:00
kishan
89cd3131bf
add zone id for create template event
2010-08-23 17:19:31 +05:30
Kelven Yang
7bcff5acf3
Vmware incremental check-in
2010-08-20 18:50:33 -07:00
Jessica Wang
65b9f29941
Issue #: 5975
...
(1) API-side: make listDomains, ListDomainChildren return all items
(2) UI-side: make domains page show all domains by specifying pageSize=-1
2010-08-20 17:39:40 -07:00
abhishek
ec9fdd5b16
Refactored disassociateipaddress cmd
2010-08-20 16:01:37 -07:00
abhishek
5503013e1f
Refactoring the lockAccount cmd
2010-08-20 14:48:35 -07:00
abhishek
58598bb0cb
Refactoring the lockUser cmd
2010-08-20 14:20:27 -07:00
abhishek
934173db2e
Refactoring some more system vm commands
2010-08-20 12:19:37 -07:00