fb18223933
Merge branch 'master' into planner_reserve
...
Conflicts:
api/src/com/cloud/event/EventTypes.java
server/src/com/cloud/capacity/CapacityManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
server/test/resources/affinityContext.xml
setup/db/db/schema-410to420.sql
2013-05-08 17:02:35 -07:00
0e792eb938
- Host reservation release process
...
- Make deployment_planner optional field in service offering, global config vm.deployment.planner
- Admin API to release host reservation
2013-05-08 16:38:01 -07:00
732566e703
CLOUDSTACK-2364: fixed private gateway creation in VPC - the vnet for the private gateway network is not stored in data_center_vnet table
2013-05-07 13:07:47 -07:00
81d6da5ad7
Host reservation release using MessageBus
2013-05-06 23:24:48 -07:00
bc823f946c
Fixed up the simulator to run with windows paths in cygwin
2013-05-06 16:34:41 -07:00
2639b9f91e
Moved over the VLAN daos
2013-05-06 16:34:41 -07:00
3722d66aae
Fixed up unit testing to use only an in class TestConfiguration
2013-05-06 16:34:27 -07:00
074df0b415
Fixed an incorrect unit test for affinity group. Removed some useless pom.xml.
2013-05-06 16:34:26 -07:00
572e71e57d
Moved most of the VOs and DAOs from server package into engine-schema as well
2013-05-06 16:34:26 -07:00
f6913b5088
Removed files that are no longer used and further separated out the files in the core project
2013-05-06 16:34:21 -07:00
ad2777c547
Moved agent commands to core and out of api
2013-05-06 16:34:20 -07:00
e0d8f01ecd
Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema.
2013-05-06 16:34:16 -07:00
af5bf94b43
CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-06 20:58:32 +01:00
b29449b4b7
CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack
2013-05-06 11:46:43 -07:00
e56d2a401c
CLOUDSTACK-2188 : Parsing error with Download Monitor while checking the health of downloaded templates
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-06 15:11:49 +05:30
c8d843241e
Dedicate guest vlan range to account
2013-05-06 10:02:41 +05:30
9b865161dd
Fixes after rebase
2013-05-05 00:50:20 -07:00
5ac3ed099a
Putting back the changes done for adidng deployment planner in ServiceOffering
2013-05-04 23:27:47 -07:00
92677c6f44
Fixes to ExclueList and DPM logic while testing HA and parallel deployment.
2013-05-04 22:59:14 -07:00
66fc2cabf1
Build fixes
2013-05-04 22:59:10 -07:00
ec7ea15cb6
Changes to create ServiceOffering with deployment_planner
2013-05-04 22:58:11 -07:00
70405bd2b4
Fixing issues while testing VM deployment.
2013-05-04 22:55:37 -07:00
05f213d33d
Allocators need to add hosts/pools not considered to avoid list
2013-05-04 22:55:34 -07:00
35abcd38e5
Adding new interface DeploymentClusterPlanner.java and refactoring planners
2013-05-04 22:55:30 -07:00
1c5cddf084
Adding new DeploymentClusterPlanner interface
2013-05-04 22:53:41 -07:00
06d4b7de3b
Changes to the op_host_planner_reservation schema - removed unnescessray columns
2013-05-04 22:53:37 -07:00
593e43b93b
Adding `cloud`.`op_host_planner_reservation` schema, VO and DAO classes
2013-05-04 22:53:34 -07:00
93277e8647
Planner choice in ServiceOffering and Planners using the ServiceOffering in canHandle()
...
Also removed the DeployPlannerSelector.class adapter
Added an upgrade mechanism for 410to420
2013-05-04 22:53:30 -07:00
a3a5c13427
CLOUDSTACK-2303: upgrade failed from 2.2.14 to 4.1.0 - part2
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-03 16:03:56 +01:00
38b4f84f17
CLOUDSTACK-2146: system vm scaleup failed ;{ "scalevirtualmachineresponse" : {"errorcode":530,"cserrorcode":9999,"errortext":"Failed to scale vm"} }
...
Only response generation for system vm scale up failed so fixed by changing the response object.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-03 16:49:08 +05:30
a3a5862301
CLOUDSTACK-2317: NPE while cloudstack trying to get system ip and enable
...
static nat for the vm VM
splitting enableStaticNat() method in to a service and manager layer
method. So as to ensure action event annotation is present only on
service layer method.
2013-05-03 15:37:25 +05:30
3ae4819732
fixes bug which was storing NetScale site public IP as site private IP
2013-05-03 12:36:02 +05:30
0680fbdff3
CLOUDSTACK-2193: associateIpAddress is failing in "basic zone" that is
...
enabled for EIP/ELB
restricting check that shared network should have services in orider to
associate ip, to advaced zone shared networks only. On basic zone shared
network associateIpAddress should work.
2013-05-03 11:38:40 +05:30
4a40f3f6da
CLOUDSTACK-741: Granular Global Parameters fixing network.throttling.rate to work per zone in vmware
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-03 10:52:04 +05:30
d7cab21e9a
1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot
2013-05-03 12:32:53 +08:00
f8504c0960
CLOUDSTACK-2303: fix upgrade failed from 2.2.14 to 4.1.0 for systemvm changes
...
The version of systemvm of 3.* and 4.0.* is systemvm-kvm-3.0.0.(from
http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.0.2/pdf/Release_Notes/Apache_CloudStack-4.0.2-Release_Notes-en-US.pdf )
However, on cloudstack 4.1.0, the systemvm version is 4.1.0. (from
http://dissociatedpress.net/uploads/Apache_CloudStack-4.1.0-Release_Notes-en-US.pdf )
so the upgrade processing from 2.2.14 to 4.1.0 will abort at
updateSystemVms in Upgrade2214to30.java.
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-02 13:12:18 -04:00
85a1cc962c
CLOUDSTACK-2087: Destroying the instance is not decrementing the primary storage usage [Resource Count table - No of volumes is not got decremented]
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-02 16:17:13 +05:30
1f1467974f
CLOUDSTACK-1828 Source Nat on private gateway feature
2013-05-02 15:40:15 +05:30
f1c794de1b
CLOUDSTACK-2160: fix bug add a huge size guest network will cause out of memory
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-05-02 13:19:12 +08:00
f101241050
Apply patch for https://reviews.apache.org/r/10892/
2013-05-01 17:40:38 -07:00
3d10f700f9
CLOUDSTACK-2120: API - mixed zone management - fix a bug that listTemplates/listIsos API didn't take in zoneType properly.
2013-05-01 16:13:20 -07:00
807ad0a39a
CLOUDSTACK-741 - Making storage disable thresholds configurable at zone level.
2013-05-01 15:44:09 +05:30
e091f43182
CLOUDSTACK-2049. Generate usage events for usage type Public IP addresses when IP is dedicated to and released from an account
...
1. Publish usage event EVENT_NET_IP_ASSIGN when an ip is dedicated to an account or a non-dedicated ip is acquired by an account
2. Publish usage event EVENT_NET_IP_RELEASE when an ip is released from an account or deleted
2013-05-01 14:29:50 +05:30
b16ccc9fa6
CLOUDSTACK-2036 - Adding storage storage.overprovisioning.factor configurable at zone level.
2013-05-01 14:21:09 +05:30
1cb9bd531f
CLOUDSTACK-2180: restoreVirtualMachine returns no password if the template is password enabled
...
New password is generated as part of restore vm(passwd enabled template) and send new password on VR
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-01 12:29:08 +05:30
10b6c1c6c8
CLOUDSTACK-741: Granular Global Parameters Added parameters to cluster level cluster.storage.allocated.capacity.notificationthreshold cluster.storage.capacity.notificationthreshold
...
CLOUDSTACK-2036
global parameter for Router Template ID functionality added
We use 5 parameters to set the router template name for each hypervisor
Moved cpu.overprovisioning.factor and mem.overprovisioning.factor to be able to update/list using update/list configuration API at cluster level.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-01 12:12:37 +05:30
ce7dc70b1d
CLOUDSTACK-2194: Fix ApiServer component initialization sequence
2013-04-30 10:59:29 -07:00
e7f4bfe1b8
Fix NPE in the planner, in the case that pool ID cannot be looked up in database
...
when deploying a VM
BUG-ID: CLOUdSTACK-2281
Bugfix-for: 4.2
Reviewed-by: Prachi Damle
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367280909 -0600
2013-04-29 18:15:09 -06:00
a0dbf89090
Look for null pointer on account id before trying to update usage when releasing
...
an IP. This seems to be possible if expunge fails at some point after freeing
an IP, on subsequent expunge tries the IP is freed already and gets null pointer
when looking for account id.
BUG-ID: CLOUDSTACK-2279
Bugfix-for: 4.1,4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367251304 -0600
2013-04-29 10:01:44 -06:00
deaf9106ca
CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
...
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
2013-04-29 14:11:51 +05:30
Prachi Damle
Alena Prokharchyk
Alex Huang
Wei Zhou
Sanjay Tripathi
Likitha Shetty
Harikrishna Patnala
Murali Reddy
Mice Xia
Jayapal
Hongtu Zang
Kelven Yang
Jessica Wang
Nitin Mehta
Marcus Sorensen