4a1eaf45bd
Merge branch 'master' into affinity_groups
...
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
setup/db/db/schema-410to420.sql
2013-04-10 11:34:30 -07:00
b646e43a1a
use hypervisor capabilities to control if vm snapshot is enabled for hypervisors
2013-04-10 12:36:42 +08:00
98bc240d2a
Revert "Dedicate Public IP range"
...
This reverts commit d6ed8d7cb5
2013-04-08 17:15:51 -07:00
3cbbe2bb04
RAT check broken by d6ed8d7cb. Fix
2013-04-08 16:51:10 -07:00
d6ed8d7cb5
Dedicate Public IP range
2013-04-08 14:46:21 -07:00
d9f7bb2854
Changing the number of threads in the test from 1000 to 750. 1000 will more often than not result in build failures due to constraints on the build systems.
...
Most recent centos based systems have process limit of 1024. Running this test will result in an OutOfMemory exception with description unable to create native thread.
2013-04-07 12:17:53 +02:00
ca1a7948f1
Merge branch 'master' into affinity_groups
...
Conflicts:
api/src/org/apache/cloudstack/api/BaseCmd.java
client/tomcatconf/applicationContext.xml.in
client/tomcatconf/componentContext.xml.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/user/AccountManagerImpl.java
setup/db/db/schema-410to420.sql
2013-04-05 13:49:20 -07:00
42ffac3ae8
CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address
2013-04-04 13:29:17 -07:00
469c4dd139
Removing ^M's from code.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-04 00:53:20 +05:30
cf72aa3274
Fixes/improvements for VPC feature:
...
1) Added comments to VPC/VPCService/VPCManager interfaces
2) Moved VPC offering related methods from VpcService to the new interface - VpcProvisioningService
3) Fixed static nat creation in the VPC - used to result in NPE due to invalid method referencing while obtaining VPC VR information
2013-03-29 16:56:01 -07:00
051d3673d3
API to list planners and set the planner in Service offering
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
setup/db/db/schema-410to420.sql
2013-03-29 10:41:46 -07:00
e967ef55b0
Changes to add AffinityGroupprocessor, deployVM changes
2013-03-29 10:17:01 -07:00
18695276f7
CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts
...
Addition of two new resource types i.e. Primary and Secondary storage space in the existing pool of
resource types.
Added methods to set the limits on these resources using updateResourceLimit
API command and to get a count using updateResourceCount. Also added calls in the
Templates, Volumes, Snapshots life cycle to check these limits and to increment/decrement the new
resource types
Resource Name :: Resource type number
Primary Storage 10
Secondary Storage 11
Also added jUnit Tests for the same.
Reviewed by : nitin mehta<nitin.mehta@citrix.com>
2013-03-29 11:26:38 +05:30
3e4430d811
CLOUDSTACK-658 - Scaleup vm support for Xenserver
...
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
2013-03-28 16:43:37 +05:30
26b892daf3
CLOUDSTACK-1771: fixed VirtualRouter nics assignment in the Shared networks. Before the fix VR could get a different IP address from the network upon recreation. With the fix the IP address assigned to the first VR in the network, will remain with the network till its entire lifecycle (stored in placeholder nic) and will be assigned to the VR every time it recreates in the network.
...
Shared networks in both - Advance and Basic - zone types are covered by this checkin
2013-03-26 13:29:57 -07:00
98291d043d
CLOUDSTACK-1218: Use the first IP in the first vlan range for VR in shared network
2013-03-14 13:13:31 -07:00
2dd31f331d
CLOUDSTACK-1636: Removed the concept of owner region.
...
Removed region_id from user/account and domain tables.
Removed forwarding of api calls to owner region.
Removed api_key and secret_key from region table.
Included related DB upgrade changes.
2013-03-14 11:53:40 +05:30
a49261c3b1
CLOUDSTACK-24: mipn feature for basiczone
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 10:24:22 +05:30
c129c4e02e
Add missing Apache license header.
2013-03-08 14:38:35 -08:00
f539f40e35
CLOUDSTACK-874: Ability to delete Events and Alerts
...
This feature will provide the functionality to delete or archive
the Alerts/Events.
Delete or archive alerts APIs are available only for root-admin,
delete or archive events are available for regular users.
2013-03-08 11:59:53 -08:00
a1fdb0c2d4
CLOUDSTACK-241: Remove API sync. Merge changes from 4.1 branch. Converted tabs to spaces.
2013-03-08 19:02:41 +05:30
409ec9c6b6
CLOUDSTACK-1426: We has strong implication that VO must implement an interface, otherwise EntityManagerImpl can't the vo
2013-03-07 18:25:57 -08:00
333dd810d2
CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory
2013-03-05 19:03:30 -05:00
613a061977
Merge branch 'master' into vim51_win8
...
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
2013-03-04 17:32:52 -08:00
b12aebefee
Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"
...
This reverts commit e0019eccd9
2013-03-04 23:32:52 +05:30
e0019eccd9
CLOUDSTACK-658 - Adding Scalevm command and XS related changes
2013-03-04 14:47:55 +05:30
aedb8c478e
CLOUDSTACK-24: mipn feature for isolated and vpc networks
...
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
https://issues.apache.org/jira/browse/CLOUDSTACK-24
2013-03-04 11:02:09 +05:30
8b9c45b96d
Merge branch 'master' into vim51_win8
...
Conflicts:
setup/db/db/schema-40to410.sql
2013-03-01 16:46:58 -08:00
14791a9d8f
Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes."
...
This reverts commit f9d96c9169
2013-03-01 22:29:47 +05:30
f9d96c9169
CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes.
2013-03-01 16:40:26 +05:30
993afdba6a
ignore the tests looking for db
...
These tests require DB to be present to do upgrade. Revisit later.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-01 12:04:06 +05:30
93f14e7c65
Merge branch 'master' into vim51_win8
...
Conflicts:
client/tomcatconf/componentContext.xml.in
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
7d2ebc9fc3
Add some comments on some code source to give credit to vmware sample
...
code.
2013-02-27 13:46:43 -08:00
cc81413931
CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more
2013-02-26 23:16:17 -08:00
e37fdce125
CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil.
...
Converted tabs to spaces in the related files.
Verified account, user and domain APIs.
2013-02-26 14:21:21 +05:30
1b408509d6
CLOUDSTACK-1332: Add IPv6 DNS for Zone
2013-02-25 16:08:10 -08:00
cd291f6b4b
From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001
...
From: Vijayendra <vijayendra.bhamidipati@citrix.com>
Date: Mon, 25 Feb 2013 14:37:27 -0800
Subject: [PATCH] CS-670: Configurable setting to use linked clones or not on
VMware
Description:
Providing support for creation of user VMs as full clones on ESX.
Putting in unit tests for VO and Dao classes introduced in this commit.
Signed-off-by: Vijayendra <vijayendra.bhamidipati@citrix.com>
---
core/src/com/cloud/vm/UserVmCloneSettingVO.java | 50 ++++++
.../hypervisor/vmware/manager/VmwareManager.java | 3 +
.../vmware/manager/VmwareManagerImpl.java | 18 +-
.../hypervisor/vmware/resource/VmwareResource.java | 117 +++++++++----
server/conf/migration-components.xml | 1 +
server/src/com/cloud/configuration/Config.java | 1 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 184 ++++++++++-----------
.../com/cloud/vm/dao/UserVmCloneSettingDao.java | 37 +++++
.../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 74 +++++++++
.../vm/dao/UserVmCloneSettingDaoImplTest.java | 62 +++++++
.../UserVmCloneSettingDaoTestConfiguration.java | 52 ++++++
.../test/resources/CloneSettingDaoTestContext.xml | 42 +++++
setup/db/db/schema-410to420.sql | 9 +
13 files changed, 527 insertions(+), 123 deletions(-)
create mode 100755 core/src/com/cloud/vm/UserVmCloneSettingVO.java
create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDao.java
create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java
create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java
create mode 100644 server/test/resources/CloneSettingDaoTestContext.xml
2013-02-25 14:57:57 -08:00
15201d908f
CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes
2013-02-25 18:54:30 +05:30
4b161e5410
Correcting the license header problem that was introduced with commit
...
23e54bb0f4
2013-02-22 11:06:47 -05:00
667aa17512
CLOUDSTACK 711: CPU and RAM overcommit update cluster part
2013-02-22 20:09:50 +05:30
23e54bb0f4
Cloudstack-711: Cpu and Ram Overcommit Ratio.
2013-02-22 17:31:06 +05:30
ea3db2f073
CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks
...
CloudStack uses Guest CIDR for dhcp-range for the Guest VMs. The entire
CIDR is used by CloudStack for assigning IPs to Guest VMs. IP Address
Reservation will allow part of address space to be used fornon CloudStack
hosts/physical servers also, by restricting the address space of CloudStack
Guest VMs. Reservation can be configured using update Network API by specifying
guestvmCidr as an additional parameter. Reservation will be applicable for
Isolated Guest Networks including VPC. reservediprange in the response
will return the IP range that can be used for non Cloudstack hosts.
Tested manually the following scenarios:
Applying reservation when there are running VMs inside the
guest_vm_cidr.
Applying reservation when there are running VMs outside the
guest_vm_cidr.(not allowed)
Applying reservation when external device like Netscaler is configured
in the guest_cidr.
Applying reservation in VPC tiers.
Applying reservation outside the range of guest_cidr.(not allowed)
2013-02-22 15:50:33 +05:30
18e496b057
rebase to master
2013-02-21 11:22:50 -08:00
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
6c01b62cdc
CLOUDSTACK-667: VM's base image update facility
2013-02-21 15:04:29 +05:30
7a3f072a50
CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-02-21 14:59:35 +05:30
f2b97db0f9
CLOUDSTACK-1172: LDAP enhancements
2013-02-19 15:36:39 +05:30
5147fb16ac
CLOUDSTACK-1253: Remove @author tag.
2013-02-15 10:42:06 -08:00
ca5c6d5d14
CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages
2013-02-14 16:28:29 -08:00
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
Prachi Damle
Mice Xia
Jessica Wang
Chiradeep Vittal
Likitha Shetty
Hugo Trippaers
Alena Prokharchyk
Brian Spindler
Sanjay Tripathi
Nitin Mehta
Sheng Yang
Kishan Kavala
Jayapal Uradi
Min Chen
Sanjay Tripathi
Edison Su
Kelven Yang
Abhinandan Prateek
Prasanna Santhanam
Edison Su
frank
Chip Childers
Bharat Kumar
Saksham Srivastava
Harikrishna Patnala