apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,548 Commits 304 Branches 324 Tags
Commit Graph

6281 Commits

Author SHA1 Message Date
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
Min Chen
084b6f3e05 Merge branch 'master' into vim51_win8 2013-02-25 11:55:12 -08:00
Min Chen
fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
Edison Su
310e99087f CLOUDSTACK-1380: add db upgrade for vm_template, in 4.1 to 4.2 upgrade procedure 2013-02-25 10:45:04 -08:00
Vijayendra Bhamidipati
6675d2c1a3 CLOUDSTACK-778: user provided hostname to be specified in vCenter instead of CloudStack generated name 
Introducing flag to allow display name to be appended to internal instance name.
 2013-02-25 18:57:18 +05:30
Kishan Kavala
15201d908f CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes 2013-02-25 18:54:30 +05:30
Kishan Kavala
836ce6c11a CLOUDSTACK-749: External device support for VPC. VPC offering can be created with providers other than VPCVirtualRouter 2013-02-25 18:32:23 +05:30
Deepti Dohare
4d573ddd1b CLOUDSTACK-357 ISOs can be deleted while still attached to a running VM, and they subsequently cannot be detached from a running VM 
I made the changes to make sure that:
1. ISO will be deleted from the UI, but it is not deleted from the secondary storage as long as it is attached to a VM.
2. The storage cleanup thread will check whether the iso is attached to any vm, if not, it removes the ISO from the secondary storage.
3. Detach operation is now working which was failing before for the vms having attached iso(deleted).

Updated the patch for template sync during MS restart.

Manually tested the following:
setup: upload ISO1 and ISO 2
Attach ISO1 to VM1 and VM2
Attach ISO2 to VM3
set storage.cleanup.interval to 300

test cases:
1. delete ISO1 from UI, gets deleted
2. In VM Details of VM1 and VM2, can see detach ISO option
3. ISO1 exists in secondary storage
4. detach ISO1 from VM1, successful
5. ISO1 still exists in secondary storage.
6. Restart MS, template sync will not delete ISO1.
7. Detach ISO1 from VM2, successfull detached.
8. Wait for storage cleanup thread to execute, ISO1 gets deleted from Secondary storage.
9. Detach ISO2 from VM3
10.ISO2 exists in secondary storage, Delete ISO2 form UI, get deleted from secondary storage.
 2013-02-25 16:02:25 +05:30
Alex Huang
ac1b529f78 Revert "Revert "Fix fresh db install problem. (still pending one part of finding db"" 
This reverts commit ebcf6b1b7cd5175ee826bdfb1443d96fd0a2f9b8.
 2013-02-23 19:16:13 -08:00
Min Chen
ebcf6b1b7c Revert "Fix fresh db install problem. (still pending one part of finding db" 
This reverts commit 5b760f903f1a3145f62d05c1d3c142b710248026.
 2013-02-22 21:38:15 -08:00
Min Chen
5b760f903f Fix fresh db install problem. (still pending one part of finding db 
script file correctly).
 2013-02-22 18:01:55 -08:00
Chip Childers
4b161e5410 Correcting the license header problem that was introduced with commit 
23e54bb0f4c64735bb34413ea26ea1804c846ff5

Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-02-22 11:06:47 -05:00
Bharat Kumar
667aa17512 CLOUDSTACK 711: CPU and RAM overcommit update cluster part 2013-02-22 20:09:50 +05:30
Bharat Kumar
23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Saksham Srivastava
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
Mice Xia
dae57c1ab2 add missing license header reported by rat 2013-02-22 13:22:14 +08:00
Sheng Yang
a0762bc4a7 CLOUDSTACK-1303: Fix NPE when extend vlan with ipv4 only 2013-02-21 18:02:50 -08:00
Prachi Damle
6823adb3ac CLOUDSTACK-1367 NPE noticed in logs while AgentMonitor is monitoring the host ping interval 
Added null check. If the host is not found, we dont ping anymore.
 2013-02-21 17:40:08 -08:00
frank
1689062334 remove BareMetalVmManagerImpl.java thiat is unused 2013-02-21 17:05:19 -08:00
Edison Su
3bb713c5ce fix adding nfs primary storage and build and load 2013-02-21 16:24:39 -08:00
frank
15ead099a1 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

able to start vm

Conflicts:

	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
	server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2013-02-21 15:48:08 -08:00
frank
55b77c7c8f CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

adding missing scripts back

Conflicts:

	client/pom.xml
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
 2013-02-21 15:46:11 -08:00
frank
1f15c1e9e7 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base

Conflicts:

	client/tomcatconf/componentContext.xml.in
 2013-02-21 15:42:38 -08:00
Sheng Yang
667a1d18a4 CLOUDSTACK-1288: Fix regression on remove LB rules 
It's a regression caused by:

   commit 69d24545c4f0e316dba534b6d5d99308795db6d4
   Author: Murali Reddy <murali.reddy@citrix.com>
   Date:   Fri Feb 8 18:50:18 2013 +0530

       CLOUDSTACK-1208: Failed to shutdown guest network

       Firewall manager was being used instead of LoadBalancingRules manager
       while applying the load balancer rules in shut down network. Changing it
       to LoadBalancingRules manager.

The parameter transferre to applyRules() should be lbRules, rather than the lbs
object.
 2013-02-21 14:46:22 -08:00
Chip Childers
6cc1123a3e Correcting license headers that broke the build 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-02-21 16:29:05 -05:00
Edison Su
18e496b057 rebase to master 2013-02-21 11:22:50 -08:00
Edison Su
ae902590d3 fix snapshot 2013-02-21 11:22:50 -08:00
Edison Su
0f532c4b3a rebase to master 2013-02-21 11:22:49 -08:00
Edison Su
ff047e75d3 refactor snapshot, move existing snapshot code into its own snapshotstrategy 2013-02-21 11:22:49 -08:00
Edison Su
020be66f9d add copy volume and create volume from snapshot 2013-02-21 11:22:49 -08:00
Edison Su
0b86b33c56 rebase to master 2013-02-21 11:22:48 -08:00
Edison Su
ec09e34f86 fix downloading template 2013-02-21 11:22:48 -08:00
Edison Su
a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Harikrishna Patnala
6c01b62cdc CLOUDSTACK-667: VM's base image update facility 2013-02-21 15:04:29 +05:30
Harikrishna Patnala
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
Prachi Damle
744c24ee68 CLOUDSTACK-1346: Check to see if external devices are used in the network, is hardcoded for specific devices 
- Changes the check to list all providers of a network and check if it is an external provider
 2013-02-20 15:37:27 -08:00
Prachi Damle
70ac773f69 CLOUDSTACK-1344 Typo in use.external.dns setting description 
Fixed the typo.
 2013-02-20 11:58:14 -08:00
Prachi Damle
ec1f48a4b2 CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan 
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
 2013-02-20 11:23:32 -08:00
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-20 16:42:56 +05:30
Rohit Yadav
35b83b2adc CLOUDSTACK-1317: In DatabaseUpgradeChecker, add upgrade path to 4.2.0 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-20 16:42:27 +05:30
Sheng Yang
817548bac1 IPv6: Add ipv6 for user vm view 2013-02-19 15:50:55 -08:00
Sheng Yang
da75e4ac8a IPv6: Add IPv6 for domain router view 2013-02-19 15:50:23 -08:00
Abhinandan Prateek
f2b97db0f9 CLOUDSTACK-1172: LDAP enhancements 2013-02-19 15:36:39 +05:30
Kishan Kavala
c94a75c0a6 CLOUDSTACK-752: Removed 1 private gateway for VPC limitation. 
Verified that more than 8 private gateways can be created.
 2013-02-19 14:15:02 +05:30
Rohit Yadav
ca432fe6b7 db: Fix upgrade paths to 4.1.0 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-19 13:36:21 +05:30
Prasanna Santhanam
447b2d9c95 listroutercmd: response should be set to the name of router 
host name of router returned instead of the name of the router.
correcting the setter.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-02-19 13:22:21 +05:30
Kishan Kavala
cc2a3c5498 CLOUDSTACK-651: Removed 7 nics limitation for VR on XenServer 
# of nics can be configured using global param xen.nics.max. Param defaults to 7
Added new param to upgrade schema.
 2013-02-18 20:30:03 +05:30
Rohit Yadav
8094e933b0 ApiServer: Get rid of finding system account and user at init() time 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-16 17:09:37 +05:30
Rohit Yadav
0e354473f7 db: Add stubs for Upgrade410to420, schema-410to420.sql and schema-410to420-cleanup.sql 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-16 13:31:58 +05:30
Rohit Yadav
44c8a33cf2 db: Fix commas which should be dots in create-schema, fix debug msg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-16 13:31:46 +05:30