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

1334 Commits

Author SHA1 Message Date
Murali Reddy 83d381f25c fixing some issues found in unit testing 2013-03-26 12:00:13 +05:30
Murali Reddy dc25e9f2bb Merge branch 'master' into gslb-wip 2013-03-19 17:21:59 +05:30
Murali Reddy 45110b65dc Merge branch 'master' into gslb-wip 
Conflicts:
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/region/Region.java
	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	server/src/org/apache/cloudstack/region/RegionVO.java
 2013-03-19 17:20:44 +05:30
Kishan Kavala 217ebf20a6 CLOUDSTACK-1717, CLOUDSTACK-1718: Corrected RemoveRegion response. Removed /api in Local region end_point 2013-03-19 16:58:43 +05:30
Rajesh Battala 183b989d30 CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful 2013-03-18 14:01:15 +05:30
Kishan Kavala 2dd31f331d CLOUDSTACK-1636: Removed the concept of owner region. 
Removed region_id from user/account and domain tables.
Removed forwarding of api calls to owner region.
Removed api_key and secret_key from region table.
Included related DB upgrade changes.
 2013-03-14 11:53:40 +05:30
Pradeep Soundararajan 7bb8ed4d05 BUG-ID: CLOUDSTACK-1557 
Summary: EC2 REST API : cloudbridge database is missing on the CloudStack Installation

After this change, cloudstack-setup-databases is launching cloud-bridge related databases properly.
 2013-03-13 14:20:41 -07:00
Murali Reddy 3a310ac830 move DB schema changes from create-schema to schema41-42 file 2013-03-12 11:28:46 +05:30
Murali Reddy fea98fa66b Merge branch 'master' into gslb-wip 
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/Config.java
	setup/db/create-schema.sql
 2013-03-11 14:28:26 +05:30
Murali Reddy 11a7546f1e add the ability to add NetScaler device as GSLB provider in a zone 2013-03-11 12:42:51 +05:30
Sanjay Tripathi f539f40e35 CLOUDSTACK-874: Ability to delete Events and Alerts 
This feature will provide the functionality to delete or archive
the Alerts/Events.
Delete or archive alerts APIs are available only for root-admin,
delete or archive events are available for regular users.
 2013-03-08 11:59:53 -08:00
Chip Childers bd4508589b Revert "CLOUDSTACK-874 Ability to delete Events and Alerts" 
This reverts commit 5e4c2c8a9e.
 2013-03-08 14:28:23 -05:00
Sanjay Tripathi 5e4c2c8a9e CLOUDSTACK-874 Ability to delete Events and Alerts 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-03-08 10:52:40 -08:00
Kishan Kavala a1fdb0c2d4 CLOUDSTACK-241: Remove API sync. Merge changes from 4.1 branch. Converted tabs to spaces. 2013-03-08 19:02:41 +05:30
Murali Reddy 89c33a01e7 -introducing RegionServiceProvider and GslbServiceProvider 
-NetScaler element implements GslbServiceProvider
 2013-03-07 20:05:51 +05:30
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
Venkata Swamybabu Budumuru 5b8f0791ec Accounts can hold multiple vnets. Same vnets can exist across multiple pnets. It is sufficient to constrain a single vnet in a given pnet within a datacenter. `i_op_dc_vnet_alloc__vnet__data_center_id` covers all use cases for the table. 
Having `i_op_dc_vnet_alloc__vnet__data_center_id__account_id` will restrict
same account holding the same vnet across different physical networks.

Signed-off-by: Kishan Kavala <kishan@cloud.com>
 2013-03-05 13:59:02 +05:30
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
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
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
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
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
Rohit Yadav e2bd88b2a1 db: Give option to specify region id while setting up database 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-27 15:03:14 +05:30
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 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
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
Murali Reddy 70e2eeaea8 implements logic of sending global load balancer config command to all 
the agents that represent the GSLB service provider in the zones
particiapting in global load balancing
 2013-02-26 10:26:34 +05:30
Sheng Yang cf90b6cd10 CLOUDSTACK-1332: Add ip6dns to zone and domainrouter response 2013-02-25 19:12:09 -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 fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -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 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
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
Hugo Trippaers 1ad363e44a CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges 
related to commit 5f8a2ee9be. 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
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
Rohit Yadav 5f8a2ee9be CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-22 19:15:01 +05:30
Saksham Srivastava ea3db2f073 CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks 
CloudStack uses Guest CIDR for dhcp-range for the Guest VMs. The entire
CIDR is used by CloudStack for assigning IPs to Guest VMs. IP Address
Reservation will allow part of address space to be used fornon CloudStack
hosts/physical servers also, by restricting the address space of CloudStack
Guest VMs. Reservation can be configured using update Network API by specifying
guestvmCidr as an additional parameter. Reservation will be applicable for
Isolated Guest Networks including VPC. reservediprange in the response
will return the IP range that can be used for non Cloudstack hosts.

Tested manually the following scenarios:
Applying reservation when there are running VMs inside the
guest_vm_cidr.
Applying reservation when there are running VMs outside the
guest_vm_cidr.(not allowed)
Applying reservation when external device like Netscaler is configured
in the guest_cidr.
Applying reservation in VPC tiers.
Applying reservation outside the range of guest_cidr.(not allowed)
 2013-02-22 15:50:33 +05:30
Murali Reddy 701f4cad4f implements assiging load balacner rules to global load balancer rules 2013-02-22 14:53:06 +05:30
frank 8a523476ec CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

remove workaround for unable to deploydb
remove wrongly added region upgrade entries
 2013-02-21 15:48:26 -08:00
frank 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
Edison Su 18e496b057 rebase to master 2013-02-21 11:22:50 -08:00
Edison Su a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Murali Reddy 2a7eb95f57 implements CreateGlobalLoadBalancerRuleCmd that created gloabal load 
balancer rule

Dao, Vo objects and schema changes to persis gslb rules
 2013-02-21 17:21:25 +05:30
Rohit Yadav 59db01ce6e CLOUDSTACK-1347: Don't enforce not null rule on queue_proc_time of sync_item_queue 
In c63dbb8804 I removed the rule from create-schema:
-  `queue_proc_time` datetime COMMENT 'when processing started for the item',

But, upgrade path schema-40to410.sql had a different rule which caused the bug:
+ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME NOT NULL
COMMENT 'when processing started for the item' AFTER `queue_proc_number`;

In this fix we just revert to whatever rule was defined in create-schema as the
developer may have forgetten to fix same rule in create-schema and upgrade path.
This commit can be reverted or the code be fixed if we want that queue_proc_time
cannot be null.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-21 15:01:00 +05:30
Harikrishna Patnala 7a3f072a50 CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-02-21 14:59:35 +05:30