1786 Commits

Author SHA1 Message Date
Hugo Trippaers
0ef61f7967 Set the default provisioning_type to something that doesn't cause NPEs when used. 2014-06-25 15:51:28 +02:00
Nitin Mehta
cb5e8c591f CLOUDSTACK-6987: Add support for storing metadata for snapshot policy and controlling policy using display flag
(cherry picked from commit 5cf8edd7ec22095e70d72486a2380228fb3728af)
2014-06-24 14:07:39 -07:00
Daan Hoogland
c79ab570b0 Revert "CLOUDSTACK-6967: Initial OVM3 drop"
This reverts commit 8a485b9b59e4108e862022baf7477f768380b325.
2014-06-24 10:24:01 +02:00
Daan Hoogland
1087655ca0 Revert "fix up create-schema.sql"
This reverts commit 878b0ac1642925f6362786597facccc3f2ffbdaa.
2014-06-24 10:20:56 +02:00
Ian Duffy
878b0ac164 fix up create-schema.sql 2014-06-23 20:30:59 +01:00
Funs
8a485b9b59 CLOUDSTACK-6967: Initial OVM3 drop
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)

Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js
2014-06-23 12:39:10 +02:00
Upendra Moturi
918c320438 CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value 2014-06-20 12:07:50 +02:00
Damodar Reddy
23280a47b8 CLOUDSTACK-6702 : [Windows]Due to Progress bar changes mysql path was not getting read. Fixing the same.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-06-11 11:25:02 +05:30
Olivier Lemasle
a5902f1db4 CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-10 03:11:35 -04:00
Tim Mackey
a8212d9ef4 Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin
Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-07 04:50:23 -04:00
Alena Prokharchyk
2459f55c23 CLOUDSTACK-6585: added missing db upgrade statements 2014-06-06 11:00:28 -07:00
Nitin Mehta
81d3a9e3ee CLOUDSTACK-6599: Add the column in Java upgrade path since 4.2 already has the extract template/volume columns
(cherry picked from commit be765ce8680564b743a73dd360c590c0e495c204)
2014-05-30 14:56:05 -07:00
Nitin Mehta
5393387bbd CLOUDSTACK-6599:
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls
2014-05-30 10:48:42 -07:00
Rajani Karuturi
dbd05e3ff5 FIXED CLOUDSTACK-6808 Need to add Database Information to Alter table statements in a commit to schema-430to440.sql 2014-05-30 15:02:18 +05:30
Wido den Hollander
6f244f3eac tools: Various fixes to set guest sshkeys script
The script would for example overwrite all existing keys in the
authorized_keys file

Some things in the bash script are also simplified
2014-05-27 12:17:45 +02:00
Wido den Hollander
37874a3fa8 tools: Various fixes to password set script
The exit status of wget was not checked properly since it would
check the exit status of the 'echo' command.

Also fix some indentation in the script and remove whitespace
2014-05-27 12:17:45 +02:00
Rajani Karuturi
ce6a53e37b Fixed CLOUDSTACK-6756: usage id is not being returned for an ip in deleted ip range
(cherry picked from commit a6ed48fc9c5f68b46f0d2e05adefc7263c4cd0d0)

Conflicts:
	setup/db/db/schema-430to440.sql
2014-05-27 10:41:40 +05:30
Nitin Mehta
7ae784ba3c CLOUDSTACK-6633: listVolumes should return template/iso info for root volumes 2014-05-11 20:36:53 -07:00
Murali Reddy
55111e2284 CLOUDSTACK-6609: OVS distributed routing: ensure tunnels are created if
not created already when OvsVpcPhysicalTopologyConfigCommand update is
recived

Currently if the tunnel creation fails, there is no retry logic. Fix
ensures OvsVpcPhysicalTopologyConfigCommand updates as an opputiunity to ensure
proper tunnels are established between the hosts.
2014-05-08 15:58:16 +05:30
Alena Prokharchyk
66d5ebc657 CLOUDSTACK-6596: UUID and display flag update support for LBStickinessPolicy and LBHealthCheckPolicy 2014-05-07 15:46:18 -07:00
Jayapal
aae1424f35 CLOUDSTACK-6582: fixed network acl cidr issues
Conflicts:
	setup/db/db/schema-430to440.sql
2014-05-06 22:54:43 +02:00
Bharat Kumar
99b4cf788e Cloudstack-5077: reserve cpu and memory only when vmware.reserve.cpu/mem are set to true. Insted of setting the ovecommit values to one on upgrade, we popultate them from the global values.
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
	engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
2014-05-05 11:39:10 +05:30
Amogh Vasekar
ac4f940c9d Remove accidentally added columns while resolving merge conflicts
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
2014-04-30 15:43:21 -07:00
Daan Hoogland
6b0c34faee CLOUDSTACK-6231: network acl item cidrs loaded from a seperate table
Conflicts:
	setup/db/db/schema-430to440.sql
2014-04-30 15:39:00 +02:00
Damodar Reddy
29b4fe6d9f CLOUDSTACK-6271: The cloud-setup-databases was failing when your jasypt jar path has spaces in it's path 2014-04-29 14:44:03 +05:30
Amogh Vasekar
78c683f568 CLOUDSTACK-6437:
Add ability to distinguish between user defined and system defined guest OS and mappings
Add default mappings for XenServer

Local testing with
1. Add new guest OS by API
2. Add new guest OS mapping by API
2014-04-25 13:10:10 -07:00
Murali Reddy
095151c98a add support for sequence numner in the VPC topology updates and VPC
routing policy updates

Conflicts:
	setup/db/db/schema-430to440.sql
2014-04-25 15:02:17 +05:30
Damodar Reddy
c7f3250151 CLOUDSTACK-6435: Add new Command line options to setup/bindir/cloud-setup-databases.in and remove OS specific commands 2014-04-23 10:36:50 -07:00
SrikanteswaraRao Talluri
d22adf943d Merge branch 'marvin'
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Conflicts:
	test/integration/component/test_dynamic_compute_offering.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_disk_offerings.py
	test/integration/smoke/test_volumes.py
2014-04-23 11:45:43 +05:30
Sheng Yang
4620c27ebf CLOUDSTACK-6047: Make aggregation command timeout configurable
In case some environments has different performance or we found some commands
would took too long to execute, one global configuration item is introduced to
specify "time out in seconds per one command in aggregation commands".

By default it's 3 seconds. If admin feel it's too long, it can be adjust to as
low as 1 seconds, which runs still well in my machine.

Conflicts:
	setup/db/db/schema-430to440.sql
2014-04-18 23:36:19 -07:00
Koushik Das
b088821c61 CLOUDSTACK-6445: Simulator enhancements
Refer FS - https://cwiki.apache.org/confluence/display/CLOUDSTACK/Simulator+enhancements
2014-04-18 16:44:21 +05:30
Sheng Yang
74fe010db3 CLOUDSTACK-6434: Make RvR advert_int configurable
In some network environment, 1*3 seconds by default make RvR setup too
sensitive. A configurable parameter would be better for fitting different
network environments.
2014-04-16 20:13:16 -07:00
Alena Prokharchyk
498cf6183d cloudsysvmadm script (used to restart system vms during the upgrade) - added jobId, timestamp to the logged statements about router/systemvm stop/start failures 2014-04-14 16:28:00 -07:00
Marcus Sorensen
11f5bdd78d CLOUDSTACK-6191 Add support for specifying volume provisioning
type (thin, sparse, fat) in disk/compute offerings.

Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski
2014-04-10 09:23:04 -06:00
Sanjay Tripathi
a195205d11 CLOUDSTACK-6366: add vgpuTypes details in vgpu_types table. 2014-04-09 18:23:50 +05:30
SrikanteswaraRao Talluri
0e223d6787 Merge branch 'master' into marvin
Conflicts:
	test/integration/component/test_base_image_updation.py
	test/integration/component/test_cpu_domain_limits.py
	test/integration/component/test_cpu_limits.py
	test/integration/component/test_cpu_project_limits.py
	test/integration/component/test_ip_reservation.py
	test/integration/component/test_memory_limits.py
	test/integration/component/test_mm_domain_limits.py
	test/integration/component/test_mm_project_limits.py
	test/integration/component/test_persistent_networks.py
	test/integration/component/test_portable_ip.py
	test/integration/component/test_routers.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_deploy_vm_with_userdata.py
	test/integration/smoke/test_internal_lb.py
	test/integration/smoke/test_vm_life_cycle.py
	test/integration/smoke/test_volumes.py
	tools/marvin/marvin/codes.py
	tools/marvin/marvin/configGenerator.py
	tools/marvin/marvin/lib/base.py
	tools/marvin/marvin/lib/common.py
	tools/marvin/marvin/lib/utils.py
2014-04-08 17:53:37 +05:30
edison
7b9d0d3fe5 mischanged default user vm template url for xen 2014-03-28 16:24:14 -07:00
edison
bd752c2ec0 add md5sum for xen/kvm system vm template 2014-03-28 16:23:59 -07:00
edison
caedc78142 update xen/kvm system vm template download url, and update the os type to 64bit 2014-03-28 16:23:51 -07:00
Alex Hitchins
3c0fa3a1dd CLOUDSTACK-5440: Add missing guestos types got centos 6.5, windows 8.1 and windows server 2012 r2.
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
2014-03-24 15:45:43 +05:30
Murali Reddy
424b5a66c3 fix schema issue 2014-03-21 15:49:51 +05:30
Murali Reddy
d2d54a9463 region level VPC support
introduce 'RegionLevelVpc' as capability of 'Connectivity' service. Add
support for CreateVPCOffering to take the 'regionlevelvpc' as capability
of service 'connectivity'.

introduces new capability 'StretchedL2Subnet' for 'Connectivity'
service. Also add support to createNetworkOffering api to allow
StretchedL2Subnet capablity for the connectivity service.

adds check to ensure 'Connectivity' service provider supports
'StretchedL2Subnet' and 'RegionLevelVpc' capabilities when specified in
createNetworkOffering and createVpcOffering respectivley

enable ovs plug-in to support both StretchedL2Subnet and RegionLevelVpc
capabilities

make zone id optional parameter in createVpc, zone id can be null only
if vpc offfering supports region level VPC

in region level vpc, let the network/tier to be created in any zone of
the region

keep zoneid as required param for createVpc

skip external guest network guru if 'Connectivy' service is present in
network offering

fix build break in contrail manager

permit VM's to be created in different zone that in which network is
created if the network support streched L2 subnet

add integration tests for region level VPC

rebase to master

Conflicts:
	setup/db/db/schema-430to440.sql

Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	engine/schema/src/com/cloud/network/vpc/VpcVO.java
	setup/db/db/schema-430to440.sql
2014-03-20 16:32:22 +05:30
Jayapal
384eeaf792 CLOUDSTACK-2692 Assigning LB rule for vm nic secondary ips 2014-03-14 22:47:17 +05:30
Hugo Trippaers
774739fb97 Fix database upgrade from 4.4.0 to 4.5.0 2014-03-14 17:14:57 +01:00
Saksham Srivastava
48f8a95b06 CLOUDSTACK-6092: Storage OverProvisioning as a Per Primary Basis Allow storage.overprovisioning.factor to be specified at storape pool level.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-03-14 12:16:46 +05:30
Murali Reddy
3139b35518 mark VPC to be using distributed router if VPC offerign supports
distributedrouter capability.
2014-03-14 16:56:35 +05:30
Murali Reddy
7c4443e233 -introduces 'DistributedRouter' as capability to 'Connectivity' service.
-create VPC offering to permit 'DistributedRouter' as capability to
connectivity service
2014-03-14 16:56:35 +05:30
Devdeep Singh
2aff39f8c7 CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
2014-03-14 16:27:58 +05:30
Harikrishna Patnala
f7337527cf CLOUDSTACK-6090: Virtual Router Service Failure Alerting
Signed-off-by: Koushik Das <koushik@apache.org>
2014-03-14 15:14:15 +05:30
Min Chen
84a528fad6 Merge branch 'master' into rbac 2014-03-13 14:52:37 -07:00