etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,518 Commits 330 Branches 325 Tags 855 MiB
Commit Graph

6274 Commits

Author SHA1 Message Date
Kelven Yang 3f2b771e07 CLOUDSTACK-1173: fix the regression caused by life-cycle management changes 2013-03-05 19:03:30 -05:00
Kelven Yang 333dd810d2 CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-03-05 19:03:30 -05:00
Kelven Yang 72e6fd6e8d CLOUDSTACK-1362: Put a workaround fix to set excutable attribute of injectkys.sh at runtime 2013-03-05 19:03:30 -05:00
Min Chen 33757377c0 CLOUDSTACK-1465: We should pass array instead of a List for SearchCriteria.Op.IN as value. 2013-03-05 14:20:55 -08:00
Min Chen 9c5c4753e9 CLOUDSTACK-1484: provide api.throttling.enabled gloabl configuration settings to enable/disable api throttling feature. 2013-03-05 09:44:09 -08:00
Min Chen 5750fd9631 CLOUDSTACK-1190: make APIChecker throw one sensible exception. 2013-03-05 09:44:08 -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
Min Chen 48aa035a71 CLOUDSTACK-1449: listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned. 2013-03-04 14:42:32 -08:00
Nitin Mehta b12aebefee Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes" 
This reverts commit e0019eccd9.
 2013-03-04 23:32:52 +05:30
Nitin Mehta e0019eccd9 CLOUDSTACK-658 - Adding Scalevm command and XS related changes 2013-03-04 14:47:55 +05:30
Jayapal Uradi aedb8c478e CLOUDSTACK-24: mipn feature for isolated and vpc networks 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
 https://issues.apache.org/jira/browse/CLOUDSTACK-24
 2013-03-04 11:02:09 +05:30
Min Chen 8b9c45b96d Merge branch 'master' into vim51_win8 
Conflicts:
	setup/db/db/schema-40to410.sql
 2013-03-01 16:46:58 -08:00
Abhinandan Prateek 14791a9d8f Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes." 
This reverts commit f9d96c9169.
 2013-03-01 22:29:47 +05:30
Jayapal Uradi f9d96c9169 CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes. 2013-03-01 16:40:26 +05:30
Roeland Kuipers 68b836d46d review 8701: createSetupGuestNetworkCommand in 
VpcVirtualNetworkApplianceManagerImpl.java fails when the broadcast URI
is not a long

Fixed whitespace issues

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2013-03-01 09:38:56 +01:00
Prasanna Santhanam 993afdba6a ignore the tests looking for db 
These tests require DB to be present to do upgrade. Revisit later.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-03-01 12:04:06 +05:30
frank bd0fc2f354 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh

Conflicts:

	client/pom.xml
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
 2013-02-28 15:42:48 -08:00
Min Chen 801e5269ea Merge branch 'master' into vim51_win8 2013-02-28 14:25:26 -08:00
Min Chen 6f19895191 Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion. 
Confirmed with Kishan about this.
 2013-02-28 14:17:58 -08:00
Kishan Kavala 1d31c3ecaf CLOUDSTACK-241: Moved regions upgrade changes to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1. 
Conflicts:
	setup/db/db/schema-40to410.sql
 2013-02-28 14:35:23 +05:30
Mice Xia 91417115ef CLOUDSTACK-1401 NPE: listCapacity 2013-02-28 11:46:10 +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
Prachi Damle 9afd33d206 CLOUDSTACK-1418- As regular user , we are not allowed to deploy VM on a shared network. 
- Added the access type attribute to @acl
- Domainchecker needs the AccessType.UseNetwork value specified to check access to network
 2013-02-27 17:16:49 -08:00
Sheng Yang 50f995f8b4 CLOUDSTACK-1170: Use a unified way to generate PublicIp 
Tired of manually generate mac address everytime when create PublicIp object.
 2013-02-27 14:20:26 -08:00
Min Chen 7d2ebc9fc3 Add some comments on some code source to give credit to vmware sample 
code.
 2013-02-27 13:46:43 -08:00
Noa Resare 2f135be15f CLOUDSTACK-1415: Debian & Ubuntu packaging work 
Some concepts included:

* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
 2013-02-27 15:44:46 +00:00
Murali Reddy 3e0bdaac1e CLOUDSTACK-1391: EventBus is not getting injected after javelin merge 
added logic to inject event bus using ComponentContext.getComponent

Conflicts:
	server/src/com/cloud/storage/listener/SnapshotStateListener.java
 2013-02-27 18:55:22 +05:30
sateesh 82d00c5fd1 Re-basing with latest master. 
CLOUDSTACK-657 VMware vNetwork Distributed Virtual Switch support in CloudStack

This is 2nd patch for feature 'Support for VMware dvSwitch in CloudStack'.

This patch introduces 2 new global configuration parameters
"vmware.use.dvswitch" - Enable dvswitch functionality.
"vmware.ports.per.dvportgroup" - Default number of ports per Vmware dvPortGroup.

This patch introduces 4 optional parameters to AddCluster API
guestvswitchtype - Type of vSwitch to use for guest traffic
guestvswitchname - Name of vSwitch to use for guest traffic
publicvswitchtype - Type of vSwitch to use for public traffic
publicvswitchname - Name of vSwitch to use for public traffic

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-02-27 18:37:15 +05:30
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
David Grizzanti 53b6ba3798 CLOUDSTACK-420: listZones missing name parameter 
When calling the listZones API command, you can now supply a name to pull a specific zone by name.

Updated two classes to include name paramater and query data centers/zones by name if suppled:
- server/src/com/cloud/api/query/QueryManagerImpl.java
- api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-02-27 13:35:26 +05:30
Edison Su cc81413931 CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more 2013-02-26 23:16:17 -08:00
Harikrishna Patnala 254275dc26 CLOUDSTACK-1293: resetpasswordforVm shows "passsd reset to undefined" 2013-02-27 12:35:04 +05:30
Sheng Yang a76301bbbe CLOUDSTACK-1232: Only support cidr=64 in IPv6 2013-02-26 19:46:45 -08:00
Edison Su 8e360f342d CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -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
Kishan Kavala 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
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 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
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
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 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 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