gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-06 10:48:12 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity
17,062 Commits 371 Branches 328 Tags 895 MiB
affinity_groups
Commit Graph

26 Commits

Author SHA1 Message Date
Prachi Damle
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
Prachi Damle
b266ad4612 Adding a unit test for the new affinity groups API 2013-04-01 11:08:16 -07:00
Kelven Yang
5782abf8f8 Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
Alena Prokharchyk
37cdb5d74b CLOUDSTACK-766 - allow Vlan assignment to Isolated network. The network with Vlan assigned, gets created with Setup state, and will never get picked up by the GC thread meaning its vlan will never get released 2013-03-21 16:05:48 -07:00
frank
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
Kelven Yang
7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Prachi Damle
df5c4c3048 Fixing VPC unit test to use Spring 2013-01-24 23:05:31 -08:00
Min Chen
b6f780fa33 Fix StoragePool unit testcase. 2013-01-24 16:11:35 -08:00
Min Chen
f85ac65645 Fix Snapshot unit testcase. 2013-01-24 16:05:03 -08:00
Alex Huang
ee39ec82d3 Making unit tests work 2013-01-22 11:18:51 -08:00
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Alex Huang
cbb7ff1c32 added missing files 2013-01-17 06:50:59 -08:00
Chiradeep Vittal
728db6c8ca Network-refactor: fix bugs in components.xml discovered by unit tests 
Provide injection tests for NetworkManager and FirewallManager

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:02 -08:00
Chiradeep Vittal
e0578180c5 Network-refactor: verify injection is correct. Verify that dhcp service providers and ip deployers get injected independently in addition to the list of network elements 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:02 -08:00
Gavin Lee
d3921139ed Patch from Gavin Lee: Change license to ASL2.0 in server and tools 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-08-30 10:36:29 -04:00
frank
2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
frank
4303e30ae0 add missing cleanup.sql 2012-03-19 15:27:43 -07:00
frank
26c77e62ce move fake.sql to proper folder 2012-03-19 13:10:41 -07:00
Alex Huang
d7e0f8dcc1 db upgrade 2011-03-19 10:33:13 -07:00
Alex Huang
d3ecf719ce looks like everything is working except for snapshots 2011-03-18 09:14:05 -07:00
alena
7eb20f8133 DB upgrade for port forwarding rules 2011-03-16 18:19:02 -07:00
alena
a50950bbef 221 to 222 DB upgrade for InstanceGroup. Unit test is included 2011-03-09 08:34:08 -08:00
alena
fe267c2cb2 Basic zone 221 to 222 DB upgrade. Unit test is included 2011-03-08 15:32:55 -08:00
Alex Huang
f7ea6e17cd break upgrade fix upgrade 2011-03-04 18:07:26 -08:00
Alex Huang
8571d04034 unit testing is working again 2011-02-28 16:21:19 -08:00
Alex Huang
b6056bc0b1 missing files 2011-02-22 19:12:10 -08:00