17488fac36
Fix another toString() usage of GuestOsIdentifier enum.
2013-02-26 15:32:59 -08:00
60cd4dd09e
Merge branch 'master' into vim51_win8
2013-02-26 15:14:45 -08:00
cf06861c9b
CLOUDSTACK-1387: fix incorrect commit
...
d37ed18c3a
2013-02-26 15:08:30 -08:00
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
89dee27503
CLOUDSTACK-1414: Reduce arping time to nearly 0
...
In the previous version it would take at least 1 seconds for arping, and it
would be big if the VR has more than 30 IPs - our biglock default timeout is 30
seconds.
Fix it by send out two arping immediately, and then sleep 1 second for router to
update arp cache.
2013-02-26 12:39:15 -08:00
6831937145
Fix/cleanup zone wizard UI->public traffic multi-edit
2013-02-26 12:21:15 -08:00
aec2cfe2cc
Multi-edit: Allow horizontal overflow
2013-02-26 11:32:01 -08:00
0fa3ed9b74
Separate stderr and stdout output from jsvc
2013-02-26 18:01:07 +01:00
d92725e846
Summary: Packaging fixes for usage
...
Make the usage server look in the /etc/cloudstack/usage server for the db.properties
Add the /etc/cloudstack/usage to the package as an empty dir
2013-02-26 16:40:35 +01:00
0b35f7184d
CLOUDSTACK-1289: Added missing usage command processing for External firewall device. ExternalLoadBalancerUsageManagerImpl should be renamed as ExternalDeviceUsageManagerImpl
2013-02-26 17:34:10 +05:30
840650f9ff
IP address reservation basic UI requirement
2013-02-26 17:16:51 +05:30
b9a4774d8e
CLOUDSTACK-1398:LDAP:fail to update the failed job status -stuck in in-progress state
2013-02-26 16:52:04 +05:30
0a1a207a19
usage: Fix regression build fail from fc3905fb, missing closing parenthesis
...
We've to test our commits, build 'em before committing :)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c47f685b1f
2013-02-26 16:41:16 +05:30
fc3905fb57
CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly
...
Removed duplicate userstatsdao injection
2013-02-26 16:27:59 +05:30
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
da7c0b1437
spring: Remove annotations from interfaces and abstract classes
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 14:52:31 +05:30
46e91bd794
fix issue: failed to start vm from iso caused by ClassCastException and NPE
2013-02-26 17:01:26 +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
0383803188
scripts: Fix security_group.py handling of args and unknown commands
...
Checks the args length, doesn't throw IndexError when no args
passed. Also logs to security_group.log when executed with no args or unknown
command.
Review: https://reviews.apache.org/r/9588
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 14:12:49 +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
755ddc52d1
db: Re-enable db foreign key checking at the end of the upgrade path
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 12:32:21 +05:30
d37ed18c3a
CLOUDSTACK-1244: Make sure path exists before copying scripts in client/target
...
This reverts commit cc25e58d
2013-02-26 12:17:38 +05:30
f323c641fd
packaging: vhd-util message corrected
...
Change on cloud.spec for the message about vhd-utils point to the new
location of cloudstack scripts
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-26 11:38:22 +05:30
10236bee26
CLOUDSTACK-1374 - When user uploads a volume using uploadVolume API command, only volume_host_ref table is getting updated with corresponding size of volume and "volumes" table, the size of volume still remains zero even ager the volume gets completely downloaded.
...
Signed-off-by: Nitin Mehta <nitin.mehta@citrix.com>
2013-02-26 10:51:25 +05:30
a1b33cadf5
CLOUDSTACK-1332: Enable IPv6 dns in VR
2013-02-25 19:12:15 -08:00
cf90b6cd10
CLOUDSTACK-1332: Add ip6dns to zone and domainrouter response
2013-02-25 19:12:09 -08:00
596e940264
CLOUDSTACK-1332: Pass IPv6 DNS to VR
2013-02-25 16:08:15 -08:00
1b408509d6
CLOUDSTACK-1332: Add IPv6 DNS for Zone
2013-02-25 16:08:10 -08:00
c1d513ef12
CloudStack CLOUDSTACK-1382
...
vm deploy fails with Error "cannot find DeployPlannerSelector for vm"
adding configuration of DeployPlanSelector to nonossComponentContext.xml.in
fixed resolved
2013-02-25 16:07:50 -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
39af8a3a16
Merge branch 'master' into vim51_win8
2013-02-25 14:18:21 -08:00
cc25e58dc2
move copy scripts after classes folder is created
2013-02-25 14:06:30 -08:00
d4bada3a5e
Docs: Fixing NFS shares setup
2013-02-25 16:51:02 -05:00
02192db9a3
Package awsapi into the cloudstack-bridge package
2013-02-25 22:26:27 +01:00
084b6f3e05
Merge branch 'master' into vim51_win8
2013-02-25 11:55:12 -08:00
fbfc5c6894
Merge from master and fix conflicts
2013-02-25 11:53:24 -08:00
b174165445
Docs: Fix for CS-1300
2013-02-25 14:44:04 -05:00
1dc25f25c5
Docs: Fixing issues
2013-02-25 14:25:53 -05:00
3424212638
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2013-02-25 14:06:55 -05:00
bf9ff8c4f6
cloudstack-462
...
Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2013-02-25 13:57:21 -05:00
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
c30da35811
Commit review 9586
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-25 14:40:15 +01:00
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
15201d908f
CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes
2013-02-25 18:54:30 +05:30
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
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
fe9df2186b
Have cloud-setup-* tools detect Debian
...
To minimize this change, treat Debian as Ubuntu for now.
Reviewed-by: Wido (https://reviews.apache.org/r/9310 )
2013-02-25 12:32:25 +05:30
a4398af353
CloudStack-1371 : In case of ResourceAllocationException, server is not returnig any response.
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-02-25 14:05:33 +08:00
a32c6d5c9d
db: Fix deploydb, make sure scripts are in path
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-25 11:00:56 +05:30
Min Chen
Sheng Yang
Brian Federle
Hugo Trippaers
Kishan Kavala
Pranav Saxena
Rohit Yadav
Wei Zhou
Mice Xia
Radoslaw Smigielski
Ricardo P. Katz
Sanjay Tripathi
frank
Edison Su
Sebastien Goasguen
radhikap
Brenn Oosterbaan
Vijayendra Bhamidipati
Deepti Dohare
Noa Resare