Commit Graph

74 Commits

Author SHA1 Message Date
Kelven Yang 6fb1a1e6f1 Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
Alex Huang fac2270240 more files changed 2013-01-10 15:29:14 -08:00
Alex Huang 56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang 30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Kelven Yang 453b31f3f4 Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring 2012-11-07 15:03:23 -08:00
Alena Prokharchyk ffa5276222 Fixed CLOUDSTACK-287
1) Always fail to authenticate system user.
2) DB - always create system user with RANDOM not null password
3) Don't allow modifying (setting api/secretKeys, etc) system user via API

Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-305to306.sql
2012-10-09 09:37:27 -07:00
Koushik Das 2404d3493d CS-14277
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:38:15 -07:00
Koushik Das 65eeeaf071 CS-14277
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:22:43 +05:30
Alena Prokharchyk 0bf6de3eb2 CS-16030: set UUID when persist public ip address 2012-08-16 10:13:39 -07:00
Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
mice xia 895b6a3e4b CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread
changes:
add a new global configuration event.purge.interval for event purge thread
leave account.cleanup.interval only for account cleanup thread.
2012-08-02 21:50:44 +05:30
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
Chip Childers 8f71a2927f License header updates for the server folder. 2012-07-02 08:58:10 -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 0a7faa9838 Support for adding private network
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Sheng Yang 18ec438793 Revert zone guest cidr setting 2012-02-08 15:54:16 -08:00
Sheng Yang 08a1d9ece1 Add default physical network name for server-setup.xml 2012-01-09 16:27:14 -08:00
Sheng Yang ac0760ecba Fix server-setup.xml processing 2012-01-06 14:21:32 -08:00
frank 0b01c5dc1a Bug 12777 - Add storage network configuration into CloudStack
create APIs
2012-01-06 11:06:17 -08:00
kishan e2cb4f94d6 bug 12337: Encrypt only password in host_detail table. Removed unused and duplicate references of HostDetailDao
status 12337: resolved fixed
reviewed-by: Abhi
2011-12-20 19:28:41 +05:30
Sheng Yang ab50f65ed8 bug 12483: Discard zone's cidr
status 12483: resolved fixed
2011-12-14 17:23:24 -08:00
Sheng Yang e393dcd069 server-setup.xml: Add physical network enabled by default
Also add uuid for physical networks and zones. And fix server-setup.xml example.
2011-12-13 18:33:05 -08:00
prachi 6dc4ae47db Bug 12103: Adding host without labelling guest network fails
We do not set the default network labels as 'cloud-private' anymore. Instead it is set to the values set in global config variable. This should avoid the host connect failures requiring the network labels to be setup.
2011-11-21 14:46:02 -08:00
Sheng Yang 3aef381b37 NaaS: Add service provider to server-setup.xml 2011-11-15 17:09:55 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
prachi 810f9e4034 While creating Zone, adding default VirtualRouter provider and instance to the default Physical Network.
Also adding default trafficTypes to through server-setup.xml
2011-11-07 14:43:41 -08:00
kishan b1f78bca25 bug 5822, 10783: Use encryption/decryption for queries which use sql directly
status 5822, 10783: resolved fixed
2011-11-01 19:30:00 +05:30
prachi 818df189c5 changes to Create Vlan & Public IPs 2011-10-31 09:53:25 -07:00
prachi 654eaec663 NAAS: Configuring Zone
- Create Zone changes and changes to data_center table to remove vlan, securityGroup fields
- Physical Network lifecycle APIs
- Physical Network Service Provider APIs
- DB schema changes
2011-10-19 22:44:03 -07:00
alena 1561c7d2f9 bug 11468: create ROOT domain and admin user as a part of cloud-setup-databases, not during the management server startup to avoid multiple records insertion for the same domain
status 11468: resolved fixed

Reviewed-by: will@cloud.com

Conflicts:

	server/src/com/cloud/server/ConfigurationServerImpl.java
2011-09-22 11:01:13 -07:00
alena f6a79c603f bug 11036: resource count update is refactored
status 11036: resolved fixed

1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains

Conflicts:

	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java
2011-09-13 10:47:36 -07:00
Abhinandan Prateek 79e38f0a1f bug 10305: for a systemvm only applicable system vm offering should be displayed
status 10305: resolved fixed
While creating a system vm offering specify the type. If no type specified the default to domainrouter.
While requesting a set of system offering specify the paramter systemvmtype.
2011-06-20 20:11:50 +05:30
Abhinandan Prateek db29a56eaf bug 10313: marking default system offering as default so that they should not be deleted
status 10313: resolved fixed
2011-06-19 12:16:06 +05:30
anthony 7a266b9321 bug 10046: size in diskofferingVO is in type now
status 10046: resolved fixed
2011-05-26 13:51:08 -07:00
anthony e96118f0be bring server-setup back 2011-05-09 11:10:19 -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
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
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
Alex Huang 7dd54f079b started vms with these latest 2011-02-11 17:03:04 -08:00
alena 4054d7e2b5 Store ip address as String instead of Long in user_ip_address and port_forwarding_rules tables 2011-02-09 19:35:03 -08:00
alena 558e16c50e Save vnet range in data_center table when do deploy from server-setup.xml in Dev environment 2011-02-08 19:18:52 -08:00
Murali Reddy 8798fce36d bug 8390: description of weekly and monthly snapshot policy contains hourly in global configuration
status 8390:resolved fixed
2011-02-07 10:05:54 -08:00
Edison Su 675a610995 cleanup default hypervisortype 2011-02-01 16:03:10 -05:00
alena 6544820e74 Moved networkRestart to the NetworkManager as it's up to the manager (not network elements) to decide what to do on restart (IpAssoc/ruleApply/etc..) 2011-02-01 12:16:19 -08:00
alena f6f8a35c75 bug 8251: introduced "id" field for public IP address. In the DB id is a primary key in user_ip_address table; ip_address and source_network_id is a composite key
status 8251: resolved fixed
2011-02-01 12:16:18 -08:00
nit d5297519a5 bug 7519 : Some additional code. 2011-01-12 19:35:28 +05:30
alena d0687f663f bug 7863: fixed router cleanup thread
status 7863: resolved fixed

Router cleanp thread is fixed, here is functionality description:

* Runs every "router.cleanup.interval" period of time (1 day by default)
* Stops only domRs running in Advance zone
* Thread Flow:
- gets all Running domRs/dhcps, get their networks, select network that
has to be checked (see criteria below):
- checks that there is only one nic in the op_networks table for the
network, and this nic belongs to domR/dhcp
- Stops domR/dhcp
* Criteria to choose the network:
- Network has to be non-system.
- Network should be one of the following: Guest Virtual (TrafficType=Guest; GuestType=Virtual); Direct Tagged (TrafficType=Public; GuestType=Direct)

Couple of other fixes:

* Added isShared parameter to listNetworks command
* Moved guestType from NetworkOffering to Network
2011-01-07 16:57:47 -08:00