797 Commits

Author SHA1 Message Date
Alena Prokharchyk
7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
Sheng Yang
02e0296484 bug 12234: NaaS: Dynamic CIDR for virtual router
bug 12318: NaaS: Dynamic CIDR for virtual router

This patch in fact use ExternalGuestNetworkGuru to replace GuestNetworkGuru. The
problem is the virtual router would normally use 10.1.1.0/8 as CIDR, but when we
want to upgrade to external firewall e.g. Netscaler, the CIDR would need to be
changed to different value e.g. 10.x.x.0/24 based on VLAN, because the external
firewall can not support one CIDR for multiply VLAN right now. So we have to use
the same policy for virtual router.

This patch also add one field "specified_cidr" to the networks table. If this
field is true, then it means user specify the CIDR of this network, thus we can
not granutee the CIDR after upgrade is valid, so we would like to prohibit the
upgrade of network offering.

This should also fix bug 12318. The reason for bug 12318 is the pre-set gateway
address of domR is overrided by ExternalGuestNetworkGuru. After this patch,
ExternalGuestNetworkGuru would respect the existed value in Nic, rather than
simply wiping it out. It would do calcuation to get the relevant address after
VLAN changed.

More clean up can be done in the future, when we proved that this policy change
doesn't break...

status 12234: resolved fixed
status 12318: resolved fixed
2011-12-03 17:32:31 -08:00
frank
22f6ad7566 make vm_template.enable_sshkey default to 0 2011-12-02 15:42:00 -08:00
frank
0d7dc40189 Bug 11689 - Templates need a ssh key enabled attribute
status 11689: resolved fixed
2011-12-02 14:20:08 -08:00
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
628ca6c6d7 bug 11018: removed private_netmask from vm_instance table
status 11018: resolved fixed
2011-11-28 14:15:14 -08:00
kishan
4e8a0a65f8 bug 12187, 12188: Encrypt system, admin user passwords. Use configDao for ssl.keystore. Set configuration init to null instead of false.
status 12187, 12188: resolved fixed
reviewed-by: Abhi
2011-11-28 18:21:20 +05:30
kishan
06ad936192 bug 12134: Added uuid column to cloud_usage account table
status 12134: resolved fixed
reviewed-by: Abhi
2011-11-28 13:05:02 +05:30
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
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
prachi
a8ffd0ea06 Added unique constraint on providername <-> physical network mapping. 2011-11-22 13:11:02 -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
Murali Reddy
54f4ebf08c changes for SRX add/config commands for UI integration 2011-11-21 16:57:41 -08:00
Murali Reddy
c9b2031fa9 changes in add/configure API commands for F5 & Netscaler for UI integration 2011-11-21 13:31:54 -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
frank
284e72fd02 Fix colon in COMMENT of db schema which makes cloud-setup-database failed 2011-11-18 14:09:42 -08:00
Alena Prokharchyk
71ff88f211 bug 12067: set 'extractable' field default value to 0 as a part of 2.2.13 to 2.2.14 db upgrade
status 12067: resolved fixed

Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
	setup/db/create-schema.sql
2011-11-18 13:44:59 -08:00
prachi
b8b08555e6 Removing garbled characters. 2011-11-18 13:35:48 -08:00
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
Nitin Mehta
e39498f1e7 bug 11997: Introduce created and update_time in the op_host_capacity table.
status 11997: resolved fixed
2011-11-17 18:10:59 +05:30
Sheng Yang
3aef381b37 NaaS: Add service provider to server-setup.xml 2011-11-15 17:09:55 -08:00
Edison Su
b2a5e26c06 bug 10792: add default system wide firewall rule
status 10792: resolved fixed
2011-11-15 16:51:30 -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
591ba4f0ae bug 11938: don't index usage tables when do upgrade from 2211 to 2212.
status 11938: resolved fixed
reviewed-by: Frank Zhang

This fix would cover following scenario:

* the customer is upgrading from 2.2.11 to 2.2.13.
* the incorrect indexes are being dropped as a part of 2.2.12 to 2.2.13 upgarde, but we still insert them as a part of 2.2.11 to 2.2.12, and it might lead to the db upgrade failure. The only one way to handle this case - remove them from 2.2.11 to 2.2.12 upgrade path
2011-11-14 16:00:41 -08:00
Naredula Janardhana Reddy
ca3ab3b0ca Revert "Fixed deploydb"
This reverts commit 72844cd6156c37e73fd43eb1b3cecbbbff871eaa.

Conflicts:

	setup/db/create-index-fk.sql
2011-11-14 10:16:51 +05:30
Sheng Yang
cdfac9a5e1 NaaS: Fix UUID of virtual router providers 2011-11-11 13:42:19 -08:00
prachi
da846e9c08 Adding UUID to new entities and API commands. PhysicalNetwork, PhysicalNetworkTrafficType, PhysicalNetworkServiceProviders changed. 2011-11-11 13:23:23 -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
Naredula Janardhana Reddy
3fffff8966 Revert "bug 10617: alter the sequence of add column"
This reverts commit ad17e0970e2a82d5870e455f5616aa9747825d8c.
2011-11-11 20:19:58 +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
Alena Prokharchyk
17cca192c7 Fixed deployDB broken with the merge 2011-11-10 16:47:41 -08:00
Sheng Yang
8b9b2d0f1a Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
Conflicts:
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
2011-11-10 16:40:54 -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
Alena Prokharchyk
c6dc572ebe Fixed deploydb 2011-11-10 16:00:54 -08:00
Alena Prokharchyk
5452705175 Fixed couple of merge db schema bugs 2011-11-10 15:57:19 -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
Murali Reddy
122b62066a bug 11817: NAAS: device allocation logic
- adding a allocation state to device
 - change device allocation logic based on network offering  and device state
2011-11-10 09:55:23 -08:00
Naredula Janardhana Reddy
b53dc42d0a bug 10617: alter the sequence of add column 2011-11-10 15:37:02 +05:30
Naredula Janardhana Reddy
02adbd4bd3 bug 10617: merging code from branch bug10617 2011-11-10 15:23:48 +05:30
Sheng Yang
47114af94b NaaS: Add redundant capability for Gateway service 2011-11-09 17:09:46 -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
kishan
507bc20c03 bug 11938: Removed unique constraint on usage_network_offering table.
status 11938: resolved fixed
reviewed-by: Abhi
2011-11-09 16:28:22 +05:30
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
prachi
8836a08e60 Added tp the table op_dc_vnet_alloc foreign key references to physical_network & data_center 2011-11-08 11:23:37 -08:00