apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,105 Commits 304 Branches 324 Tags
Commit Graph

1351 Commits

Author SHA1 Message Date
Prachi Damle
0f565f2167 Fixes to de-couple the AffinityGroupResponse from UserVmResponse, since ApiDiscoveryService breaks, if we nest two response objects into each other. 2013-04-11 13:23:25 -07:00
Prachi Damle
3403b54773 Added AffinityGroup View in order to include VM details while listing AffinityGroups. 2013-04-11 13:23:23 -07:00
Prachi Damle
09a6eb735d Changes to return affinity groups information during listVMsCmd 2013-04-11 13:23:20 -07:00
Prachi Damle
ec3f844ef1 Correcting the rebase merge issues. 2013-04-11 13:23:15 -07:00
Prachi Damle
c8ae2a9d25 API to list planners and set the planner in Service offering 
Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-11 13:22:56 -07:00
Prachi Damle
1ba6740fc1 Schema changes to create affinity group tables 2013-04-11 13:22:49 -07:00
Prasanna Santhanam
f8bbd88a42 maven+marvin: Fix up the activation property 
activation property marvin.config will attempt to deploy a zone again on
running the marvin.test profile. This is unnecessary as marvin.setup
already finishes deploying a zone.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-10 16:16:41 +05:30
Mice Xia
b646e43a1a use hypervisor capabilities to control if vm snapshot is enabled for hypervisors 2013-04-10 12:36:42 +08:00
Mice Xia
bd7a38957a 1)use vmsnapshot.create.wait to control vmsnapshot timeout 2)remove global configuration vmsnapshot.expunge.interval and vmsnapshot.expunge.workers since vmsnapshot expunge is synchronous 2013-04-10 11:35:58 +08:00
Kelven Yang
913f73ab6b Apply patch https://reviews.apache.org/r/10137/ 2013-04-09 17:29:21 -07:00
Hugo Trippaers
89d3808a18 packaging: move jasypt jar to cloudstack-common 
Continuation of the work done in a35f7c7bd179a33e833d3d93f61f94ee7124c3f1
 2013-04-05 16:12:27 +02:00
Kishan Kavala
7ea0d7bce4 CLOUDSTACK-1874: Removed region_id column from cloud_usage db account table 2013-04-05 13:57:27 +05:30
Chip Childers
94960cc722 CLOUDSTACK-1842: adding the missing os type in upgrade script 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-04-04 17:36:00 +01:00
Edison Su
f18a1d6f14 fix bunch of bugs related to zone wide storage 2013-04-03 21:51:17 -07:00
Alex Huang
d24a45abaa Added fixes for CLOUDSTACK-1839. Missing lots of indexes due to a rollback to 4.0 by Rohit 2013-04-03 14:42:47 +01:00
Alena Prokharchyk
2313676857 41-42 db upgrade - added cloud db reference to the upgrade statements for remote access vpn 2013-04-02 11:11:18 -07:00
Prasanna Santhanam
b798c45114 maven+marvin+simulator: Changes to the lifecycle steps 
integration test is now run as follows:

Build
$ mvn -Pdeveloper -Dsimulator clean install

DB:
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator

Setup:
$ mvn -Pdeveloper,marvin.setup -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Test:
$ mvn -Pdeveloper,marvin.test -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-02 19:56:33 +05:30
Prasanna Santhanam
2e2046fe38 marvin changes to do an pre-integration and integration test 
Introducing the simulator spring context -
simulatorComponentContext.xml.in. This separates the simulator beans so
that production deployments don't have the simulator in them. Context is
enabled with -Dsimulator as part of the developer profile.

Also adding config files - Simulator Config for advanced zone and basic
zone deployments under setup/dev.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-02 18:31:29 +05:30
Phong Nguyen
aa79ccf985 CLOUDSTACK-922: LXC Support in Cloudstack. 
Signed-off-by: Edison Su <sudison@gmail.com>
 2013-04-01 15:41:42 -07:00
Alena Prokharchyk
e00f22df8a CLOUDSTACK-240: added id/uuid fields to remote_access_vpn table and corresponding VO/Dao objects. The DB upgrade is covered as well. Now tags can be created for the VPN object 2013-03-29 10:40:28 -07:00
Prasanna Santhanam
d13c18516a CLOUDSTACK-1841: Missing cloud.configuration stmts in upgrade 
Following global configurations introduced b/w 3.0.2 and 4.1 were
missed.

concurrent.snapshots.threshold.perhost | NULL
network.ipv6.search.retry.max | 10000
traffic.sentinel.exclude.zones |
traffic.sentinel.include.zones | EXTERNAL

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-03-29 13:25:20 +05:30
Sanjay Tripathi
18695276f7 CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts 
Addition of two new resource types i.e. Primary and Secondary storage space in the existing pool of
    resource types.
    Added methods to set the limits on these resources using updateResourceLimit
    API command and to get a count using updateResourceCount. Also added calls in the
    Templates, Volumes, Snapshots life cycle to check these limits and to increment/decrement the new
    resource types

    Resource Name          :: Resource type number
        Primary Storage               10
        Secondary Storage             11

    Also added jUnit Tests for the same.
Reviewed by : nitin mehta<nitin.mehta@citrix.com>
 2013-03-29 11:26:38 +05:30
Murali Reddy
c5fb8349bf CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load 
Balancing) capability for ELB service

merging GSLB feature
 2013-03-27 17:54:07 +05:30
Kishan Kavala
00742e524c Added / to the end_point of default local region. UI expects / while switching to other regions using single sign-on 2013-03-22 10:34:01 +05:30
Edison Su
33937c980e CLOUDSTACK-1744: It's due to db upgrade issue. On master, deploydb will upgrade db to 4.2, which will update vm_template's image_data_store_id, while deploydb-simulator adds a new column in vm_template table, which doesn't set image_data_store_id, thus causing NPE. 2013-03-21 18:25:02 -07:00
Edison Su
3ed6200ef8 move default primary storage plugin into its own pom 2013-03-20 17:21:40 -07:00
Min Chen
6bc12fa66d CLOUDSTACK-1511 and CLOUDSTACK-1446 2013-03-20 00:45:47 +00:00
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
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 5e4c2c8a9eb339fb467aea15582a79cd2feef4bf.
 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
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 f9d96c9169a50917143914ffb53e227c8673c50f.
 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