Commit Graph

492 Commits

Author SHA1 Message Date
anthony 288a36d09f Merge branch '2.2.4'
Conflicts:
	api/src/com/cloud/configuration/ConfigurationService.java
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-21to22.sql
	setup/db/db/schema-222to224.sql
	utils/src/com/cloud/utils/exception/ExceptionUtil.java
2011-04-05 12:04:09 -07:00
Alex Huang 8ebe8db39a bug 9326: put unique back into create-schema.sql 2011-04-05 12:01:30 -07:00
Alex Huang c9d4e50b96 bug 9323: guid doesn't have to be NOT NULL 2011-04-05 11:23:31 -07:00
alena dd162339dc bug 9325: DB upgrade - added missing constraints to ssh_keypair table
status 9325: resolved fixed
2011-04-05 11:22:12 -07:00
alena 914952cd86 bug 9325: DB upgrade - added missing constraints to ssh_keypair table
status 9325: resolved fixed
2011-04-05 11:18:46 -07:00
Alex Huang 3f8dc115ec bug 9323: dropped the snapshots_seq 2011-04-05 11:09:39 -07:00
Alex Huang 2230c24ab3 check in changes from 2.2.4 2011-04-05 11:01:35 -07:00
Alex Huang e4cffa7928 removed the DEFAULT 0 2011-04-05 10:16:56 -07:00
Alex Huang 04099a4950 bug 9311: changed instance_id to nic_id 2011-04-05 09:12:55 -07:00
keshav cf2336910f Removed guest network and management cidr config values from upgrade. 2011-04-04 20:00:44 -07:00
Alex Huang b2cab48e0c bug 9308: changed instance_id to nic_id 2011-04-04 16:59:16 -07:00
Alex Huang 10e2dba837 bug 9301: added missing constraint 2011-04-04 15:30:39 -07:00
keshav bf3c2b73e1 Removed some configuration table inserts. 2011-04-04 15:13:53 -07:00
keshav 45aebbe416 Removed some configuration table inserts. 2011-04-04 15:12:17 -07:00
alena 814804df5b bug 9298: vm_type can be NULL in "nics" table (for placeholder nics)
status 9298: resolved fixed
2011-04-04 14:47:21 -07:00
alena 35c829f33b bug 9293: 21 to 22 db upgrade - added missing constraints to load_balancer_vm_map
status 9293: resolved fixed

Conflicts:

	setup/db/db/schema-21to22-cleanup.sql
	setup/db/db/schema-21to22.sql
2011-04-04 14:47:21 -07:00
keshav 68d1cbcfbc Added configuration table modifications to upgrade sql. 2011-04-04 14:27:04 -07:00
keshav e3c4351b13 Added configuration table modifications to upgrade sql. 2011-04-04 14:20:31 -07:00
alena 6af0a1e9be bug 9298: vm_type can be NULL in "nics" table (for placeholder nics)
status 9298: resolved fixed
2011-04-04 14:20:17 -07:00
alena aba5395f96 bug 9293: 21 to 22 db upgrade - added missing constraints to load_balancer_vm_map
status 9293: resolved fixed
2011-04-04 14:06:57 -07:00
Alex Huang e8720cc1f7 bug 9300: changed the network id to management from storage for ssvm 2011-04-04 13:53:51 -07:00
Edison Su 1545df1e1e bug 9291: set name = display_name
status 9291: resolved fixed
2011-04-04 11:41:11 -04:00
Kelven Yang 2759eefcf5 Add weight to command to help future load management, fix issues found in system vm pooling 2011-04-04 09:33:42 -07:00
Edison Su 040c18613f bug 9291: set name = display_name
status 9291: resolved fixed
2011-04-04 11:39:54 -04:00
Alex Huang 1eba5ea7a7 unittest failures fixed 2011-04-04 10:32:15 -07:00
Alex Huang f8b8da1fa1 bug 9277: added table data_center_details 2011-04-04 10:07:35 -07:00
Alex Huang 01a0f75491 bug 9286: added constraint for domain id in data_center 2011-04-04 10:04:28 -07:00
Alex Huang a93ebd21d2 bug 9281: fixed account_id can be null in db 2011-04-04 09:53:36 -07:00
Alex Huang 2dc5616766 bug 9287: change the names of the system service offerings 2011-04-04 09:39:08 -07:00
Alex Huang 380c275d54 bug 9290: fixed default to be 0
bug 9289: dropped domain column
2011-04-04 09:26:42 -07:00
Edison Su aa4d678ed2 fix db upgrade error 2011-04-01 17:01:53 -04:00
Edison Su 59f622a2d9 fix db upgrade from 2.1.x to 2.2.1 2011-04-01 17:01:53 -04:00
Alex Huang 7ce3e22d36 bug 9259: added upgrade test suite 2011-04-01 17:01:53 -04:00
Alex Huang 611926bd90 bug 9259: added edison's changes as well 2011-04-01 17:01:53 -04:00
Alex Huang af39fc5da0 bug 9259: removed some of the extra vpn statements duplicated from my change and chiradeep's change 2011-04-01 17:01:52 -04:00
Alex Huang 28da2ffb0e bug 9259: why should destroyed be NULL to begin with. fix upgrade 2011-04-01 17:01:52 -04:00
alena b876ad2530 224 to 225 upgrade - use schema*.sql instead of data*.sql 2011-04-01 16:25:56 -07:00
alena bf588166ed bug 7704: network limits cleanup.
status 7704: resolved fixed

For user vm:
* for default network, take limit from the corresponding service offering
* for all additional networks, take limit from the network offerings

For domainRouter/SSVM/CPVM:
* get info from the network offering

Added new config parameter: "vm.network.throttling.rate". If nw_rate is NULL for serviceOffering, this parameter would be used for default vm's network
2011-04-01 15:48:32 -07:00
Frank 7cd47376fd Move all schema-*.sql to setup/db/db inline with db upgrade script 2011-04-01 15:47:16 -07:00
Edison Su 8161964bc2 fix db upgrade error 2011-04-01 14:21:26 -04:00
Edison Su de2d650adf fix db upgrade from 2.1.x to 2.2.1 2011-04-01 11:00:28 -04:00
Alex Huang 8b34065623 bug 9259: added upgrade test suite 2011-04-01 10:32:23 -07:00
Alex Huang 420157071b bug 9259: added edison's changes as well 2011-04-01 09:55:42 -07:00
Alex Huang d14b04f9a5 bug 9259: removed some of the extra vpn statements duplicated from my change and chiradeep's change 2011-04-01 09:41:26 -07:00
Alex Huang a8454ad0eb bug 9259: why should destroyed be NULL to begin with. fix upgrade 2011-04-01 09:33:37 -07:00
kishan 7f08061e72 Added missing semi-colon and corrected usage unit test error messages 2011-04-01 12:06:52 +05:30
Kelven Yang ea95ac1808 bug 8713 : finalize the implementation of supporting system vm pooling 2011-03-31 17:14:09 -07:00
kishan 9a29e1d926 Added missing semi-colon and corrected usage unit test error messages 2011-03-31 18:16:44 +05:30
Alex Huang bf13d2cbec added missing changes from schema changes previously 2011-03-30 13:23:56 -07:00
Alex Huang 971915a26a added missing changes from schema changes previously 2011-03-30 12:17:20 -07:00
Frank 6d005313bc Move schema files to setup/db directory in line with DB upgrade code 2011-03-30 12:14:42 -07:00
Murali Reddy 1b251a5fc8 Bug 4061: support for Microsoft Hyper-V changes- part 1 2011-03-30 18:48:51 +05:30
alena 2af46789cb bug 9192: multiple improvementes to listVms command.
1) No longer do multiple searches involving "domain" table; only one join with domain is being done.
2) Do join with domain table only when command is executed by domainAdmin
3) Added index for "path" field in "domain" table
4) No longer do joins with account table as account_id is already present in vm_instance table.
2011-03-29 19:18:30 -07:00
Kelven Yang 64148f46f4 bug 8713: supporting structures for SSVM load management 2011-03-29 18:52:54 -07:00
alena 46a80a599a bug 9192: multiple improvementes to listVms command.
1) No longer do multiple searches involving "domain" table; only one join with domain is being done.
2) Do join with domain table only when command is executed by domainAdmin
3) Added index for "path" field in "domain" table
4) No longer do joins with account table as account_id is already present in vm_instance table.
2011-03-29 18:42:44 -07:00
will 38e95455d1 rollbacked create-schema foreign key constraint until we can figure out a way to make sure server-setup.xml isn't broken by this for developers. 2011-03-29 17:23:18 -07:00
will 0cd415c8d2 rollbacked create-schema foreign key constraint until we can figure out a way to make sure server-setup.xml isn't broken by this for developers. 2011-03-29 17:16:29 -07:00
Alex Huang 6bd978abfe bug 9192: fixes the caches that are gone due to configuration server uses the same dao without cache 2011-03-29 11:31:59 -07:00
Alex Huang f2e692099e bug 9192: fixes the caches that are gone due to configuration server uses the same dao without cache 2011-03-29 11:31:23 -07:00
prachi e87ffdec3e Database upgrade from 222 to 224 for Bug 6873 - disable/enable mode for clusters (and pods and zones and hosts)
- Adding column and index 'allocation_state' to clusters and pods and zones and hosts
2011-03-29 11:05:05 -07:00
prachi 5ded9af0f3 Database upgrade from 222 to 224 for Bug 6873 - disable/enable mode for clusters (and pods and zones and hosts)
- Adding column and index 'allocation_state' to clusters and pods and zones and hosts
2011-03-29 11:01:36 -07:00
alena d3357c6691 Set network limit to be 0 by default for Control/Management/Storage/Public networks (these networks are used by SSVM/ConsoleProxy/domR) 2011-03-28 15:48:11 -07:00
alena cf0020d1df Fixed 221-222 db upgrade. Fixes were added to 222-224 db upgrade script 2011-03-28 11:16:13 -07:00
alena fdf0f589af bug 8902: added Removed field to "cluster" table
status 8902: resolved fixed
2011-03-28 10:50:09 -07:00
alena 08036d5312 GuestIP field can be null in network_offerings table - fixed 221 to 222 upgrade script 2011-03-26 17:06:28 -07:00
alena 04551d59ea Added missing config value to 221-222 upgrade script. It was present in 223 branch, but missing in master 2011-03-26 16:52:28 -07:00
alena 530cb9e77b Fixed 221 to 222 upgrade script - guestIPType can be null in network offering 2011-03-26 16:32:45 -07:00
alena a8cc285ca9 bug 8934: set correct guest_type for default Xen Centos template. DB upgrade script is also updated.
status 8934: resolved fixed
2011-03-25 16:05:06 -07:00
alena 92f01ba143 2.1.x to 2.2.2 upgrade for Domain level vlans 2011-03-25 15:23:18 -07:00
alena 33fff1262e Changes to 222-224 db upgrade 2011-03-24 14:41:01 -07:00
anthony 6e60539427 bug 9140: 221to222 upgrade fix
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (138, 7,
'None');

status 9140: resolved fixed
2011-03-24 14:05:40 -07:00
alena dee2e59fb3 bug 8798: delete zone is fixed
status 8798: resolved fixed
2011-03-24 13:32:31 -07:00
David Noland 978a9c7df4 Show more meaningful error message if db deployment fails when "mysql" is missing from PATH. 2011-03-24 12:26:37 -07:00
Kelven Yang bfc420f22e Fix sql syntax error, a coma is missing 2011-03-24 10:27:15 -07:00
prachi 923f562aa8 Bug 6873: disable/enable mode for clusters (and pods and zones and hosts)
- Added a new flag 'allocation_state' to zone,pod,cluster and host
- The possible values for this flag are 'Enabled' or 'Disabled'
- When a new zone,pod,cluster or host is added, allocation_state is 'Disabled' by default.
- For existing zone,pod,cluster or host, the state is 'Enabled'.
- All Add/Update/List  commands for each of zone,pod,cluster or host can now take a new parameter 'allocationstate'
- If 'allocation_state' is 'Disabled', Allocators skip that zone or pod or cluster or pod.
- For a root admin, ListZones lists all zones including the 'Disabled' zones. But for any other user, the 'Disabled' zones are not included in the response.
- For any usecase that creates/deploys/adds/registers a resource and takes in zone as parameter, now we check if the Zone is 'Disabled'. If yes then the operation cannot be performed by a user other than root-admin. Add volume, snapshot, templates are examples of this usecase.
- To enable the root admin to test a particular pod/cluster/host, deployVM command takes in 'host_id' parameter that can be passed in only by root admin.
If this parameter is passed in by the admin, allocators do not search for hosts and use that host only. StoragePools are searched in the cluster of that host.
If VM cannot be deployed to that host, allocators and deployVM fails without retrying
2011-03-23 22:15:35 -07:00
Frank a8a5d18d91 Clean async Job
align vm_template with new systemvm template
2011-03-23 16:06:52 -07:00
alena f84c81a47d bug 8533: all IP Address fields in DB have char(40) type
status 8533: resolved fixed
2011-03-22 14:06:14 -07:00
Alex Huang 7103d30f57 router restarted but needs template update 2011-03-22 09:46:41 -07:00
Alex Huang 109c4eae0e restarting domr is close to working 2011-03-21 17:56:00 -07:00
alena abb2e2b2ff bug 8831: partial checkin for Domain specific Networks (includes DB changes) 2011-03-21 15:05:07 -07:00
alena 505848bbbe Fixed unittest 2011-03-21 10:29:11 -07:00
prachi 5bbffcaa97 Changes to add 'cluster_id' to 'op_host_capacity' table for Db upgrade from 222 to 224 2011-03-18 12:14:48 -07:00
Alex Huang 8723727de1 added 2.2.2 to 2.2.4 2011-03-18 10:41:58 -07:00
Alex Huang d3ecf719ce looks like everything is working except for snapshots 2011-03-18 09:14:05 -07:00
Alex Huang f12f7da0ba fixed everyting to upgrade from 2.1.7 to 2.2.2 2011-03-17 16:33:42 -07:00
alena 579a9294bf Removed vm_type update in DB 217 to 221 upgrade 2011-03-16 15:57:41 -07:00
alena 6be1681647 DB upgrade for Basic zone: upgrade domR/ssvm/consoleProxy nics 2011-03-16 14:14:14 -07:00
Chiradeep Vittal 8d791777db Introduce zone (datacenter) details 2011-03-15 15:44:36 -07:00
Frank ffb900fc86 Bug 8208 - bare metal provisioning
Add useExternalDhcp option to createPodCmd
2011-03-14 16:42:59 -07:00
Edison Su eaf9414a52 bug 8939: add management.network.cidr
status 8939: resolved fixed
2011-03-09 16:32:18 -05:00
Chandan Krishna Reddy Purushothama 3b2d4c3fb5 Additions made to the script inorder to avoid VM login using "saved_password" string 2011-03-09 15:54:18 -08:00
Edison Su 163af9a3b6 do not detect ip when you just deploy database 2011-03-09 15:28:55 -05:00
alena a50950bbef 221 to 222 DB upgrade for InstanceGroup. Unit test is included 2011-03-09 08:34:08 -08:00
anthony c013d0a6c6 fixed unit test 2011-03-08 20:04:28 -08:00
anthony 9e9ec24c70 remove snapshot_policy_ref index 2011-03-08 18:03:16 -08:00
anthony b32e8f23a6 bug 8712: since we add multiple concurrent policy back in 2.2.3, we only support upgrade from 2.1.7 to 2.2.3, otherwise some policies will be removed silently
need test this upgarde
2011-03-08 17:10:27 -08:00
anthony 5b1a421e62 bug 8712: prepare from snapshot db migration 2011-03-08 17:10:27 -08:00
alena fe267c2cb2 Basic zone 221 to 222 DB upgrade. Unit test is included 2011-03-08 15:32:55 -08:00
Alex Huang 35275c1615 added user ip address upgrade 2011-03-07 17:53:43 -08:00
Kevin Kluge 69c4a59696 resolved fixed: 8853
update to handle multiple NICs and non-virtual-networking cases.
2011-03-07 13:26:01 -08:00
alena 94fb0612f2 Fixed DB upgrade script - vm_type field can be NULL
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2011-03-05 10:37:57 -08:00
Alex Huang bda3264a77 networks are generated now from the domr 2011-03-04 18:07:26 -08:00
Alex Huang f7ea6e17cd break upgrade fix upgrade 2011-03-04 18:07:26 -08:00
abhishek ade92456df bug 8601: merge from 2.2.2 to master 2011-03-04 16:31:58 -08:00
abhishek 5b0f247b46 bug 8601: more db migration 2011-03-04 14:08:51 -08:00
abhishek b6b0a22160 bug 8601: more db migration 2011-03-04 13:56:18 -08:00
alena 7cf4c375c2 cloud-set-guest-sshkey script (used by sshKey pair feature, has to be installed on the vm template) is a part of our code base now 2011-03-04 11:31:18 -08:00
Alex Huang 40db230095 more changes for db upgrade 2011-03-04 11:09:24 -08:00
keshav 1be21effc9 Changed password script to work even if multiple password servers are listening for requests 2011-03-03 11:52:53 -08:00
keshav 25cd4a5768 Changed password script to work with multiple NICs. 2011-03-02 18:30:19 -08:00
prachi 9ec4911285 Removing the scripts to add host_tags table from 21 to 22 DBUpgrade script, since 2.1.7 already has the necessary table. 2011-03-02 17:48:22 -08:00
abhishek efcc1b9aa8 bug 8601: another upgrade step for network offerings 2011-03-02 14:37:39 -08:00
abhishek e9d87d8d76 changes to security grps upgrade (ant unitttest passes) 2011-03-02 14:35:55 -08:00
nit e772bfa00b bug 8812: DB upgrade (2.1 - 2.2) changes for template. ant unittest successful
status 8812: resolved fixed
2011-03-02 13:39:03 -08:00
Alex Huang f3b58a4b0a removed a bunch of scripts that doesn't pass unittest 2011-03-02 00:16:54 -08:00
Alex Huang d0a5816999 Added Premium upgrade 2011-03-01 23:47:36 -08:00
abhishek 0f53f2a2c7 bug 8601: changing traffic_type to guest_type 2011-03-01 17:57:55 -08:00
abhishek d50a6a2e97 bug 8601: more upgrade fine tuning 2011-03-01 17:50:51 -08:00
abhishek a3986f6691 added another upgrade step 2011-03-01 16:22:29 -08:00
abhishek 7fe999da97 bug 8601: adding another upgrade step for networks table 2011-03-01 16:15:08 -08:00
abhishek dbb03006b7 adding a migration step from 221 to 222 using alex's framework. this should only be used for alex's upgrade from 217 to 22, for 221 to 222 for 222 release, we still are providing the bash script for upgrade. 2011-03-01 16:00:14 -08:00
abhishek 821277ecd1 reverting the change 2011-03-01 11:17:54 -08:00
abhishek 861874b51f adding netapp related tables for migration from 2.1.x to 2.2.1 2011-03-01 11:09:47 -08:00
abhishek f484c27a1f bug 8601: adding another step for network offerings table 2011-03-01 10:30:27 -08:00
abhishek 343e06d116 bug 8601: adding another upgrade for data center table
status 8601: resolved fixed
2011-03-01 09:36:22 -08:00
anthony 3537c7e1a0 fix schema 2011-02-28 18:05:44 -08:00
abhishek 1014f93009 adding migration scripts for sec grp related stuff for 2.1.7 to 2.2.1 2011-02-28 17:58:40 -08:00
prachi cf68ad7bc6 DB migration script for 2.1.7 to 2.2.1 - Changes needed for creating new host_tags table 2011-02-28 16:30:45 -08:00
anthony cd27202a26 bug 8216: create volume from snapshot can take a disk_offering_id, if disk_offering_id is not specified, use the one from original volume
status 8216: resolved fixed
2011-02-28 16:28:41 -08:00
Alex Huang 8571d04034 unit testing is working again 2011-02-28 16:21:19 -08:00
prachi 889827b63a Bug 7845 - Productize DeploymentPlanner
Bug 7723 - merge or re-write host tagging into master / 2.2
Bug 7627 - Need more logging for Allocators
Bug 8317 - Add better resource allocation failure messages

Changes for Deployment Planner to use host and storagePool allocators to find deployment destination.
Also has the changes for host tag feature.
Improved the logging for allocators.
2011-02-28 13:47:51 -08:00
abhishek 2a95a95d18 checking to see if mysql is running 2011-02-28 13:43:38 -08:00
anthony 1970161844 bug 8714: support paraleel recursive snapshot
snapshot doesn't depend on volume any more, volume can be removed even there are snapshots on this volume

status 8714: resolved fixed
2011-02-25 22:17:13 -08:00
abhishek 5c4078e296 bug 8601: adding the upgrade script from 2.2.1 to 2.2.2 2011-02-25 17:14:57 -08:00
abhishek 46994153a9 bug 8601: these are the 2 sql files for the cloud and cloud_usage db migration. I have tested some of the most common cases, as well as some uncommon cases (create a direct and virtual network in same zone). 2011-02-25 17:06:26 -08:00
Edison Su 8a40371288 refactor security group in advanced network mode: use direct tagged network instead of public network 2011-02-24 19:58:18 -05:00
alena 039b11b9ba 1) Added guestIpType to the network offering; create/listNetworkOffering apis got changed accordingly.
2) Set traffic Type to be Guest for Direct/Virtual non-system default network offerings. Use this guestIpType during the network creation/implementation
2011-02-24 15:36:01 -08:00
Alex Huang a6ac728761 cleanup script is also running now as well 2011-02-24 11:35:49 -08:00
kishan 8eb665246e bug 7935: Included hypervisor type to vm usage records
status 7935: resolved fixed
2011-02-24 20:08:12 +05:30
kishan f138552f36 bug 8603: Included netwrok_id in network usage records
status 8603: resolved fixed
2011-02-24 15:31:59 +05:30
Edison Su adbd20ca5a bug 8655: add security group for direct tagged network 2011-02-23 15:53:14 -05:00
Alex Huang 2002abd7c3 fixed copy and paste errors 2011-02-22 19:33:25 -08:00
Alex Huang b6056bc0b1 missing files 2011-02-22 19:12:10 -08:00
Alex Huang 78f5c6cc47 schema converted over. 2011-02-22 18:23:05 -08:00
Alex Huang c22b37e402 latest work on db migration 2011-02-22 18:23:05 -08:00
kishan 99b5f7279d added queries to handle unit MB to bytes change for volume usage 2011-02-22 17:12:22 +05:30
alena cd90bc7166 bug 8412: allow to delete network when it has dhcp/domRs
status 8412: resolved fixed

1) Don't count domR/Dhcp nic in active nics.
2) Removed domR cleanup thread; Network shutdown thread would shutdown domR/dhcp when network has no active vms
2011-02-18 10:31:59 -08:00
abhishek 2275d8d833 bug 8452: introducing a state for domain; blocking creation of accounts/users whilst domain is in an inactive state 2011-02-17 15:17:45 -08:00
Kelven Yang 45eb1b4d3c Fix syntax error in create-schema.sql 2011-02-17 11:26:34 -08:00
Alex Huang 6b0d4947ed bug 8529: propagated to master. Added junit test support to ant 2011-02-16 17:40:58 -08:00