5509 Commits

Author SHA1 Message Date
will
a3acbf60f1 bug 9395: Added missing </div> that caused Safari to not show certain elements when adding a Pod in the Add Zone wizard.
Merge from 2.2.4
2011-04-11 19:23:28 -07:00
alena
0da82b4062 bug 9353: API doc update for updateTemplatePermissions and createTemplate calls
status 9353: resolved fixed
2011-04-11 19:15:09 -07:00
alena
d1a9200f4e bug 9378: db upgrade - update guest_os_id in vm_instance table for system vms.
status 9378: resolved fixed
2011-04-11 18:19:30 -07:00
alena
acaab55c3e bug 9391: removed source_id, source_type from "volumes" table as we don't use them any more
status 9391: resolved fixed

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2011-04-11 18:19:10 -07:00
alena
52bf157387 bug 9398: removed resource_type from volumes table as we no longer use it. Corresponding db upgrade scripts are updated
status 9398: resolved fixed

Conflicts:

	server/src/com/cloud/storage/StorageManagerImpl.java
2011-04-11 18:14:35 -07:00
alena
70151389d1 bug 9396: removed status field from volumes table as this field is no longer used
status 9396: resolved fixed
2011-04-11 18:12:04 -07:00
alena
0f2112ff26 bug 9373: db upgrade - added missing constraints for user_ip_address table
status 9373: resolved fixed
2011-04-11 18:11:52 -07:00
alena
28029b20c1 bug 9374: removed guest_ip/mac/netmask info from user_vm table. This information is kept in nics table in 2.2.x
status 9374: resolved fixed
2011-04-11 18:11:36 -07:00
alena
aea0a7326a bug 9376: added missing constraints to vm_instance table
status 9376: resolved fixed
2011-04-11 18:11:24 -07:00
alena
f6b8f23751 bug 9381: set accountId=domainId=1 for system vms in vm_instance table
status 9381: resolved fixed
2011-04-11 18:10:54 -07:00
alena
bb2d907d47 bug 9380: db upgrade - use the same case for 'hypervisor_type' in 'vm_instance' table
status 9380: resolved fixed
2011-04-11 18:10:42 -07:00
alena
407bd2ac16 bug 9348: added missing ALTER statement to 222-224 db upgrade script
status 9348: resolved fixed
2011-04-11 18:10:30 -07:00
Kelven Yang
03afe54084 Regression fixes for adding openNew() to Transaction.java 2011-04-11 17:44:31 -07:00
Kelven Yang
149eb0fade Use seperate DB connection to handle cluster management 2011-04-11 16:37:58 -07:00
anthony
ac223c197f bug 9392: don't lock domr entry, otherwise updating domr state fails
status 9392: resolved fixed
2011-04-11 16:06:12 -07:00
Chiradeep Vittal
63ada2ef7e bug 9330: ensure that existing system vms are updated to new xenserver template 2011-04-11 15:47:02 -07:00
Chiradeep Vittal
c14be6915f bug 9330: add kvm / vmware builtin template definitions 2011-04-11 15:46:48 -07:00
Chiradeep Vittal
ae9180d33b bug 9330: add kvm / vmware system vm template definitions 2011-04-11 15:46:37 -07:00
Frank
65dda266f5 Bug 8208 - bare metal provisioning
user lower case for tftp boot file
2011-04-11 14:58:09 -07:00
Frank
5645137f9c reslove conflicts api/src/com/cloud/api/ApiConstants.java 2011-04-11 14:26:48 -07:00
Frank
105db3b15a Merge branch 'baremetal' to master
modifies:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/AddHostCmd.java
	api/src/com/cloud/api/commands/CreatePodCmd.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	api/src/com/cloud/dc/Pod.java
	api/src/com/cloud/network/NetworkService.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/dc/HostPodVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	setup/db/create-schema.sql
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-04-11 14:21:41 -07:00
prachi
c3d2bab81b Some more changes for Bug 8932 - add md5 sum to list templates call:
Also changed 'RegisterTemplate' to take in a new optional parameter 'checksum'.
The value set to it is stored as-is in the DB in vm_template table, 'checksum' column.
2011-04-11 13:17:23 -07:00
Frank
0810831fd2 Bug 8208 - bare metal provisioning
set useexternalDHCP to false when creating pod
2011-04-11 10:41:45 -07:00
Nikita
977101ba48 Custom 3 folder removed 2011-04-11 10:32:52 -07:00
alena
4460d1cf2c Fixed api xml doc writer 2011-04-11 09:33:36 -07:00
nit
debe236a8d bug 8710: CONTD....Introducing a new user role in cloudstack called RESOURCE_DOMAIN_ADMIN. The role would have all the domain_admin rights and the rights to list zone,pods,clusters and so on. More info in the bug 2011-04-11 19:40:37 +05:30
kishan
782a22d95f Usage upgrade changes 2011-04-11 18:49:52 +05:30
Murali Reddy
290c799b2c Bug 9273 : [Stress Test] 'Count' in resource_count table has negative values
pushing 2.2.4 changes in to master
2011-04-11 15:37:53 +05:30
Murali Reddy
8b30507841 bug 9312: deleteAccount API does not decrement User VM resource count when VM is destroyed
pushing 2.2.4 changes to master branch
2011-04-11 14:35:06 +05:30
David Nalley
6c6d8d2d82 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-04-09 00:13:47 -04:00
Nikita
dc48165092 Custom 3 has been added 2011-04-08 20:16:22 -07:00
prachi
77ac511225 Bug 8932 - add md5 sum to list templates call
Modified TemplateResponse to contain a new field 'checksum' of the template. The value is pulled from the vm_template table, 'checksum' column.
2011-04-08 15:01:12 -07:00
prachi
b0b2d594a0 Bug 8018 - return cloud identifier in some instance metadata
There's an API call "getCloudIdentifier".  it returns some UUID that uniquely identifies a cloud.

This bug is to set the value of the instace metadata field cloud-identifier to "CloudStack-{result of getCloudIdentifier}.  This metadata is programmed into
the virtual router by the management server.
2011-04-08 10:50:12 -07:00
Murali Reddy
598503f094 bug 9129:can't create vm if an instance limit is set at root domain
pushing 2.2.4 fixes
2011-04-08 13:25:51 +05:30
David Nalley
2a00f8f950 adding paths to a few commands for bug 9319 2011-04-07 16:50:39 -04:00
Frank
a748ddf35d Bug 9302
Resolved Fixed
2011-04-05 21:55:27 -07:00
Frank
cfa40b6d73 Bug 9218 - service cloud-management restart OR stop FAILED (edit)
Resloved Fixed
2011-04-05 20:42:17 -07:00
Alex Huang
1bc498013e bug 9344: fixed problems with the template table 2011-04-05 18:33:38 -07:00
Kelven Yang
6143737ef6 2.2.4 to 2.2.5 upgrade sql for system vm pooling 2011-04-05 18:11:56 -07:00
Kelven Yang
5bf6df3d6c bug 9328: always add explict route to domR 2011-04-05 17:21:24 -07:00
alena
aa094868fc bug 8353: set dateFormat to "yyyy-MM-dd'T'HH:mm:ssZ" when initiate gson builder
status 8353: resolved fixed
2011-04-05 16:51:05 -07:00
prachi
191d689912 Bug 9045: No 'Starting job for VM.MIGRATE' & 'Successfully completed VM.MIGRATE' events shown for VM manual migration
Changes:
- Added the required 'ActionEvent' annotation to the API, so that the events get added.
2011-04-05 16:28:01 -07:00
keshav
8c344cb567 Changed insert to insert ignore. 2011-04-05 16:24:55 -07:00
Alex Huang
3d0c4ae937 get unittest to work temporarily 2011-04-05 15:53:33 -07:00
anthony
2bcd7a13d4 hostid and poolid may overlap, fixed deletePoolStats 2011-04-05 15:43:21 -07:00
anthony
415b973b92 fixed db upgrade 2011-04-05 15:09:05 -07:00
alena
0fdcba3f4f bug 8855: introduced search by zoneId to listLoadBalancerRules api. Also added "zoneId" parameter to the response
status 8855: resolved fixed
2011-04-05 14:38:47 -07:00
prachi
92c0b3b82f Bug 9309 - In Manual migration, do not consider 'reserved_capacity' when computing available memory in destination
Changes:
- Now while listing hosts for migration, capacity is calculated as total_capacity -used_capacity
 instead of total_capacity -(used_capacity + reserved_capacity)
- Also, the capacity columns in op_host_capacity are now 'signed' type so that the subtractions in queries does not overflow.
- Added this to DB upgrade 222 to 224 change as well.
2011-04-05 14:06:32 -07:00
alena
e0c4bb47d9 bug 9234: system network offerings are HA enabled
status 9234: resolved fixed

Conflicts:

	setup/db/db/schema-222to224.sql
2011-04-05 13:44:44 -07:00
anthony
8d954931ea Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-04-05 12:11:02 -07:00