16447 Commits

Author SHA1 Message Date
Wei Zhou
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
Rohit Yadav
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 c7935a9ab69ae941270d60d22e812e86b5e9c896)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 15:37:58 +05:30
Rohit Yadav
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
Mice Xia
46e91bd794 fix issue: failed to start vm from iso caused by ClassCastException and NPE 2013-02-26 17:01:26 +08:00
Kishan Kavala
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
Radoslaw Smigielski
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
Rohit Yadav
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
Rohit Yadav
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
Rohit Yadav
d37ed18c3a CLOUDSTACK-1244: Make sure path exists before copying scripts in client/target
This reverts commit cc25e58d, let's explicitly make sure that paths exists.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 12:17:38 +05:30
Ricardo P. Katz
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
Sanjay Tripathi
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
Sheng Yang
a1b33cadf5 CLOUDSTACK-1332: Enable IPv6 dns in VR 2013-02-25 19:12:15 -08:00
Sheng Yang
cf90b6cd10 CLOUDSTACK-1332: Add ip6dns to zone and domainrouter response 2013-02-25 19:12:09 -08:00
Sheng Yang
596e940264 CLOUDSTACK-1332: Pass IPv6 DNS to VR 2013-02-25 16:08:15 -08:00
Sheng Yang
1b408509d6 CLOUDSTACK-1332: Add IPv6 DNS for Zone 2013-02-25 16:08:10 -08:00
frank
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
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
Edison Su
cc25e58dc2 move copy scripts after classes folder is created 2013-02-25 14:06:30 -08:00
Sebastien Goasguen
d4bada3a5e Docs: Fixing NFS shares setup 2013-02-25 16:51:02 -05:00
Hugo Trippaers
02192db9a3 Package awsapi into the cloudstack-bridge package 2013-02-25 22:26:27 +01:00
Sebastien Goasguen
b174165445 Docs: Fix for CS-1300 2013-02-25 14:44:04 -05:00
Sebastien Goasguen
1dc25f25c5 Docs: Fixing issues 2013-02-25 14:25:53 -05:00
Sebastien Goasguen
3424212638 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-02-25 14:06:55 -05:00
radhikap
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
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
Brenn Oosterbaan
c30da35811 Commit review 9586
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-25 14:40:15 +01: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
Noa Resare
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
Sanjay Tripathi
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
Rohit Yadav
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
Rohit Yadav
357b4e63ac Revert "make the create database work"
This reverts commit 1c77ae62374f2d1a064726bb7bcf1814a0c0b1ff.
2013-02-25 11:00:56 +05:30
Prasanna Santhanam
f5ba9137cc Back to the old expunge logic
The expunge interval and delay are respected and no additional delays
are introduced.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-25 10:59:02 +05:30
Ricardo P. Katz
c1e47ad329 Changed the cloud.spec to use the right version on cloudstack-common requirement 2013-02-24 20:19:00 -05:00
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
Alex Huang
1c77ae6237 make the create database work 2013-02-23 19:07:22 -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
Sheng Yang
f87759dabe IPv6: Enable specifying ipv6 address in DeployVMCmd 2013-02-22 14:25:48 -08:00
Hugo Trippaers
8761a1d0db CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges
Missed a few lines, did someone mention something about testing
recently?
2013-02-22 22:30:28 +01:00
Brian Federle
df0039368b Fix missing 'add' action on instances page 2013-02-22 11:21:59 -08:00
Jessica Wang
ff4a54ce68 CLOUDSTACK-1319: cloudstack API - CreateVpnCustomerGateway API: correct parameter type on server-side. 2013-02-22 10:40:00 -08:00
Chiradeep Vittal
d784e7b5fe Fix broken build: apidocs had been commented out for some strange reason
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-02-22 10:13:30 -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
Hugo Trippaers
1ad363e44a CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges
related to commit 5f8a2ee9be490f7ecf7ada2e0847e76ac5b81fed. The field image_data_store_id should not be used in templates.sql as  it does not exist yet. Should be filled during the upgrade from 4.1 to 4.2, but i'm leaving that to Edison.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-22 16:22:17 +01:00
radhikap
6250c85912 resize volume
Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net>
2013-02-22 09:08:09 -06:00
Bharat Kumar
667aa17512 CLOUDSTACK 711: CPU and RAM overcommit update cluster part 2013-02-22 20:09:50 +05:30
Rohit Yadav
54f7933f11 CLOUDSTACK-1355: Don't check foreign key constraint during db upgrades
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-22 19:28:07 +05:30