Commit Graph

1216 Commits

Author SHA1 Message Date
Alex Huang 56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Min Chen 8d98daa1be Add API throttling config items and APILimitChecker Adapter interface,
add api limit checking in APIServer flow.
2013-01-09 16:11:23 -08:00
Chiradeep Vittal 6b6d8c5710 Network-refactor: Move code from NetworkManager to NetworkModel.
NetworkModel is intended as a read-only view on the network model.
This includes Networks, Nics, Ip address, PhysicalNetwork, NetworkOfferings, etc
The code in configure() and start() is used to support queries on the network model which is now the responsibility of the NetworkModel service

Network-refactor: Fix tests so that they get injected with the required NetworkModel mock

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 b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Alex Huang 30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Min Chen 74c15a22a0 Create DB view for ListStoragePools API performance optimization.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 12:33:18 -08:00
Min Chen 0894822651 DB view dao cleanup, and introduce global configuration parameter for
entity detail batch query size to remove hard-coded
VM_DETAILS_BATCH_SIZE.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-07 16:40:31 -08:00
Chiradeep Vittal af1abe4056 Forgot some element adapters + dont add JuniperSRX by default 2013-01-07 15:21:57 -08:00
Chiradeep Vittal f4da21998c WIP : extract NetworkService
WIP : move stuff between network manager and network service.
      at this point there is about 700 lines of duplicated code
WIP: Leave creation of default offerings to NetworkManager init
WIP: clean up imports

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-07 14:25:03 -08:00
Rohit Yadav ed0637b8c2 api: Refactor move acl to org.apache.cloudstack
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:30:58 -08:00
Rohit Yadav b720675bfe Merge branch 'master' into api_refactoring
Getting ready for merge request for master, sync changes

Conflicts:
	client/tomcatconf/commands.properties.in

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 01:11:16 -08:00
Sheng Yang aa9701a10c CLOUDSTACK-799: Redundant router: Speed up RvR status update
The basic idea behind this is, deploy a fix sized threadpool for updating RvR
status, then using producer/consumer model. There is a global configuration
router.check.poolsize(10 by default) to control the pool size.

Using pool size 100 for 1000 RvR is tested with simulator and works well.

Also we can adjust the global configuration option router.check.interval to e.g.
60s from default 30s to mitigate the issue.
2013-01-05 21:02:37 -08:00
Rohit Yadav 5119785cf7 Get latest changes, merge branch 'master' into api_refactoring
Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 22:21:20 -08:00
Sheng Yang 177e157cbf CLOUDSTACK-306: Move inline mode parameter from device to network offering
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
2013-01-04 19:17:58 -08:00
Min Chen daeb4abcca Create DB views for AsyncJobResponse to speed up listAsyncJobsCmd.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-03 15:35:26 -08:00
Kelven Yang 25d14418b9 Replace Adapters<T> with standard List<T> to work with Spring injection 2013-01-03 13:33:52 -08:00
Min Chen ebfb90e217 Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-02 17:38:58 -08:00
Rohit Yadav d8d87adc22 Merge branch 'master' into api_refactoring
Conflicts:
	api/src/com/cloud/api/commands/ListS3sCmd.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 13:57:55 -08:00
Kelven Yang e2078ec6e4 Solve Spring loading issues with a few Dao and Manager components 2013-01-02 13:55:26 -08:00
John Burwell e4583ced2e S3-backed Secondary Storage 2013-01-02 10:28:47 -08:00
Kelven Yang 259e6d5f74 Fix a few Spring bootstrap issues 2012-12-27 17:46:52 -08:00
Min Chen 21c1623a03 Create DB view for Volume to speed up ListVolumesCmd.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-25 17:08:50 -08:00
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 13:54:46 -08:00
Min Chen e7fa1a86fb Create DB views to improve ListHostsCmd performance.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-22 21:47:05 -08:00
Sheng Yang d72f8a695d Add new global configuration option to enable user specify guest OS DHCP policy
This is improvement of:

commit 1ca493e4fa
Author: Sheng Yang <sheng.yang@cloud.com>
Date:   Wed Feb 29 17:43:50 2012 -0800

    bug 14042: Don't set dhcp:router option on DHCP server for non-default
network on CentOS/RHEL

The old solution only works on CentOS/RHEL, this one would enable the ability to more
guest OS, and enable user to choose what policy should be for each guest os
type.
2012-12-20 19:21:02 -08:00
kishan 0be6e2e02b bug CS-14982: Make traffic sentinel metering zones configurable. Global config default will be used when no zones are listed while adding Traffic Sentinel Host
status CS-14982: resolved fixed
reviewed-by: Nitin

Conflicts:
	api/src/com/cloud/api/ApiConstants.java
2012-12-17 15:18:31 +05:30
Min Chen c167ad45e3 Move view based VO and Dao classes to cloud-server module to hide the
details from API client, also extract query related methods into
QueryService interface.
2012-12-14 10:47:58 -08:00
Edison Su b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Rohit Yadav 88b7af18e6 api: Revert "Move all the DB view DAOs from cloud-server to cloud-api for future api-server package."
Reverting commit as we don't want the daos to move to cloud-api.
We'll eventually breakout cloud-server and create cloud-api-server for the standalone
api server.

This reverts commit 7597a38f7a.
2012-12-13 09:42:28 -08:00
Min Chen 7597a38f7a Move all the DB view DAOs from cloud-server to cloud-api for future api-server package.
BUG-ID: CLOUDSTACK-527

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-13 09:28:42 -08:00
Min Chen 472f4f91b9 Refactor ListProjectInvitationsCmd and ProjectInvitationResponse. 2012-12-12 09:04:43 -08:00
Min Chen 9c93fee0dc Refactor ListProjectAccountCmd and ProjectAccountResponse. 2012-12-11 15:49:15 -08:00
Min Chen 8735716ba0 Refactor ListProjectsCmd and ProjectResponse. 2012-12-11 12:51:08 -08:00
Murali Reddy 432ea9c7d4 CLOUDSTACK-265: provide option to turn-off automatic public IP association for each VM when using EIP service.
- introduces Capability in the network offering, which
    decides when EIP service is enabled, by defualt public IP
    should be assigned to the VM or not

  - default network offering with EIP/ELB service will still work with old EIP
    semantics, i.e) assign a public IP to each VM on start
2012-12-11 23:06:13 +05:30
Min Chen c83323fea7 api: Refactoring ListUsersCmd and UserResponse.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:45:40 -08:00
Min Chen 1cf8b86ce5 api: Load InstanceGroupJoinDao to component Library
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:17:07 -08:00
Rohit Yadav af28c06998 api: move and group all under command, org.apache.cloudstack.command.*
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 18:30:54 -08:00
Min Chen 30941c2d31 api: Refactoring ListEventsCmd and EventResponse, and create Event db view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 16:54:45 -08:00
Min Chen acf7afd7f5 api: Refactor ResourceTagResponse and ListTagsCmd, add db view for ResourceTag.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:57:52 -08:00
Min Chen 8a313d7f84 api: SecurityGroupResponse and SecurityGroupRuleResponse refactoring
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 16:04:48 -08:00
Rohit Yadav 780eb95830 api_refactor: swift, ldap and vlan apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:13:46 -08:00
Rohit Yadav 6c2ed5cb66 api_refactor: move pod apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:02:57 -08:00
Rohit Yadav 1f1ac79a6c api_refactor: move disk and service offering to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:53:42 -08:00
Rohit Yadav ecc8249365 api_refactor: move cfg admin apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:50:26 -08:00
Rohit Yadav c3853677c5 api_refactor: move zone apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:41:10 -08:00
Min Chen b0ce8fd4ff api: Optimize and improve api, db call perfomance
This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 20:06:20 -08:00
Rohit Yadav 2121fbd469 api_refactor: refactor network apis for admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:38:40 -08:00
Rohit Yadav 47ae62e44a api_refactor: refactor network apis
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 22:47:07 -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
Vijay dda4d39b55 AutoScale changes in Apache master 2012-11-16 10:56:44 +05:30
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
Alena Prokharchyk 9d07ad8ecb CLOUDSTACK-304: default number of concurrent snapshots is NULL (unlimited) - to provide backwards compatibility for existing customers.
Conflicts:

	setup/db/db/schema-305to306.sql
2012-10-16 11:25:05 -07:00
Alena Prokharchyk 339aa41442 CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.
Conflicts:

	core/src/com/cloud/async/AsyncJobVO.java
	core/src/com/cloud/async/SyncQueueVO.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/SyncQueueManager.java
	server/src/com/cloud/async/SyncQueueManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
	server/test/com/cloud/async/TestSyncQueueManager.java
	setup/db/create-schema.sql
2012-10-10 13:40:00 -07:00
Kishan Kavala 89779cceb8 Merge branch 'master' into regions
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/create-schema.sql
2012-10-03 14:09:01 +05:30
Kishan Kavala 4fcf64dd74 updated regions branch with changes from master 2012-09-27 17:04:59 +05:30
Mice Xia 7e75140537 CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start 2012-09-26 14:05:37 +08:00
Saksham Srivastava a56631bc66 bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed.
Also after the maximum attempts are reached the user account is disabled
2012-09-12 19:35:24 +05:30
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 2bf5c99bc6 CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-08-21 15:31:07 -07:00
Edison Su 481aae1ebc add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
Edison Su 9059740dc1 HA worker thread needs to have its own worker thread configuration 2012-08-17 12:59:52 -07:00
Alena Prokharchyk 71ead9ef4e VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-13 14:03:39 -07:00
Sheng Yang 327b4833ce S2S VPN: CS-15947: Add global config for S2S VPN VPN connection counts limitation
And subnets limitation for each customer gateway

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:24:35 -07:00
Alena Prokharchyk 057d6ccbb8 Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc
Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Mice Xia a74c6e3104 fix CS-15814 Description of global configuration 'encode.api.response' is incorrect 2012-08-08 16:29:53 +08:00
Alena Prokharchyk e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -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 ce9f1afa78 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
Alena Prokharchyk b92d2336ad VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
2012-08-01 18:57:33 -07:00
Nitin Mehta 85398bb2e0 bug CS-13935: correcting description for create.volume.from.snapshot.wait global setting
Reviewed-by: Kishan
2012-08-01 18:16:01 +05:30
Alena Prokharchyk fe2681fa10 VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-27 13:59:08 -07:00
Alena Prokharchyk 807a9ed2c3 VPC: added global configuration for limiting number of networks per vpc (vpc.max.networks)
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-27 13:56:25 -07:00
bfederle c8f72c9198 Merge branch 'master' into vpc
Conflicts:
	ui/scripts/network.js
2012-07-23 10:36:25 -07:00
Alena Prokharchyk 8e648e4a98 Fixed update endpointe.url global config var 2012-07-18 15:47:37 -07:00
Alena Prokharchyk 6ad2388c72 VPC: added one more default network offering for VPC - the one not having LB service 2012-07-17 17:46:17 -07:00
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
Alena Prokharchyk da6d876cd4 VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
2012-07-03 17:23:40 -07:00
kishan 6a1b0f3ecf Add Region APIs 2012-07-03 13:05:19 -07:00
Sheng Yang 24c480f9e6 CS-6840: Add commands for site-to-site vpn
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-02 16:26:34 -07:00
Jason Bausewein 0449ae37f1 CS-15274: Fix NPE on CreateVlanIpRangeCmd()
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:05:57 -07:00
Murali reddy 9876d34ea4 moving out ELB network element to plugins/network-elements/elastic-loadbalancer 2012-07-02 15:05:58 -07:00
Murali reddy 8aa2b55dd6 moving out NetApp code to plugins/file-systems/netapp 2012-07-02 08:34:02 -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
Alena Prokharchyk 1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
2012-06-28 17:41:40 -07:00
Murali reddy c41094154d moving out OVS code to plugins/network-elements/ovs 2012-06-28 17:23:41 -07:00
Alena Prokharchyk b03265bc76 VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete) 2012-06-28 10:18:14 -07:00
Jessica Wang 3938c24b45 CS-15356: cloudstack 3.0 API - updateZone API - when internaldns2 parameter is not being passed to updateZone API, leave it as is (i.e. remain original value of internaldns2). 2012-06-27 16:57:03 -07:00
Murali reddy 8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Alena Prokharchyk ce876e24de VPC: intermidiate checkin to Static Routes
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
2012-06-25 21:00:57 -07:00
Alena Prokharchyk b770c8b979 VPC: moved NetworkACL manager to the vpc folder 2012-06-25 20:57:50 -07:00
Alena Prokharchyk 030458a37b VPC: implemented add/delete Private gateway
Conflicts:

	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/dc/DataCenterVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-25 20:54:14 -07:00
Murali reddy 392ae5cb13 moving out Srx code into Plugins/network-elements 2012-06-25 16:55:53 -07:00
Murali reddy 422c4ce513 moving out F5 code from server into plugins/network-elements/f5/ 2012-06-23 14:16:59 -07:00
Murali reddy 49b88472a5 moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler 2012-06-21 18:57:18 -07:00
Alena Prokharchyk 374a600746 VPC: initial checkin for network ACLs
Conflicts:

	client/tomcatconf/commands.properties.in
2012-06-20 17:19:49 -07:00
Alena Prokharchyk 62d45b9670 Initial checkin for resource tags feature
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
	setup/db/create-schema.sql
2012-06-20 15:45:08 -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
Alena Prokharchyk 929997f54e AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.
When the last rule is removed for vpc ip, networkId is set to null

Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	api/src/com/cloud/api/commands/EnableStaticNatCmd.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/rules/RulesService.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:18:24 -07:00
Alena Prokharchyk d9fd7e02a5 Plug nic support
Conflicts:

	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2012-06-15 14:07:46 -07:00
Alena Prokharchyk f4060c3c1d 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support
2) Added services api support for plugging/unplugging the nics to VpcElement

Conflicts:

	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:04:09 -07:00
Alena Prokharchyk 9debd3a5df 1) Added start logic to the VPC
2) VirtualRouterManagerImpl - refactored deployVirtualRouter method
3) Added vpcId to domain_router/user_ip_address tables and corresponding vo objects

Conflicts:

	server/src/com/cloud/network/IPAddressVO.java
2012-06-15 13:56:05 -07:00
Alena Prokharchyk 998cf66e6c Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used.
Router->Networks (one to many) are held in router_network_ref table now
2012-06-15 13:54:48 -07:00
Alena Prokharchyk 60b52f90dd Initial checkin for VPC feature:
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd

2) New db tables:

* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`

and corresponding VO/Dao objects.

Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC

3) New Manager and Service interfaces- VpcManager/VpcService

4) Automatically create new VpcOffering (if doesn't exist) on system start

5) New Action events:

* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE

* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	setup/db/create-schema.sql
2012-06-15 13:53:59 -07:00
Sateesh Chodapuneedi 4ad8845b28 CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep
2012-05-25 19:41:36 -07:00
Sateesh Chodapuneedi 205f4a2192 CS-9919 - Support for Nexus Swiches (Cisco Vswitches)
Description:

	Code changes to manage Cisco Nexus 1000v in CloudStack.
	VmwareResource has been modified to leverage Nexus vSwitch.

	Providing following global configuration parameters,

vmware.use.nexus.vswitch -
	This would decide whether Nexus vSwitch in the VMware
	cluster environment would be used/managed by CloudStack
	for it's network infrastructure needs.

vmware.guest.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for guest traffic.

vmware.private.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for private traffic.

vmware.public.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for private traffic.

Functional Specification -
	http://wiki.cloudstack.org/display/RelOps/Cisco+Nexus+1000v+Support+in+CloudStack+-+Functional+Specification

Documentation / README for usage instructions -
	http://wiki.cloudstack.org/display/RelOps/Configuration+instructions+for+CloudStack+Deployment+with+Nexus+vSwitch

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
2012-05-25 17:27:00 -07:00
Vijayendra Bhamidipati 781f0b4966 Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	1. Added the PortProfile infrastructure:

	    a. PortProfileVO : The VO class to represent a db
	    record of the table port_profile. Each db record
	    represents one port profile.

	    b. PortProfileDao: The interface that declares search
	    functions on the port_profile table.

	    c. PortProfileDaoImpl: The class that defines the
	    interfaces declared in PortProfileDao.

	    d. PortProfileManagerImpl: The class that contains
	    routines that will add or delete db records from
	    the port_profile table. If you want to create/delete
	    a portprofile, call functions from this class.

	    e. Changes to create-schema.sql to create the port_profile
	    table.

	2. Cleaned up code:

	    a. Removed a number of unused Dao and Manager objects in
	    CiscoNexusVSMDeviceManagerImpl.

	    b. Removed the ListCiscoNexusVSMNetworksCmd command.

	    c. Removed a bunch of import statements in a few files.
2012-05-25 17:17:56 -07:00
Vijayendra Bhamidipati 7380f52f12 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	1. Missed replacing older table name for VSMs in a few
	   files (changed the name from
	   external_virtual_switch_management_devices to
	   virtual_supervisor_module). Fixed that in this commit.

	2. Missed adding the new Dao ClusterVSMMapDao in the Dao
	   loading in DefaultComponentLibrary. Fixed.

	3. Fixed wrong searchbuilder options passed to ipaddrSearch
	   in CiscoNexusVSMDeviceDaoImpl.
2012-05-25 17:09:41 -07:00
Vijayendra Bhamidipati b0facd16e4 Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
At this point, the mgmt server comes up, loading the
	   Nexus related modules without dying.

Description:

	1) Added a new properties file for Cisco N1kv VSM commands:
		cisconexusvsm_commands.properties.in

	2) Added the CiscoNexusVSMElement to the components.xml file.

	3) Modified CiscoNexusVSMElement to implement NetworkElement.

		The NetworkElement interface functions are not
	  	relevant to the N1KV VSM, so we override them
	  	with noops.

	4) Added an addDao() of CiscoNexusVSMDeviceDaoImpl in populateDaos(),
	   else we'd run into a failure to look up the VSM's dao when the
	   mgmt server is starting up:

		com.cloud.utils.exception.CloudRuntimeException: Unable to find DAO com.cloud.network.dao.CiscoNexusVSMDeviceDao

	5) Also added the CiscoNexusVSMElementService in populateServices(),
	   and modified CiscoNexusVSMElement to implement Manager as well.

	6) populateServices() was running into an exception that indicated
	   that it was unable to find a commands.properties file for the
	   cisco n1kv vsm service. Fixed it by changing getProperties() in
	   CiscoNexusVSMElement to return the correct string
	   "cisconexusvsm_commands.properties", and putting in an @Override
	   for getProperties() in CiscoNexusVSMElement. Also fixed up all
	   the other functions in CiscoNexusVSMElement that needed to have
	   @Override. Also updated build/developers.xml with this file
	   location. And did other small cleanup.

	7) More clean up in CiscoNexusVSMDeviceManagerImpl.

Conflicts:

	server/src/com/cloud/configuration/DefaultComponentLibrary.java
2012-05-25 17:07:03 -07:00
prachi 3fd17ae029 Merge awsapi related changes to CloudStack 2012-05-25 14:40:53 -07:00
Alena Prokharchyk 434f166c02 Removed unused comments 2012-05-24 12:04:02 -07:00
frank d2b3ec84e9 CS-13853 secstorage.allowed.internal.sites is not allowed to be 0.0.0.0
resolved fixed
2012-05-16 11:57:36 -07:00
Nitin Mehta c01d03e53f bug CS-14249: cluster.localStorage.capacity.notificationthreshold text is incorrect 2012-05-15 19:58:30 +05:30
Murali reddy 3b1aca19b3 bug CS-14291: support EIP with multiple NetScalers in basic zone
This fix will enable support for multiple NetScaler devices providing EIP service in same zone.

    - Introduced global setting "eip.use.multiple.netscalers" to turn multiple netscaler support
    - Enhanced configureNetscalerLoadBalancer API to take the PBR setup between the POD's subnet
      and NetScaler device
    - logic to pick a NetScaler (based on the guest IP and corresponding pod) while configuring INAT rule
2012-05-15 14:00:32 +05:30
Alena Prokharchyk 2daf7998c8 CS-14692: don't allow to remove account specific ip range when it has sourceNat ip address, and associated with non-removed Guest network 2012-05-14 10:13:44 -07:00
Alena Prokharchyk 4f12a5191a CS-14783
Fixed limit check when acquire public ip range for the account.
2012-05-11 15:40:17 -07:00
Alena Prokharchyk e6c764f149 CS-14685: Added customdiskofferingmaxsize to the listCapabilities response 2012-05-11 13:45:31 -07:00
Salvatore Orlando a794e49545 CS-14724 : Making the default network label configurable, improving exception management
Please also see notes added to wiki.cloudstack.org/display/QA/Open+vSwitch+Tunnel+Manager
2012-05-02 15:16:10 +01:00
Salvatore Orlando 469ed78a58 CS-14606: Restoring config parameter which was accidentally removed 2012-04-27 17:17:49 +01:00
Salvatore Orlando 8080bc2d26 CS-14606: Change name for config parameter 2012-04-27 17:17:34 +01:00
Alena Prokharchyk 5da0fdaecb CS-14637: db upgrade - fixed inconsistencies in category/component fields for a bunch of global config variables 2012-04-26 10:10:05 -07:00
Salvatore Orlando 2bf0c7f7ff CS-14605: OVS cleanup
Fix syntax errors in ConfigurationManager and Resource Manager test
2012-04-25 10:53:41 +01:00
Alena Prokharchyk afb97f128b Account specific vlan ranges - fixed deleteVlanRange
Conflicts:

	api/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-04-24 17:18:27 -07:00
Alena Prokharchyk a678988f33 CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-04-24 11:44:00 -07:00
Salvatore Orlando ec472fcaaa Forgot to add new dao into component library! 2012-04-23 22:33:19 +01:00
Salvatore Orlando 9f321ffeac Open vSwitch tunnel manager
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master
2012-04-23 22:32:16 +01:00
Abhi 6857750566 bug CS-14593, CS-14541: fixed encryption issue 2012-04-23 15:29:38 +05:30
Nitin Mehta 14adf23700 bug CS-10789: Adding more code changes for usage, delete volume . 2012-04-23 13:42:53 +05:30
Nitin Mehta 564cef8ddf More changes for uploadVolume. Create framework for upload volume progress communication between MS and SSVM. 2012-04-23 12:14:35 +05:30
Nitin Mehta e04822eb70 bug CS-14530: Whenver adding a new capacity check the state of the resource - if its disabled/enabled.
Reviewed By: Kishan
2012-04-19 14:24:12 +05:30
frank cc4e4e69d8 CS-14341 Order of Compute offerings does not stick
resolved fixed
2012-04-12 17:26:09 -07:00
Alena Prokharchyk 52539e798d bug 14449: added logging to createVlanIpRange
status 14449: resolved fixed
2012-04-10 11:24:36 -07:00
Alena Prokharchyk 98fd5cf959 bug 14622: introduced ha tagging for host
status 14622: resolved fixed

Conflicts:

	server/src/com/cloud/host/dao/HostDao.java
2012-04-09 15:18:01 -07:00
David Nalley 59436be4ee fixing line endings in server 2012-04-07 20:13:10 -04:00
Alena Prokharchyk c0130a5c41 Code cleanup for createVlanRange api 2012-04-04 15:03:04 -07:00
Alena Prokharchyk b14bac0977 bug 14539: 1) introduced 2 new config parameters defining default offerings for ssvm and cpvm - consoleproxy.service.offering and secstorage.service.offering
2) Added new api - changeServiceForSystemVm - to support service offering upgrade for system vms
3) Removed global config parameters that are not in use anymore: consoleproxy.ram.size, consoleproxy.cpu.mhz, secstorage.vm.ram.size, secstorage.vm.cpu.mhz
2012-04-03 10:52:32 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk dc1af9e5f4 bug 14444: specifyVlan should always be false for the network offering of type Isolated supporting sourceNat service
status 14444: resolved fixed
2012-03-28 11:24:09 -07:00
Alena Prokharchyk 4060be1842 bug 14445: automatically enable firewall service for VR when VR is a provider for PF/StaticNat services
status 14445: resolved fixed
reviewed-by: Sheng Yang
2012-03-22 14:17:15 -07:00
Nitin Mehta 2a837c3ebd Bug 14345: DB discrepecy for capacity.check.period, cluster.memory.allocated.capacity.disablethreshold, pool.storage.allocated.capacity.disablethreshold, pool.storage.capacity.disablethreshold.
Reviewed-By: Kishan
2012-03-22 10:01:49 +05:30
Alena Prokharchyk e53cfeceb6 bug 14379: don't enable 8096 port by default (set global config variable to null by default, and don't create a listener on this port unless its set to valid integer) 2012-03-19 16:19:38 -07:00
Alena Prokharchyk fec3a87d09 bug 14388: don't return console proxy / ssvm service offerings
status 14388: resolved fixed
2012-03-19 14:50:09 -07:00
Alena Prokharchyk ad1192e264 bug 14239: limit number of Isolated account specific networks per account
status 14239: resolved fixed

Conflicts:

	api/src/com/cloud/api/commands/CreateNetworkCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-03-12 15:53:30 -07:00
abhi ecad50c801 bug 14151,14153: configuration variables are now hidden; added ldapRemove command 2012-03-12 16:50:00 +05:30
Alena Prokharchyk 6910740582 Revert "bug 14151,14153: configuration variables are now hidden; added ldapRemove command"
Reverting the commit in order to fix the build
This reverts commit 0ab0fcfa5c3b8825b8a92e3c2d2dee8e8ca6152b.
2012-03-09 09:53:56 -08:00
abhi b7b751fdf6 bug 14151,14153: configuration variables are now hidden; added ldapRemove command 2012-03-09 16:56:01 +05:30
Alena Prokharchyk 65e160b7e6 bug 14173: add eip/elb network offering (if missing) during the management server start
status 14173: resolved fixed
2012-03-07 10:02:24 -08:00
kishan de997c1e45 Bug 13952: Changed category of Usage configs
Status 13952: resolved fixed
Reviewed-By: Abhi
2012-03-05 18:58:49 +05:30
kishan 93b859970f Bug 14039: Changed SSO key category Secure
Status 14039: resolved fixed
Reviewed-By: Abhi
2012-03-01 21:00:48 +05:30
Alena Prokharchyk 25676aa3c6 bug 14017: 1) Don't allow NULL value for Boolean type of config 2) Added a null check when compare config values
status 14017: resolved fixed
2012-02-29 13:09:47 -08:00
Alena Prokharchyk 6612744c61 bug 13971: return only offerings with matching tags when zoneId is passed in and corresponding zone has more than 1 physical network
status 13971: resolved fixed
Reviewed-by: Prachi Damle
2012-02-23 16:52:50 -08:00
Alena Prokharchyk 836a063a9e bug 13924: default Firewall provider to Juniper when Juniper is a provider for Pf/StaticNat or source nat service
status 13924: resolved fixed
reviewed-by: Will Chan
2012-02-22 18:46:04 -08:00
Alena Prokharchyk 798accae10 Added isTagged parameter to listNetworkOfferings api. When set to true, it will return offerings with not null tag values
Reviewed-by: Jessica Wang
2012-02-22 16:09:35 -08:00
prachi 760c62eb15 Bug 13224 - Network Usage - Netscaler - External device is being queried multiple times (up to 8 times) whenever the Network Usage task is run.
Reviewed-by: Kishan

Changes:
- Separated out the External Network Usage task from the ExternalLBDeviceMgr because ExternalLbDeviceMgrImpl :: start() was getting multiple times during management server satrtup. The reason for this is that this is the baseclass for F5 and NetScalarElement.
- This caused us to schedule the ExternalNetworkUsageTask multiple times
- Also we have LBRulesMgr calling this ExternalLbDeviceMgrImpl  by creating an instance of this class which is declared abstract
- Hence having a separate implementation to manage the network usage stats should solve this.
2012-02-21 17:16:07 -08:00
Alena Prokharchyk 2e9511e2ae Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network
Reviewed-by: Chiradeep
2012-02-21 15:39:49 -08:00
Alena Prokharchyk 12b79da6c2 bug 13903: return vm's hostName as a displayName when displayName is null in bunch of api responses
status 13903: resolved fixed
Reviewed-by: Kelven Yang
2012-02-21 10:46:00 -08:00
Alena Prokharchyk 4dea695e09 bug 13871: use perzone and peraccount (no spaces in values) when compare source nat capabilities
status 13871: resolved fixed
Reviewed-by: Chiradeep Vittal
2012-02-21 10:06:29 -08:00
abhi 8213a2e225 bug 13884: fixing spell vm.destroy.forcestop 2012-02-21 10:06:44 +05:30
Alena Prokharchyk 50fc52ee9b bug 13854: don't allow to remove network offerings if its in use by existing networks
status 13854: resolved fixed
Reviewed-by: Alex Huang
2012-02-17 12:58:54 -08:00
kishan 9c5fb5f199 Bug 13741: Added new Config category Secure. Any config in secure category will encrypted along with the Hidden category configs
Status 13741: resolved fixed
Reviewed-By: Nitin
2012-02-17 16:42:32 +05:30
Alena Prokharchyk 13f4d92d2a bug 13813: fixed network offering search to use traffic type when locate physical network in the zone
status 13813: resolved fixed
Reviewed-by: Frank
2012-02-16 10:40:00 -08:00
abhi eb105fb06b Bug 13471: disabling agent lb 2012-02-15 12:12:23 +05:30
Alena Prokharchyk 26d272021f Guest cidr is optional for Advance zone (zone can have just Shared networks) 2012-02-10 10:45:05 -08:00
Alex Huang 166790ad70 propagate fix from 2.2.14 2012-02-09 16:44:55 -08:00
prachi 05af078358 Bug 8791 - user dispersing allocator
Changes:
To migrate systems using 'use.user.concentrated.pod.allocation' as true and 'vm.allocation.algorithm' as true, we need to
add following changes:

- There will be 5 values to 'vm.allocation.algorithm': 'random', 'firstfit', 'userdispersing', 'userconcentratedpod_random', 'userconcentratedpod_firstfit'
- 'userconcentratedpod_random' means we apply user concentration to pods and clusters. To hosts and pools we use random ordering.
- 'userconcentratedpod_firstfit' means we apply user concentration to pods and clusters. To hosts and pools we use firstfit ordering.
2012-02-08 17:03:38 -08:00
Sheng Yang 18ec438793 Revert zone guest cidr setting 2012-02-08 15:54:16 -08:00
abhi 44c172bdc2 bug 12980: added trust store for ssl 2012-02-08 13:07:19 +05:30
prachi dbe2305352 Bug 13099 table physical-network-traffic-types needs to be updated when xen network device setting is modified in the global settings
Changes:
- We do not need these global setting anymore. These will be hidden since 3.0
- The default traffic label will be picked from the global setting which is null by default. When traffic label is null it means the resource uses tag on the default gateway
- Changes to invoke discoverer to reload the resource object on host connection
- Since a zone can have many physical networks, there can be multiple guest, public networks. Only the zone wide storage and management traffic label will be stored in host_details henceforth.
- If traffic labels are updated, discoverer should update the host_details
2012-02-07 18:41:23 -08:00
Nitin Mehta ce26703e5c Bug 13059: Make DB changes to list top consumed resources for enabled resources only. For this introdiuced a new state called capacity state in the op_host_capacity table and would be updated on every operation of zone pod cluster and host
Reviewed-By: Kishan
2012-02-07 20:53:25 +05:30
abhi 74f1a821a4 bug 13134: added encryption for ldap password 2012-02-06 16:31:58 +05:30
abhi 59c7150af7 bug 13439: full sync at management server restart, disabling hourly sync 2012-02-06 15:01:44 +05:30
frank 074d33d9f3 DB upgrade for Bug 6849 - Randomize systemvm passwords 2012-02-03 17:40:07 -08:00
frank 890bfffe2f Bug 6849 - Randomize systemvm passwords (edit)
status 6849: resolved fixed
2012-02-03 17:28:58 -08:00
Alena Prokharchyk 1490e45a1c Fixed format style in a bunch of files (replaced tabs with spaces as a part of it) 2012-02-03 13:49:11 -08:00
prachi 65b7a27407 Bug 13229 - Network Usage - Netscaler - NetworkUsage not being called when Lb rules are deleted and when releasing the Ip adress that has Lb rules.
Reviewed-by: Kishan

Changes:
- When an LB rule is deleted or the IP address having an LB rule configured is released, ExternalNetworkUsageCommand is fired to gather the usage
accumulated on that IP after the last run of the ExternalNetworkUsage job.
2012-02-02 17:23:51 -08:00
Alena Prokharchyk 879ab9a5cc More logging to domain checker 2012-02-01 11:07:13 -08:00
Alena Prokharchyk 07545236d7 bug 13381: fixed update availablity for network offering
status 13381: resolved fixed
2012-01-31 11:49:09 -08:00
Alena Prokharchyk cd56bf9f60 Only Virtual Router can be specified as a provider for the Firewall service 2012-01-30 15:26:43 -08:00
Kelven Yang cb959aa377 bug 13369: recycle roger hung worker VMs in vCenter 2012-01-30 14:21:56 -08:00
Alena Prokharchyk 529d0706e1 SpecifyVlan should always be true for shared network offerings and for network offerings with specifyIpRanges=true
SpecifyIpRanges should always be true for Shared network offerings
2012-01-30 12:34:49 -08:00
kishan 8f2cf82b24 Bug 12996: Removed createConfiguration API command
Status 12996: resolved fixed
Reviewed-By: Nitin
2012-01-30 14:36:50 +05:30
Edison Su 5e2f02fdd5 bug 13315: add httpproxy support in ssvm, only basic auth. User can add secstorage.proxy = http://username:password@hostname:port
status 13315: resolved fixed
2012-01-26 18:46:44 -08:00
frank c40a421eb6 Bug 13250 - Not able to start System Vms when 2 physical networks are configured
if admin didn't specify storage traffic type before enabling zone, create default
storage traffic type with the same configuration of mgmt traffic type.

UI need a warning to admin, will file another bug for this

status 13250: resolved fixed
2012-01-26 14:06:34 -08:00
Alena Prokharchyk 3b1db5fa20 bug 13203: removed firewall.rule.ui.enabled global config
status 13203: resolved fixed
2012-01-25 16:49:31 -08:00
prachi 03653b936e NAAS Changes: Before enabling a Zone, Check if the zone has:
- For Advance zone,  a physical Network with Public/Management trafficType
- For Basic zone,  a physical Network with Management trafficType
2012-01-20 17:21:53 -08:00
Alena Prokharchyk 8bcf30da85 bug 12869: more changes to NAAS feature 2012-01-20 14:16:30 -08:00
Alena Prokharchyk ff1e8413f1 1) Added StaticNat/Firewall/Lb capabilities to Netscaler element. Renamed it to "NetscalerElement" from NetscalerLoadBalancingElement as it serves more services now
2) Added elasticIp and elasticLb network capabilities. Provided support to create network offering with these capabilities.
3) Added one more default network offering having elasticip and elasticlb
4) Public network support to Basic zone. You can associate/disassociate IP addresses now
2012-01-19 13:56:59 -08:00
prachi 1e675f45ba Bug 11593 - CIDR conflicts with zone when extending pod but not when creating it
Changes:
- Now we validate Pod's CIDR only against other Pod's CIDR. No need to validate against guest CIDR and
public vlan CIDR.
2012-01-18 11:33:49 -08:00
Alena Prokharchyk 56b3561033 bug 12856: network offerings with services w/o providers support
status 12856: resolved fixed
2012-01-17 16:17:09 -08:00
prachi 189822da50 Bug 12592 - createZone: zone should be added in Disabled state
- Zone will be Disabled by default when created using createZone API
2012-01-17 14:56:21 -08:00
Alena Prokharchyk 83400cd15f bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account
status 12776: resolved fixed
2012-01-17 13:40:37 -08:00
Alena Prokharchyk c87c3bc665 bug 12065: verify that provider supports service capability
status 12065: resolved fixed
2012-01-17 12:39:07 -08:00
kishan bad573168e Bug 12639: while logging events, hide value for configs containing password string in config name
Status 12639: resolved fixed
Reviewed-By: Nitin

Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-01-17 15:45:00 +05:30
Abhinandan Prateek e6161ac502 bug 12979: anonymous searches now allowed 2012-01-16 20:03:00 +05:30
Nitin Mehta 8a3a4ab9c0 bug 13096 Make capacity deletion for pod deletion more robust.
Reviewed by : Kishan.
2012-01-16 14:29:51 +05:30
frank f4de2b2cd8 Bug 12956 - Working folder not writeable
change default mount path of OS where mgmt server is running to /var/lib/cloud/managment/mnt
as /var/lib/cloud/management is home directory of user 'cloud', mgmt server can have full permission
to manipulate it

status 12956: resolved fixed
2012-01-12 17:32:14 -08:00
Kelven Yang b1376e1f04 bug 13021: add a global configuration variable to let control default network adapter type inside system VMs 2012-01-12 14:21:11 -08:00
Edison Su 9bcb2affff bug 12139: add a way to specifiy which hypervisor used to start system vm:
Admin can either configure system.vm.default.hypervisor which is a global configuration for all zones, or call updatezone add defaultSystemVMHypervisorType
status 12139: resolved fixed
2012-01-10 15:11:50 -08:00
Alena Prokharchyk b1c60b9d60 bug 12964: createPhysicalNetwork/addTrafficType is no longer a part of createZone API 2012-01-10 13:55:09 -08:00
Sheng Yang 4d82413a66 Remove the check against guest network when adding pod
Seems we don't want to do this.
2012-01-09 16:50:48 -08:00
Sheng Yang 5886109fb9 bug 12556: Check guest network cidr when add pod 2012-01-09 16:42:57 -08:00
Sheng Yang 861fdbee17 bug 12556: Add more CIDR checking when create network with specify CIDR
Pod and vlan creation have already got them.

status 12556: fixed resolved
2012-01-09 16:27:00 -08:00
Alena Prokharchyk adaea570e4 bug 12934: added name to physical network
status 12934: resolved fixed
2012-01-09 14:20:37 -08:00
Sheng Yang 90066f1c12 Remove conserve-mode restriction
Multiply provider can be used for conserve mode.
2012-01-06 13:44:19 -08:00
frank ea422af8a9 Bug 12777 - Add storage network configuration into CloudStack
Let StorageGuru inherit PodBaseNetworkGuru
2012-01-06 11:07:14 -08:00
frank f72940e041 Bug 12777 - Add storage network configuration into CloudStack
most finish
2012-01-06 11:06:18 -08:00
Sheng Yang 5e60228d2b bug 12656: Add conserve mode for network offering
Conserve mode means, we can use same IP for different purposes, in order to
"conserve" ip resources. But in this offering, all the service providers should
be the same, and the network created from this offering may be prohibited from
update to different network offering whose services are provided by different
service providers - because different service providers would need different IPs
for different services.

If user want to update the "conserve mode" network with the network offering
that has different service providers, each public IP should have only one usage,
only them the update is allowed.
2012-01-05 21:08:23 -08:00
Kelven Yang dcdd87b30f bug 12709: add management server active fencing 2012-01-05 15:00:35 -08:00
Kelven Yang 85ad8ffca3 rename com.cloud.identity package to com.cloud.uuididentity as a previous deleted com.cloud.Identity name make git confused with com.cloud.identity under linux systems 2012-01-05 14:52:16 -08:00
Alena Prokharchyk e1cf8e4933 Added new parameter to listCapabilities identifying if regular user can create projects 2012-01-05 13:32:36 -08:00
Alena Prokharchyk d4e0fbda83 bug 12686: added search by zoneId to the listNetworkOfferings 2012-01-04 12:31:59 -08:00
Jessica Wang 64a54f32a5 bug 12199: error message returned from API shouldn't include double quote. That's invalid JSON format. 2012-01-03 17:53:47 -08:00
Alex Huang 37e7c3d125 bug: 12805 Moved the managers into the right order 2011-12-29 16:42:03 -08:00
Naredula Janardhana Reddy 812b4782a2 Bug 9237: Checking private ip range with public ip range overlap and viceversa while adding physical resources.
Reviwed by: Abhi
2011-12-28 12:11:34 +05:30
anthony fea9ca582c SWIFT : add listSwift api 2011-12-21 16:55:08 -08:00
anthony 2d2505d449 bug 12322: SWIFT, update template_zone_ref after update template to swift
status 12322: resolved fixed
2011-12-21 11:20:38 -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
kishan a2ed3fa5e2 bug 12337: encrypt Hidden category config values only
reviewed-by: Abhi
2011-12-20 15:07:22 +05:30
kishan cfb48fb7b7 bug 12337: encrypt Hidden category config values only 2011-12-20 13:01:06 +05:30
Alena Prokharchyk 4cb6fcc17a bug 12591: fixed updateDomain
status 12591: resolved fixed
2011-12-16 11:54:47 -08:00
Alena Prokharchyk be696bd283 No guest vlan is requried when add public IP range 2011-12-15 14:56:32 -08:00
Prasanna Santhanam dac505194c Changes to PhysicalNetworkTrafficType to accomodate the simulator hypervisor type 2011-12-15 19:12:21 +05:30
kishan c3ed426837 bug 12206: Added op_user_stats_log table to store historic user stats. Network stats update thread will update aggregate bytes and log the entry in this table. Mgmt server with min id will run this job.
status 12206: resolved fixed
reviewed-by: Nitin
2011-12-15 16:46:41 +05:30
Sheng Yang ab50f65ed8 bug 12483: Discard zone's cidr
status 12483: resolved fixed
2011-12-14 17:23:24 -08:00
Alena Prokharchyk 2d169039ff firewall.rule.ui.enabled is Enabled by default 2011-12-14 16:42:58 -08:00
Sheng Yang 3263fd596e bug 10904: add a global config to enable/disable automatically add the vm to the default security group
status 10904: resolved fixed
2011-12-13 14:48:44 -08:00
kishan f3cd93f835 bug 11899: Added events for Zone create, update and delete
status 11899: resolved fixed
reviewed-by: Nitin
2011-12-13 19:29:44 +05:30
kishan bc32e0e60c bug 12245: Added config parameters custom.diskoffering.size.min, custom.diskoffering.size.max. Added check while adding volumes with custom offering.
status 12245: resolved fixed
reviewed-by: Nitin
2011-12-13 15:04:37 +05:30
Abhinandan Prateek a703315d34 bug 12348: fixed getting VMs for a cluster which was not getting back VMs in starting state 2011-12-13 12:20:48 +05:30
Alena Prokharchyk 3a94a41baf bug 12305: drop max_connections from the network offering as this information is being set on network element level now
status 12305: resolved fixed
2011-12-09 09:00:08 -08:00
Alena Prokharchyk bde5e16a26 bug 12453: when networkId is specified, don't check if the network created from Required network offering is present
status 12453: resolved fixed
2011-12-08 14:38:21 -08:00
kishan 4c142565c8 bug 12436: Add new parameter external.network.stats.interval
status 12436: resolved fixed
reviewed-by: Nitin
2011-12-08 12:28:52 +05:30
frank 6e35f93208 Bug 11939 - unify components.xml and components-premium.xml into components.xml
more fix
2011-12-07 13:52:17 -08:00
Sheng Yang c05b4dbfb8 Add router.check.interval configuration for interval of checking redundant router status 2011-12-06 17:05:41 -08:00
Alena Prokharchyk 9c6a56a61b Fixed NPE in createNetworkOffering with capabilities set 2011-12-06 14:59:32 -08:00
Nitin Mehta 5def0bc567 bug 12129: Disable validation of router.stats.interval in the global configuration since it can have negative values.
Reviewed by : Kishan.
2011-12-06 18:35:03 +05:30
anthony 2478b20f74 set fully cluster sync to 1 year interval 2011-12-05 18:14:23 -08:00
Alena Prokharchyk 7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
Murali Reddy 974dc62a2b added support for dynamic load balancer provisioning when netscaler SDX is added 2011-12-05 00:06:45 -08:00
Prasanna Santhanam e365e64afe Fixing build. removing windows chars 2011-12-05 10:41:24 +05:30
Abhinandan Prateek c4f624e7c9 bug 8313: ldap authentication, still need to fix the MD5 encoded password, cuurent authenticator only works with plaintext password 2011-12-04 15:11:06 +05:30
Naredula Janardhana Reddy 09905b641b bug 10617: merge code from branch bug10617. 2011-12-01 14:17:52 +05:30
Naredula Janardhana Reddy e4b5a62402 bug 10796: merging code from branch 2011-11-30 15:03:43 +05:30
Alena Prokharchyk 7ea6082f22 PhysicalNetworkId is not required in listNetworkServiceProvider call 2011-11-29 10:47:03 -08:00
Alena Prokharchyk 6e3cbaab6f SecurityGroupProvider is added automatically in Disabled state during the zone creation 2011-11-29 10:13:02 -08:00
Alena Prokharchyk ecd7004f15 bug 11978: don't allow passing -, + and spaces for instance.name config param
status 11978: resolved fixed
2011-11-28 11:52:46 -08:00
Alena Prokharchyk 102f460458 Fixed updateConfiguration - updateHostDetails used to swallow the exceptions 2011-11-28 11:52:45 -08:00
Nitin Mehta cdd94c1b9a bug 11811: Introduce a global config to disable extraction altogether for all users except root admin. Make changes so that volumes are based out of ISO. Take care of upgrade as well for this global config.
Reviewed by : Kishan.
2011-11-24 00:12:24 +05:30
Nitin Mehta e034e3d7a3 Revert "bug 11811: Changing permissions for extraction of volumes based out of isos."
This reverts commit 9ed2be7ecda7c0bad05aec8e0213e95507ad9be6.
2011-11-23 18:38:37 +05:30
Abhinandan Prateek da20d33e27 bug 11910: full sync will only stop unknown VMs on agent 2011-11-23 16:48:12 +05:30
Murali Reddy beb38c8310 making devices enabled independent of config commands
adding default device capacity when admin does not specify a vlaue
fixed bug in device allocation logic
2011-11-22 19:52:07 -08:00
Alena Prokharchyk 74f217e1d0 Introduced new parameter to listNetworkOfferings API - sourceNatEnabled (Boolean). 2011-11-22 10:54:29 -08:00
Alena Prokharchyk e014426889 Added global flag defining if the regular user is allowed to create a project 2011-11-22 10:04:32 -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
Nitin Mehta 57aa7dec91 bug 11811: Changing permissions for extraction of volumes based out of isos.
As per the new design following would be done.
(a) any ISO-derived disk can be extracted
(b) there will be a global config to disable  extraction of ISO based volumes.
That way people concerned about (a) can just use (b) to fix it.
Reviewed by : Kishan.

status 11811: resolved fixed
2011-11-21 16:58:09 +05:30
Alena Prokharchyk 1871de3048 bug 11853: better error message when try to add VPN user with duplicated user name
status 11853: resolved fixed
2011-11-18 15:49:18 -08:00
Alena Prokharchyk 5ea4133d7b createNetworkOffering: verify that individual services can be enabled for each provider specified for the network offering 2011-11-18 14:46:10 -08:00
prachi b8b08555e6 Removing garbled characters. 2011-11-18 13:35:48 -08:00
Abhinandan Prateek 8d61329fdc fixing a typo 2011-11-18 11:30:58 +05:30
prachi 313e6ca284 Bug 8791 user dispersing allocator
Changes:
- Added a two new deployment planners  'UserDispersingPlanner' and 'UserConcentratedPodPlanner' to the DeploymentPlanners
- Planner can be chosen by setting the global config variable 'vm.allocation.algorithm' to either of the following values:
('random', 'firstfit', 'userdispersing', 'userconcentratedpod')
- By default, the value is 'random'. When the value is 'random', FirstFitPlanner is invoked as before that shuffles the resource lists.
- Now Admin can choose whether the deployment heuristic should be applied starting at cluster or pod level. This can be done by using the
global config variable 'apply.allocation.algorithm.to.pods' which is false by default. Thus by default as earlier, planner starts at clusters directly.

'UserConcentratedPodPlanner' changes:
- Earlier to 3.0, FirstFitPlanner used to reorder the clusters in case this heuristic was chosen.
- Now this is done by a separate planner and is applied only when 'vm.allocation.algorithm' is set to this planner
- It reorders the capacity based clusters/pods such that those pods having more number of Running Vms for the given account are tried first.
- Note that this userconcentration is applied only to pods and clusters. Not to hosts or storagepools within a cluster.

'UserDispersingPlanner' changes:
- 'UserDispersingPlanner' reorders the capacity ordered pods and clusters based on number of 'Running' VMs for the given account in ascending order. Aim is to choose thodes pods/clusters first which have less number of Running VMs for the given account
- Admin can provide weights to capacity and user dispersion so that both parameters get considered in reordering the pods/clusters. This can be done by setting
the global config parameter 'vm.user.dispersion.weight'. Default value is 1. Thus if this planner is chosen, by default, ordering will be done only by number of Running Vms, unless the weight is changed.
- HostAlllocators and StoragePoolAllocators also reorder the hosts and pools by ascending order of number of Running VMS/ Ready Volumes respectively for the given account. Thus try to choose that host or pool within a cluster with less number of VMs for the account.
2011-11-17 18:29:39 -08:00
Alena Prokharchyk 337c07c0d1 Default gateway service to sourceNat service in the API 2011-11-17 16:28:10 -08:00
Alena Prokharchyk 339e72d414 Introduced "supportedServices" parameter to createNetworkOffering API. This parameter replaces old parameters: dhcpService, gatewayService, etc. 2011-11-16 11:17:07 -08:00
Kelven Yang 277c60e4f6 bug 11814: Allow template to have details info in key/value pairs. 2011-11-15 15:01:46 -08:00
Murali Reddy 0b05badaaa bug 11817: NAAS external network device support
-made Netscaler, SRX, F5 network elements as pluggable service
   -added abstract load balancer device manager ExternaLoadBalancerDeviceManager
   -made both F5 and Netscaler pluggable service to extend ExternaLoadBalancerDeviceManager
   -added abstract firewall device manager ExternalFirewallDeviceManager
   -made SRX pluugable service to extende ExternalFirewallDeviceManager
   -added API's to configure and manage netscaler devices
2011-11-15 12:18:59 -08:00
Alena Prokharchyk bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
prachi d7ae15beea - Fixed missing UUId in listNetworkServiceProviders API
- BroadcastDomainRange will be 'POD' for 'basic' zone and 'ZONE' for an advance zone.
2011-11-14 17:39:09 -08:00
Alena Prokharchyk 87f5150e38 Basic zone is fixed and works with new NaaS now 2011-11-14 10:46:05 -08:00
Alena Prokharchyk daec18b4ae All default network offerings come as Enabled by default 2011-11-11 11:56:10 -08:00
Naredula Janardhana Reddy f1b99f4f07 Revert "bug 10617: merging code from branch bug10617"
This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
2011-11-11 20:23:26 +05:30
Alena Prokharchyk 039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account -
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
2011-11-10 18:34:56 -08:00
Sheng Yang bde1f6d2de Merge branch 'networkasservice'
Conflicts:
	api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
	api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	setup/db/create-schema.sql
2011-11-10 16:36:08 -08:00
Alex Huang d6c22c42fe Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-11-10 15:26:39 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Naredula Janardhana Reddy 02adbd4bd3 bug 10617: merging code from branch bug10617 2011-11-10 15:23:48 +05:30
Sheng Yang 4ea3aaeb18 NaaS: Add checking for gateway service in update network offering 2011-11-09 19:14:16 -08:00
Murali Reddy 53a636518f NAAS: changing sharedsourcenat capability to sourceNat service and changin serviceCapablityList parameter to one level map 2011-11-09 18:44:18 -08:00
Sheng Yang 47114af94b NaaS: Add redundant capability for Gateway service 2011-11-09 17:09:46 -08:00
Sheng Yang bc86800d30 NaaS: Remove Redundant Virtual Router element
Would use capability instead.
2011-11-09 17:09:38 -08:00
Sheng Yang d6d878c250 NaaS: Refactor capability map of network offering 2011-11-09 17:09:30 -08:00
Alena Prokharchyk 8d128fa737 bug 11573: made network wait timeout configurable
status 11573: resolved fixed
reviewed-by: Alex Huang

Conflicts:

	setup/db/db/schema-2212to2213.sql
2011-11-09 13:14:27 -08:00
Murali Reddy aaf3b99228 NAAS: fixing NPE in createnetworkoffering with out service capabilities specified 2011-11-09 11:51:04 -08:00
Murali Reddy db991dd8f6 NAAS : adding support for service capabilities to be specified as part of network offering 2011-11-08 13:01:44 -08:00
Alena Prokharchyk 5e6fedb7ff Removed unused code 2011-11-08 10:36:29 -08:00
alena 3a845d2d75 Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created) 2011-11-07 16:16:03 -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
frank d6db4a686e Bug 11313 - Add an account param/detail/map in the XXXAccount API calls
status 11313: resolved fixed
2011-11-07 14:24:36 -08:00
alena 17a7b7cda4 listNetworkOfferings: added an ability to filter based on the Services supported 2011-11-07 10:53:28 -08:00
alena 7aab227b37 Added one more default network offering - with guestType=Isolated and with DNS/DHCP/USERDATA services supported 2011-11-07 10:50:42 -08:00
prachi 5f93665a30 - Send network labels to hypervisor recource during processConnect
- Create Default physicalnetwork and add traffic types while creating a zone
- DeleteProvider should error out if there are networks using the provider.
- Other validations
2011-11-04 17:57:05 -07:00
Sheng Yang 3051dc2621 NaaS: Discard DhcpElement
VirtualRouterElement would do all the job. The difference would be public
network enabled or not.
2011-11-04 14:13:55 -07:00
Chiradeep Vittal 81a9e05b39 bug 11336: limit the number of outstanding messages sent to a host to conserve memory 2011-11-04 11:35:57 -07:00
Murali Reddy 7b51782163 bug 11817: NAAS: extenal LB/firewall device support
-introducing the notion of capacity of LB device
 -managing network to device mapping
2011-11-03 11:19:55 -07:00
frank 92edf56ccc Bug 7883 - Add support to allow admins to sort templates, isos, offerings...
status 7883: resolved fixed
2011-11-03 10:54:00 -07:00
Kelven Yang f5d56b3d5d Fix problems caused by merging 2011-11-03 10:35:25 -07:00
Kelven Yang 79e39c20fb Fixes on merged result 2011-11-03 07:34:01 -07:00
Kelven Yang 8d8775b533 bug 6745: Using UUID instead of integers - for Async Jobs 2011-11-03 07:33:58 -07:00
Kelven Yang fa2dd8e93a bug 6745: Using UUID instead of integers - for VM instances 2011-11-03 07:33:56 -07:00
Abhinandan Prateek fab2d1f880 bug 11678: added vm.destory.forcestop config var to set force when destroying a vm 2011-11-03 15:51:02 +05:30
Sheng Yang 29b19db152 NaaS: Fix createNetworkOffering with multiply service providers 2011-11-02 19:08:49 -07:00
Sheng Yang b646f07f9c NaaS: Add back service offering ID for network offering
It would be used to adjust service offering of virtual router
2011-11-02 19:08:37 -07:00
anthony b4f8c85f20 Swift: add Swift Manager 2011-11-02 18:45:55 -07:00
alena 3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -07:00
alena f42c9e434f Basic zone: the System Guest network offering can be created from any Shared Guest network offering.
Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created
2011-11-02 15:44:53 -07:00
Sheng Yang 3fc9b149e4 NaaS: Add portforwarding and staticnat service provider
Make them service rather than capability of firewall. Now firewall only means
open/close the port.
2011-11-02 15:18:39 -07:00
alena 4ce2bf2f89 SourceNat service is supported for Isolated network offerings only 2011-11-02 11:52:23 -07:00
prachi 6aa743165a Changes to support Enable/ Disable services of a service provider added to physical network:
- ListSupportedNetworkServiceProvidersCmd will now return Providers along with its element's services and boolean 'canEnableIndividualServices' that indicates if for this Provider services can be enabled/disabled
- add & update NetworkServiceProvider changed to take in the list of services to enable. While adding a provider, if list is null then all services supported by the element are enabled by default.
- ListNetworkServices enhanced to take in a provider name and returns services of that specific provider.
2011-11-01 18:03:55 -07:00
alena 2250dff349 1) Removed tags from the network object
2) Get hypervisor tags from the physical network instead.
2011-11-01 17:42:06 -07:00
alena be21a5e37c Don't allow enabling securityGroup service for Isolated networks 2011-11-01 13:09:14 -07: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
Sheng Yang a43364f0a4 NaaS: Rename virtual_router_elements to virtual_router_provider 2011-10-31 15:59:53 -07:00
anthony 46dac852fa Merge branch 'swift'
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
prachi 818df189c5 changes to Create Vlan & Public IPs 2011-10-31 09:53:25 -07:00
Murali Reddy e449067a4a Bug 9831: Implement resourceCount periodic task that would check if the count in resource_count table matches actual resource count
status 9831: resolved fixed

   added a periodic task that does recalculation of counts. By default interval is set to 0, which will be interpreted as not to run task
2011-10-31 18:26:21 +05:30
Nitin bbbfdd52ec bug 10848: Minor fixes. 2011-10-31 17:00:11 +05:30
Nitin 2b370ab535 bug 10657: Introducing cluster level global thresholds for cpu and ram so that these resources do not go beyond these thresholds. The reason for this is because, if the admn needs to provide maintenance, they don't have to add new machines or have ones on standby if the entire zone/pod/cluster is at 100% allocated capacity. Also introducing pool level global thresholds for allocated storage. There are other changes like DB upgrade and introduction of transaction. 2011-10-29 16:51:37 +05:30
alena 7b982efeaa Fixed Advance zone creation with security group enabled 2011-10-28 10:24:37 -07:00
prachi 1583211352 Fixing build after removing physicalNetworkId from createvlanIpRangeCmd 2011-10-27 17:42:42 -07:00
prachi 6d5601a84d Added commands and framework for PhysicalNetwork trafficTypes 2011-10-27 17:32:15 -07:00
alena d315e57b0e Renamed "type" to "guestType" 2011-10-27 16:51:42 -07:00
alena fe0b685e95 Security group is a service now 2011-10-27 16:49:20 -07:00
anthony 4116d0d4e4 Swift : bug fix 2011-10-27 16:04:18 -07:00
alena cb329095b1 When restartNetwork, just shutdown/implement elements and rules, no need to shutdown/implement the network itself. 2011-10-27 10:47:41 -07:00
Nitin 9027263c42 bug 10848: DB upgrade changes for dashboard work 2011-10-27 11:24:18 +05:30
Nitin 70aae9666b bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows. 2011-10-27 11:23:26 +05:30
Nitin 9ba4b7073e bug 10893: Adding config vlaue conventions. 2011-10-27 11:22:53 +05:30
Nitin 30793ff08b bug 10893: Adding config vlaue conventions. 2011-10-27 11:22:36 +05:30
Nitin 4b21650e23 bug 10848: Removing NPE from listCapacity and new alert code. Adding CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP. Introducing thresholds for vlan and direct attached public ips. 2011-10-27 11:21:50 +05:30
Nitin 2fc5cc73ba bug 10945: Start using the new alert system. Also introduce secondarystorage.capacity.threshold 2011-10-27 11:20:59 +05:30
Nitin cfebce78b0 bug 10848: Removing the Host Capacity Checker thread which checks for skipcounting hours and also keeps host's CPU and Memory in sync. This work would be done by capacity checker thread now. 2011-10-27 11:18:25 +05:30
Edison Su 121850bcb5 bug 11598: secstorage.vm.mtu.size, by default it's 1500. After change this configuration, need to restart mgt server, and restart secondary storage to take effect.
status 11598: resolved fixed
2011-10-26 14:48:56 -07:00
Murali Reddy a48ee9c568 add support for multiple provider instanes per physical network
refactor NetworkDevicemanager and ExternalnetworkdeviceManager in to one single manager
2011-10-27 03:07:30 +05:30
anthony b91dce4f8a Swift: add listtemplate for swift
add swift configuration
2011-10-25 20:21:27 -07:00
prachi 809f9d965e Fixed NetworkMgr: getNetworkCapabilities.
The key used to get the capabilities from the provider capabilities map was wrong.
2011-10-25 18:51:20 -07:00
alena 525a0a7675 1)Changed implementation for restart network: call shutdown/implement methods as a part of it
2)Re-apply all existing firewall rules as a part of implement call. TODO: Cleanup all existing rules from the backend (leave them in the DB) as a part of shutdown call
2011-10-25 18:24:24 -07:00
prachi 766c898504 Changes: DeletePhysicalNetwork changes and Configuring NetworkMgr to hold map of providers -> elements 2011-10-24 18:03:18 -07:00
alena 75c8e33226 Removed guestIpType from network/networkOffering 2011-10-24 17:05:00 -07:00
Kelven Yang fc3d93e3e7 bug 9614: let root volume use IDE disk controller by default to ensure backwards compatibility with existing CloudStack deployments 2011-10-24 15:28:51 -07:00
kishan 83b4d2f7f9 bug 5822, 10783: Security enhancements initial checkin. Added encryption support to db.properties and some DB values. 2011-10-24 10:26:02 +05:30
Kelven Yang 443c175793 bug 9614: enable SCSI device controller for root disk.(default root disk controller type can be conifgured through global configuration) 2011-10-21 18:44:56 -07:00
alena abca3dda9d Added ability to list network offerings availabe for network upgrade using listNetworkOfferings command with "networkId" parameter.
Limitations:

* can't upgrade to the network offering with lesser number of services
* can upgrade only when the service provider of the original offering is not external (domR, dhcp, elb) to the external type of the provider
2011-10-21 15:36:01 -07:00
Murali Reddy aa808f5685 -Added LB serive provider (seperating it out from Firewall service provider)
-Bringing add/delete/list of all external network devices under one unified API's (addNetworkDevice, deleteNetworkDevice, listNetworkDevice)
-Refactoring External network manager to work from both sets of API's add/delete/list NetworkDevice and add/delete/list External Firewall/LoadBalancer
2011-10-21 18:15:36 +05:30
alena 219978a9be Create network using physical network id 2011-10-20 18:25:13 -07:00
Sheng Yang 2ebb719aba NaaS: Add configuration for virtual router elements 2011-10-20 13:59:23 -07:00
Sheng Yang 04f106a595 NaaS: Configure commands for DhcpElement, VirtualRouterElement and RedundantVirtualRouterElement
Add configure command for these virtual router based elements. The commands
should be different for different elements.

The context of configuration would be added later.
2011-10-20 13:58:54 -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
Abhinandan Prateek 1ea9b5d703 bug 10588: putting config param for cluster sync intervals 2011-10-20 10:51:40 +05:30
alena c5acad39d9 Make Guest Direct security group enabled network offering system by default - we'll make it non-system after getting rid of Basic/Advance zone concepts 2011-10-19 17:34:21 -07:00
alena ceda05298e Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead 2011-10-19 16:38:39 -07:00
frank 8decef98fd Bug 11741 - there is no ovm.public.network.device, ovm.private.network.device, ovm.guest.network.device in global configure page
status 11741: resovled fixed
2011-10-14 11:42:54 -07:00
alena c00058adc2 Added type (Shared/Isolated) to the networkOffering/networks 2011-10-13 17:33:41 -07:00
alena 2d228dfcbb Default service provider to VirtualRouter (should make this parameter configurable in the future) 2011-10-12 18:02:35 -07:00
alena 7433d5314a 1) Refactored networkOfferings:
* moved all services to the separate table, map them to the network_offering+provider.
* added state/securityGroupEnabled properties for the networkOffering
* added ability to list by state/securityGroupEnabled in listNetworkOfferings api command

2) New service: SourceNat
2011-10-12 16:38:59 -07:00
prachi 8570b25506 NAAS: APIServer changes to introduce framework to read commands from pluggable components having separate commands.properties file
Changes:
- Added a new interface 'PluggableService'
- Any component that can be packaged separately from cloudstack, can implement this interface and provide its own property file listing the API commands the component supports
- As an example have made VirtualNetworkApplianceService pluggable and a new configureRouter command is added
- ComponentLocator reads all the pluggable service from componentLibrary or from components.xml and instantiates the services.
- As an example, DefaultComponentLibrary adds the pluggable service 'VirtualNetworkApplianceService'
- Also components.xml.in has an entry to show how a pluggable service can be added, but it is commented out.
- APIServer now reads the commands for each pluggable service and when a command for such a service is called, APIServer sets the required instance of the pluggable service in the coomand.
- To do this a new annotation '@PlugService' is added that is processed by APIServer. This eliminates the dependency on the BaseCmd to instantiate the service instances.
2011-10-11 17:34:57 -07:00
Kelven Yang dce4e74b58 bug 11585: using pre-allocated NIC approach to support additional public interfaces for VMware 2011-10-11 15:40:31 -07:00
Sheng Yang 30d48c40b3 Network as a service(NaaS): Separate redundant virtual router as a standalone element
Since we would introduce a way to specify each service provider in the network
offering, it's better for redundant virtual router as a separate service
provider.

Also isRedundant() flag in the network offering would be removed. Redundant
virtual router temporality won't work from now. Until we're able to add
different network elements/service providers in network_offering.
2011-10-10 15:41:07 -07:00
alena a17570ef51 1)Implemented Suspend/Activate project
2)Email/token based invitation system
2011-10-06 16:10:36 -07:00
alena 25c2734e03 More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
Sheng Yang 1fb5030cca Clean up global redundant_router config item
We would use network_offering option in 3.0 instead.
2011-09-27 16:50:24 -07:00
alena ccd47c1b21 Implemented Project Invitations 2011-09-26 17:47:20 -07:00
Kelven Yang d32241ec9c bug 10971: support vSphere 5 2011-09-26 12:16:28 -07:00
alena 9f9b60a287 1) Added resource limits for the Projects - the same as for the account
2) Added "Project" limit type for the Domain object
2011-09-21 17:09:49 -07:00
alena a1331d1cfc Intermidiate checkin to Project feature:
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
2011-09-20 18:35:28 -07:00
Naredula Janardhana Reddy 10fb507609 bug 11372:
Added two New values "all" and "default" to global config "network.loadbalancer.haproxy.stats.visibility" . With this change, it can take six possible value:
            global - stats visible from public network.
            guest-network - stats visible only to guestnetwork.
            link-local - stats visible only to link local network(for xen and kvm).
            disabled - stats disabled.
            all - stats available on public,guest and link-local. (Newly added)
            default - stats availble on the serving http port, this does need any specific http port.(Newly added)
   Except "default" and "disabled", all the rest of 4 need to configure the stats port.
2011-09-15 11:46:34 +05:30
alena 569427ba1f bug 11036: if resource_count record is missing for account or domain, insert it during the management server startup (with count=0)
status 11036: resolved fixed
2011-09-13 15:23:27 -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
Chiradeep Vittal b52d1157e9 use the new implementation of SG manager 2011-09-12 18:20:22 -07:00
Chiradeep Vittal f41b352d36 revert egress rules implementation pending review
Reverts a19212703b9734ebd44ebf55cfdd81ebdc9d7fe4
Reverts 24e4e44b8f0712a37147a3777833de3f9e24829e
2011-09-12 14:45:58 -07:00
Chiradeep Vittal e216686029 Revert "bug 10617: Intermediate checking"
revert pending review

This reverts commit 561b27565512d438db3d8896df6f97b644b0b498.
2011-09-12 14:45:58 -07:00
Naredula Janardhana Reddy f9b0962ad9 bug 10617: Intermediate checking
Changes :
         - Fixing API doc +response name + errorMessage
         - Adding seperate events to Egress rules
         - Egress rules Using the same database table as that of ingress with new column type.

   Pending Tasks:
         - db upgrade
         - database table rename from security_ingress_rule to generic name, renaming some of the jave class from ingress to generic name.
         - Retesting on kvm
2011-09-09 18:14:19 +05:30
kishan 4e663bbef9 bug 8338: Added usage.aggregation.range parameter. Also included in 2211 to 2212 upgrade 2011-09-09 13:43:13 +05:30
Kelven Yang aa7f06d7eb bug 11384: deprecate vmware.guest.nic.device.type global configuration variable 2011-09-08 16:11:17 -07:00
anthony 4423da06a2 1. added timeout in Command Class, then each command can configure itself timeout, if timeout is not configed, use the default timeout , which is 30 minute
2. added following configurable timeout
       PrimaryStorageDownloadWait("Storage", TemplateManager.class, Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", null),
       CreateVolumeFromSnapshotWait("Storage", StorageManager.class, Integer.class, "create.volume.from.snapshot.wait", "10800", "In second, timeout for create template from snapshot", null),
       CopyVolumeWait("Storage", StorageManager.class, Integer.class, "copy.volume.wait", "10800", "In second, timeout for copy volume command", null),
       CreatePrivateTemplateFromVolumeWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.volume.wait", "10800", "In second, timeout for CreatePrivateTemplateFromVolumeCommand", null),
       CreatePrivateTemplateFromSnapshotWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.snapshot.wait", "10800", "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", null),
       BackupSnapshotWait("Storage", StorageManager.class, Integer.class, "backup.snapshot.wait", "10800", "In second, timeout for BackupSnapshotCommand", null),
2011-09-07 19:17:54 -07:00
prachi 84868b7f9c Bug 11200 - maximum number of guests per host
Changes:
- Adding a new table 'hypervisor_capabilities' that will record capabilities for each hypervisor version. Added db schema changes for this.
- Currently a few capabilities have been added, namely, 'max_guests_limit' and 'security_group_enabled'
- Added a new column 'hypervisor_version' to host table. StartupRouting command now takes in this parameter. It should be set when a host connects.
- If a host's hypervisor version is not present, we find all the capabilities rows for that hypervisor type and use the first record.
- 'max_guests_limit' is the maximum number of running guest Vms that a host can have for the given hypervisor.
- Host Allocators use this limit and skip a host if the number of running VMs on that host exceeds this limit.
2011-09-07 14:53:05 -07:00
alena b883b25a12 bug 11348: make content type for "json" files configurable
status 11348: resolved fixed
2011-09-07 14:22:01 -07:00
anthony 13ee22d421 bug 10078:
1. introduce migratewait in global configuration, the default value is 1 hour
 2. use async xapi VM migration API

status 10078: resolved fixed
2011-09-07 12:36:17 -07:00
alena 47d9cbd2ee bug 11331: allow extending vnet range as a part of updateZone call
status 11331: resolved fixed
2011-09-06 17:40:28 -07:00
alena 0b95ad2f0f bug 11290: insert VPN config values as a part of 229-2210 upgrade
status 11290: resolved fixed
2011-08-29 11:22:42 -07:00
Naredula Janardhana Reddy cbed4c7a44 bug 11253:
Added New value "link-local"  to  global config network.loadbalancer.haproxy.stats.visibility . With this change it can take new parameter "link-local" value apart from the existing 3 values global,guest-network,disabled.
       global -  stats visible from public network
       guest-network - stats visible only to guestnetwork.
       link-local - stats visible only to link local network
       disabled - stats disabled.
2011-08-26 15:21:29 +05:30
alena a11b7de9fe Set firewall.rule.ui.enabled to false by default
Conflicts:

	server/src/com/cloud/configuration/Config.java
2011-08-25 16:12:55 -07:00
Kelven Yang 97a7dddf7d bug 11162: support memory overprovisioning in VMware 2011-08-25 15:38:28 -07:00
alena 35b551a199 bug 11260: Take networkRate for domR's guest and public interface from the corresponding system service offering 2011-08-25 14:15:12 -07:00
Naredula Janardhana Reddy 9feb05ac13 bug 10617: This is Intermediate commit for Egress rules implementation in security groups.
previous commit: c9fda641673df7701f44963ef27e1d488f121219 ( this under bug 1067, typing error)
        changes: 1) partially implemented  listing of egress rules along with ingress rules.
                 2) partially implemneted egress rules for KVM
2011-08-25 12:18:33 +05:30
frank 85f18ff256 fix build, add test rpm back 2011-08-24 13:24:51 -07:00
Naredula Janardhana Reddy 145a4aad37 bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces) 2011-08-24 13:30:23 +05:30
frank b3478c377e Full opensource 2011-08-23 19:52:19 -07:00
alena 8a7feb8ec1 Merge branch '2.2.y'
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
alena 31a022c720 Added networkRate parameter to createServiceOffering api command
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2011-08-22 12:05:34 -07:00
alena 033765f93f Added networkRate parameter to createServiceOffering api command 2011-08-22 12:02:08 -07:00
frank 18f87c2108 Merge branch 'cvm' into 2.2.y
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
Naredula Janardhana Reddy 4369b0ba96 bug 1067:
- covered basic impelementation for xen, need to test corner cases.
      - Not implemneted: kvm, vmware , listing of egress rules.
2011-08-19 11:10:16 +05:30
keshav 8dd86ff803 Added configuration parameter to enable/disable the firewall rule UI. 2011-08-10 18:19:52 -07:00
keshav 57f1ee7ca1 Added configuration parameter to enable/disable the firewall rule UI. 2011-08-10 16:06:32 -07:00
anthony e5e85d05e9 bug 10695: add XCP 1.0 support
status 10695: resolved fixed

Conflicts:

	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
2011-08-09 19:51:32 -07:00
anthony 33b3e02c17 bug 10695: add XCP 1.0 support
status 10695: resolved fixed
2011-08-09 19:49:12 -07:00