8aba25f18d
Merge branch 'master' into vim51_win8
...
Conflicts:
setup/db/db/schema-410to420.sql
2013-02-26 14:12:36 -08:00
610088fb2d
Use value() instead of toString() to convert guestOsIdentifier.
2013-02-26 13:29:02 -08:00
8cb5c00c26
CLOUDSTACK-416: Add XCP 1.6.x in XcpServerDiscoverer.java processConnect
...
Thanks to Devdeep for pointing this out.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c7935a9ab6
2013-02-26 15:37:58 +05:30
43183893bd
CLOUDSTACK-416: Add XCP 1.6.x as supported hypervisor
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 13:55:43 +05:30
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
fbfc5c6894
Merge from master and fix conflicts
2013-02-25 11:53:24 -08: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
dae57c1ab2
add missing license header reported by rat
2013-02-22 13:22:14 +08:00
3bb713c5ce
fix adding nfs primary storage and build and load
2013-02-21 16:24:39 -08:00
8855d793ee
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
pass host id to baremetal discover when mgmt loads existing hosts
2013-02-21 15:48:20 -08:00
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
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
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
54741a2b0f
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
add api annotation to baremetal related api
2013-02-21 15:41:21 -08:00
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
c9f0af42a6
Fix systemvm.iso path search issue.
2013-02-21 10:22:14 -08:00
f7b600b439
CLOUDSTACK-1334 global config vmware.root.disk.controller doesn't work
2013-02-21 11:29:08 +08:00
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
edac894f31
spring changes for simulator component
...
allow spring to do DI for simulator plugin. componentContext.xml will
have simulator components disabled by default.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-19 16:40:57 +05:30
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
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
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
298c5ee06b
Summary: Adjust systemvm.iso path for KVM, due to packaging changes
...
Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old
systemvm.iso files aren't found by accident. systemvm.iso should exist in
/usr/share/cloudstack-common/vms now.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360860243 -0700
2013-02-14 09:45:57 -07:00
35cf56862f
Summary: KVM - Fix physical net parsing when traffic label points to tagged dev
...
Detail: If your traffic label points to a bridge that is on a tagged interface
rather than a real physical interface, cloudstack may not parse the physical
interface correctly, bringing up tagged interfaces on the tagged interface.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360798665 -0700
2013-02-13 16:45:18 -07:00
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
3a0c99b0a4
CLOUDSTACK-710: CitrixResourceBase, if dest dir is not found, mkdir -m 700 -p
...
This is a security failsafe, so even if destination does not exist we mkdir the path
with 0700 permission. If path exists mkdir -m 700 -p won't do anything.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 22:45:32 +05:30
fcb4b7a6a7
CLOUDSTACK-1237: Fix an overriding method that would help find template adapter
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:19:30 +05:30
6320cad9a1
Merge branch 'master' into vim51_win8
2013-02-11 15:47:08 -08:00
770860aee4
CLOUDSTACK-710: mkdir -p destination before scp-ing file in CitrixResourceBase
...
- Assumption is that mkdir is available on xen host
- We don't know what kind of file we're copying, dirs would have 0777 permission
by default
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 16:39:16 +05:30
a5f0be186f
agent: Rename startDomain to startVM
...
The other methods are called stopVM and rebootVM, so it makes
sence to use startVM.
2013-02-07 23:07:10 +01:00
5dfcd309f1
agent: Do not define domains persistent in libvirt
...
We used to define domains persistent in libvirt, which caused XML definitions
to stay there after a reboot of the hypervisor.
We however don't do anything with those already defined domains, actually, we wipe
all defined domains when starting the agent.
Some users however reported that libvirt started these domains after a reboot
before the CloudStack agent was started.
By starting domains from the XML description and not defining them we prevent
them from ever being stored in libvirt.
2013-02-07 23:07:05 +01:00
f6c4b22139
agent: Remove the main() method from LibvirtComputingResource
...
Seems like very ancient code which is not needed.
2013-02-07 23:06:44 +01:00
640fa6be76
Fix a bug in converting Enum type to String.
2013-02-07 12:23:57 -08:00
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
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
5a2cd68fa8
Fix bug CLOUDSTACK-1171 due to spring injection.
2013-02-05 21:55:11 -08:00
1ce4d62ace
Fix cast error from List<?> to array.
2013-02-05 21:44:38 -08:00
b9cf5c2147
Merge branch 'master' into vim51_win8
2013-02-05 14:40:53 -08:00
e5866cf2ef
CLOUDSTACK-1165, fix nonoss build startup issue
2013-02-05 14:27:57 -08:00
303fb650cb
agent: Use FileUtil.readFileAsString for reading RX and TX bytes
...
Since we already have this un utils it's better to use it here
then do the whole File/FileInputStream magic.
Keeps the code simpler and more readable.
2013-02-05 22:17:40 +01:00
3535f88d16
Summary: Disallow shrinking volume type QCOW2 to fail with better message
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360093176 -0700
2013-02-05 12:39:36 -07:00
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
fc0bf21a13
CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl
2013-02-05 16:49:34 +05:30
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
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
fec9934656
ucs: Fix ucs plugin's pom, removes xml marktag
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-02 09:16:17 -08:00
4709756bd5
agent: Use FileInputStream for reading files instead of cat
...
Cat'ing a file and parsing that output is not reliable and this can be done
by using Java's native methods for that.
2013-02-02 18:08:24 +01:00
c9e764818b
rat: Fix license headers on ucs plugin etc.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-02 08:57:16 -08:00
9755d9b4a2
Keep naming more or less consistent
2013-02-02 12:43:15 +01:00
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
8416d81b99
Merge branch 'ucs' into javelin
...
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
plugins/pom.xml
utils/src/com/cloud/utils/exception/CloudRuntimeException.java
utils/src/com/cloud/utils/exception/RuntimeCloudException.java
2013-01-31 14:44:07 -08:00
8f33229fc1
Merge branch 'master' into vim51_win8
2013-01-31 14:04:38 -08:00
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
780ac2a9c6
Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP.
2013-01-31 10:32:05 -08:00
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
d7ad2da7e0
server: Fix network refactor regressions for CLOUDSTACK-297
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:53 -08:00
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
1b39b0e908
fixing licensing headers
2013-01-29 23:45:11 -05:00
1f7eaf3d61
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
merge baremetal feature to master
2013-01-29 17:19:57 -08:00
1f2147d3ec
Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-28 21:20:03 -08:00
482ce5fe07
Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-28 21:21:30 -07:00
1a1d716d90
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
2013-01-28 16:30:06 -08:00
997e9fb7b0
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
2013-01-28 16:29:54 -08:00
8f66d266b3
IPv6: Enable VR's ability to provide DHCPv6 service
2013-01-26 23:14:42 -08:00
9300a02ba4
IPv6: Update edithosts.sh accept parameters
2013-01-26 23:14:27 -08:00
767f54cc9a
Make nonoss build work under Spring
2013-01-25 17:18:36 -08:00
af4485ae9e
Put nonoss under Spring framework
2013-01-25 15:41:48 -08:00
301b0b9090
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
init
2013-01-25 15:00:09 -08:00
a18baf8c83
fix compile
2013-01-25 10:24:25 -08:00
f56b96ad19
merge: Fast forward merge branch 'javelin'
...
FF merge commit due to recent merge of master and then Edison's commit.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:30:28 -08:00
356866c72b
Merge branch 'master' into javelin
...
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/swift/SwiftManagerImpl.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:18:53 -08:00
6f5655cb03
generalize storage orchestration: DataObjectManager will handle all the object life cycle management
2013-01-24 18:30:08 -08:00
6088cbfe47
nonoss compiled up til netscaler
2013-01-23 17:18:55 -08:00
c921118c58
add image create test case
2013-01-22 13:25:48 -08:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
b4988e86ab
add backedn code
2013-01-21 16:59:50 -08:00
f7e75d3aaf
Fixed the problems with simulator. Turned off the skip tests
2013-01-21 10:37:53 -08:00
a0373fe1ff
Summary: Apply feedback from Wido
...
Better checking on VlanID
Correct speling mistake
2013-01-21 12:34:20 +01:00
04f82623f6
Merge branch 'master' into cloud-agent-with-openvswitch
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2013-01-21 12:18:21 +01:00
a65b584d18
Summary: Fix bridge parsing when bridge names are subsets of others
...
Detail: There are several places in the code that do a
"brctl show | grep bridgeName" or similar, which causes all sorts
of problems when you have for example a cloudVirBr50 and a
cloudVirBr5000. This patch attempts to stop relying on the output
of brctl, instead favoring sysfs and /sys/devices/virtual/net.
It cuts a lot of bash out altogether by using java File. It was
tested in my devcloud-kvm against current 4.0, as well as by the
customer reporting initial bug.
BUG-ID: CLOUDSTACK-938
Fix-For: 4.0.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-18 18:28:08 -07:00
4a9cf4b4a8
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-18 15:59:24 -08:00
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -08:00
1283712d93
replace spring injection in nfssecondarystorage
2013-01-18 15:10:08 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
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
55e8965bd0
Summary: Pass StoragePoolType that maps to libvirt in cleanupDisk
...
Description: When selecting a storage adaptor, cleanupDisk assumes that
libvirt is being used. Therefore, we pass a StoragePoolType that maps to
libvirt. This is the only place in LibvirtComputingResource where the
StoragePoolType can't be pulled from somewhere else.
BUG-ID: CLOUDSTACK-1011
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-18 00:20:34 -07:00
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
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
cadca5fc0c
Merge branch 'master' into network-refactor-merge2
...
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-01-16 19:17:14 -08:00
497dcd5044
Get rid of PlugService annotation, replace it with Spring standard injection in command classes
2013-01-16 18:44:44 -08:00
975021dda1
Summary: adding resizeVolume api call
...
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.
BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
2013-01-16 17:43:35 -07:00
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -08:00
8608925216
Consolidate RuntimeCloudException and CloudRuntimeException into one
...
class CloudRuntimeException, and removed RuntimeCloudException to avoid
confusion.
2013-01-15 18:07:08 -08:00
a6b9027630
default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set
...
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC
CLOUDSTACK-983: default Security rule doesn't apply to system VMs
2013-01-15 11:15:42 -08:00
95222cdb6d
Templates: Add Ubuntu 12.04 to the templates
...
Although I still think the templates aren't well maintained, I just
added 12.04 since this is an LTS and people probably want it in the
list of templates.
This system should be more generic I think though.
2013-01-15 13:25:48 +01:00
2d69a1855d
Summary: Begone pesky tabs
2013-01-15 10:00:58 +01:00
9f00302ad3
Summary: Polish and shine
...
Document the used options in agent.properties
Default the bridge driver to something sensible based on the
configuration of the bridge type.
2013-01-15 09:18:24 +01:00
4267a3fc7c
Summary: copy/paste error
2013-01-15 09:18:24 +01:00
Min Chen
Rohit Yadav
frank
Bharat Kumar
Mice Xia
Edison Su
Edison Su
hongtu_zang
Prasanna Santhanam
Kishan Kavala
Koushik Das
Marcus Sorensen
Wido den Hollander
Kelven Yang
Hugo Trippaers
Sheng Yang
Jayapal
David Nalley
Alex Huang
Chiradeep Vittal
anthony