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,720 Commits 304 Branches 324 Tags
Commit Graph

157 Commits

Author SHA1 Message Date
Mice Xia
c98244f75d CLOUDSTACK-1634 VMSnapshot: CreateVMSnapshotCmd fails due to due to java.util.ArrayList cannot be cast to [Lcom.vmware.vim25.ManagedObjectReference 2013-03-12 20:37:02 +08:00
Kelven Yang
47db924275 CLOUDSTACK-1615: instead of returning empty host firewall ruleset, ESXi 5.0 Update 1 may return null to indicate empty host firewall ruleset, Cloudstack needs to handle this changed behave 2013-03-11 14:07:39 -07:00
Sheng Yang
e35ce6587a CLOUDSTACK-1461: Don't set dns server for non-default ipv6 network 
The non-default parameter can be used by ipv4 as well in the future.
 2013-03-08 17:43:23 -08:00
Min Chen
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
Sateesh Chodapuneedi
7c52d7d1c9 In basic zone, skip checks for physical network configuration with multiple virtual switches. 
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-03-03 08:22:40 +05:30
Kelven Yang
cec4d8b59c CLOUDSTACK-1262: update default built-in systemvm.iso search patch to be consistent with RPM location 2013-03-01 17:47:01 -08:00
Min Chen
801e5269ea Merge branch 'master' into vim51_win8 2013-02-28 14:25:26 -08:00
Mice Xia
6a46656c72 CLOUDSTACK-1448 Failed to start VM with standard vSwitch on VMware 2013-02-28 16:31:06 +08:00
Min Chen
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
sateesh
3c00e7b8c5 Re-basing with latest master. 
CLOUDSTACK-657 VMware vNetwork Distributed Virtual Switch support in CloudStack

This is 5th patch for feature 'Support for VMware dvSwitch in CloudStack'.

This patch contains
1)Changes to addCluster done in vmware discoverer to support vswitch type provided as parameters. Also performing validation of vswitch type parameter provided with addCluster api call. Checks for physical network configuration for vmware cluster is added.
2)Changes to vmware resource to use specified vswitch type while preparing network for guest and public traffic types.
3)Changes to vmware manager to introduce new global parameter vmware.ports.per.dvportgroup. Some cleanup.
Virtual switch type could be chosen at zone level or at cluster level for specific traffic type.
autoExpand of dvPortGroup is available in code but disabled as its breaking because vCenter 4.1 does not support autoExpand feature. Would be enable once vSphere 5.1 SDK support is added to CloudStack.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-02-27 18:37:15 +05:30
sateesh
1777f160c4 CLOUDSTACK-657 VMware vNetwork Distributed Virtual Switch support in CloudStack 
This is 1st patch for feature 'Support for VMware dvSwitch in CloudStack'.

This contains 3 newly introduced classes. Added apache license header for all 3 files.
[1]TrafficLable and [2]VmwareTrafficLabel classes are to define and encapsulate virtual switch type per traffic type along with other network label fields (VLAN ID and physical network).
[3]DistributedVirtualSwitchMO class is wrapper class for vSphere API calls specific to a distributed virtual switch in a vCenter datacenter.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-02-27 18:37:14 +05:30
Min Chen
17488fac36 Fix another toString() usage of GuestOsIdentifier enum. 2013-02-26 15:32:59 -08:00
Min Chen
8aba25f18d Merge branch 'master' into vim51_win8 
Conflicts:
	setup/db/db/schema-410to420.sql
 2013-02-26 14:12:36 -08:00
Min Chen
610088fb2d Use value() instead of toString() to convert guestOsIdentifier. 2013-02-26 13:29:02 -08: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
Min Chen
fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
Bharat Kumar
23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Edison Su
a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Min Chen
c9f0af42a6 Fix systemvm.iso path search issue. 2013-02-21 10:22:14 -08:00
hongtu_zang
f7b600b439 CLOUDSTACK-1334 global config vmware.root.disk.controller doesn't work 2013-02-21 11:29:08 +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
Koushik Das
bc493bd39b CLOUDSTACK-672: Set VMware cluster max. limit based on HV version 
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
 2013-02-15 16:19:40 +05:30
Mice Xia
9a12756ae4 CLOUDSTACK-684 support vm snapshot 2013-02-14 01:26:30 +08:00
Min Chen
640fa6be76 Fix a bug in converting Enum type to String. 2013-02-07 12:23:57 -08:00
Min Chen
105bf7134a Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-02-06 15:27:45 -08:00
Marcus Sorensen
c5185c09ef Summary: Add missing ResizeVolumeCommand in VmwareResource.java 
Submitted-by: hongtu_zang <hongtu_zang@tcloudcomputing.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-02-06 07:52:37 -07:00
Min Chen
5a2cd68fa8 Fix bug CLOUDSTACK-1171 due to spring injection. 2013-02-05 21:55:11 -08:00
Min Chen
1ce4d62ace Fix cast error from List<?> to array. 2013-02-05 21:44:38 -08:00
Min Chen
b9cf5c2147 Merge branch 'master' into vim51_win8 2013-02-05 14:40:53 -08:00
Kelven Yang
e5866cf2ef CLOUDSTACK-1165, fix nonoss build startup issue 2013-02-05 14:27:57 -08:00
Min Chen
a224287403 Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	pom.xml

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-02-05 10:05:39 -08:00
Min Chen
481f480472 Upgrade to use Vsphere 5.1 SDK jar, fixed all compilation error with new 
wrapper class VmwareClient.
 2013-02-04 17:41:36 -08:00
Koushik Das
ca56e7667c CLOUDSTACK-435: Vmware network labels are ignored when creating a Zone using basic networking 
Due to incorrect logic the private network traffic label specified was not getting used, instead some default was getting used (vSwitch0 or privateEthernetPortProfile). The fix passes the correct label in the format vSwitchX or vSwitchX,<vlan_id> and based on that the correct switch is used.
 2013-02-04 19:23:30 +05:30
Kelven Yang
7bd8bec68a Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a 2013-01-31 17:20:19 -08:00
Sheng Yang
5cb9df91a1 Merge branch 'ipv6' 
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
 2013-01-31 15:07:33 -08:00
Min Chen
8f33229fc1 Merge branch 'master' into vim51_win8 2013-01-31 14:04:38 -08:00
Kelven Yang
1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Min Chen
780ac2a9c6 Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP. 2013-01-31 10:32:05 -08:00
Jayapal
b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Kelven Yang
176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Sheng Yang
8f66d266b3 IPv6: Enable VR's ability to provide DHCPv6 service 2013-01-26 23:14:42 -08:00
Sheng Yang
9300a02ba4 IPv6: Update edithosts.sh accept parameters 2013-01-26 23:14:27 -08:00
Kelven Yang
767f54cc9a Make nonoss build work under Spring 2013-01-25 17:18:36 -08:00
Kelven Yang
af4485ae9e Put nonoss under Spring framework 2013-01-25 15:41:48 -08:00
Alex Huang
6088cbfe47 nonoss compiled up til netscaler 2013-01-23 17:18:55 -08:00
Edison Su
4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Koushik Das
070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 16:49:52 +05:30
Chiradeep Vittal
56cd809600 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Re-merge with network-refactor
 2013-01-17 11:32:49 -08:00
Min Chen
3dabd5fbf3 Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException 
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:36:34 -08:00