3ecc52a4f3
Re-absorb delta in master into vmsync
2013-07-03 17:58:38 -07:00
43ab9506ab
Moved HostAllocator and PodAllocator from server to api package, where they are supposed to be. In the process, I had to change the VO objects used by these two itnerfaces to interface equivalent. This makes sense because there's really no reasons why allocators require write access to the database. One of the files have been reformatted because it contained a bunch of tabs instead of spaces for indentation.
2013-07-03 17:48:53 -07:00
410dff9d89
CLOUDSTACK-1676: UI > zone wizard > basic zone > pass securitygroupenabled=true if selected network offering includes security group service; pass securitygroupenabled=false if selected network offering does not include security group service.
2013-07-03 17:05:00 -07:00
306d0907bc
Fixing migration of a virtual machine with storage in the new framework. Made changes to queue a VmWorkJob for migration. The work gets picked up by job dispatcher which carries out migration of the vm with storage.
2013-07-04 04:52:19 +05:30
78fa5e14ee
Fixed null pointer in ServerContexts
2013-07-03 15:26:39 -07:00
1bd74420cc
CLOUDSTACK-3207: UI > domain page > get total number of instances, volumes by both listAccounts API and listProjects API.
2013-07-03 15:24:52 -07:00
8d21f49ec9
Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged
2013-07-03 15:01:23 -07:00
b59b1b4c93
fix can't find host ip address on Mac OS
2013-07-03 14:34:37 -07:00
810c64e387
fix marvin when deploy vmware setup
2013-07-03 14:34:33 -07:00
d8560281a4
CLOUDSTACK-3347: fixed project deletion for project's owned template
...
Conflicts:
server/src/com/cloud/template/TemplateAdapterBase.java
2013-07-03 13:48:06 -07:00
0a241b8ea8
Update L10N strings from Transifex to repo
2013-07-03 20:52:32 +01:00
ab5f5809c3
VMSync: Added copyright
2013-07-03 11:23:22 -07:00
bec53fb59a
VMSync: Separating jobs from api
2013-07-03 11:22:40 -07:00
d2739cde2e
Fix file name in DnsMasqConfigCommand
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 20:43:42 +05:30
9ba36fd173
uncomment the cleanup.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 20:03:50 +05:30
9f0c9ee20c
CLOUDSTACK-3184: integration test for the updateVirtualMachine
...
updateVirutalMachine fails if no args are passed. this test also further
verifies that the displayname is changed when vm is started up
successfully.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 19:39:02 +05:30
31df729008
CLOUDSTACK-3184: updateVirtualMachine api gives java NPE.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 19:39:02 +05:30
c49674300a
Adding license header to server/test/com/cloud/network/security/SecurityGroupManagerImplTest.java
2013-07-03 10:05:29 -04:00
6bad34c509
CLOUDSTACK-3110: [VMWARE]NPE while adding primary storage(scope=cluster) with Invalid hostname
...
Description:
When retrieving primary datastore, handle case for non-existing datastores/hosts.
Throw exception and handle the exception in datastore mgmt layer and pass onward
to create storage pool API.
2013-07-03 09:43:00 -04:00
141fbc7ef7
cidr compare fixme addressed
2013-07-03 09:28:49 -04:00
90a15bfff6
CLOUDSTACK-2107
...
If the scaling up fails on the host the vm is running on try to migrate it to other hosts in the cluster and try scaling.
CLOUDSTACK-3349
For deciding the host in the cluster try the new deployment manager now
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-03 18:40:22 +05:30
4e823e3a3e
Workaround for NPE
2013-07-03 14:59:03 +02:00
5396dfa55c
CLOUDSTACK-2760: Agent status for SSVM and CPVM
2013-07-03 17:22:35 +05:30
e63ac5512e
CLOUDSTACK-3324: Fix/Improve upgrade system vm template 41 to 42
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 17:18:25 +05:30
9d07f899c8
separate the shared network test for network offerings
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 17:10:53 +05:30
04d9d209ad
Removing the vlan selection in network offering test
...
Also do not wait for cleanup. Just send cleanup to server and proceed
further.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 17:04:20 +05:30
98c5fe3a8d
CLOUDSTACK-3302: [Multiple_IP_Ranges][VmWare] VM deployement failed due to dnsmasq configuration issue in case of multiple subnets in a vlan
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 16:59:21 +05:30
011bae7c0a
CLOUDSTACK-2808
2013-07-03 15:29:45 +05:30
79e2c599d9
really fix the RAT
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 15:14:44 +05:30
e82f97cad3
Fix RAT check for the eclipse configuration
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 15:10:51 +05:30
1fb9c8e788
CLOUDSTACK-2162: Scope parameter for adding primary storage for a basic zone set up
2013-07-03 14:48:32 +05:30
f15a6e4b6d
removed EnumerationImpl
...
EnumerationImpl was not used and duplicates functionality
with org.apache.commons.collections.iterators.EnumerationIterator
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 10:08:21 +05:30
80f13a39a4
Added my eclipse.epf
2013-07-02 20:26:24 -07:00
d425fa76f7
CLOUDSTACK-3335:[Object_Store_Refactor][Automation]CopyTemplate failed
...
with Unexpected exception.
2013-07-02 18:01:47 -07:00
8780fef05a
CLOUDSTACK-3047 java.lang.NullPointerException encountered when executing capacityChecker thread.
...
Changes:
- Added null check around clusterId, since its possible to have null clusterId for storagepool and host records
2013-07-02 16:36:58 -07:00
1bdb80a20b
CLOUDSTACK-3164: UI - VPC section - tier - Internal LB - detailView - add assignVMs action in detailView (will show on Quickview in listView as well).
2013-07-02 16:16:51 -07:00
9a3067fb87
CLOUDSTACK-3314: templates downloaded to S3 should show up in
...
listTemplates when zoneId is provided.
2013-07-02 15:47:49 -07:00
8a0470ee0f
CLOUDSTACK-3207: added resourceLimit/resourceCount to the Project API response
...
Conflicts:
setup/db/db/schema-410to420.sql
2013-07-02 15:34:08 -07:00
6c9383bd76
CLOUDSTACK-3336 AWSAPI - createVolume API with custom size should prefer a non-tagged custom sized disk offering first over a tagged offering
...
Changes:
For createVolume API with custom size the awsapi component chooses the custom size disk offering present on CloudStack, sice CS createVolume API needs an offering Id.
But if there are multiple custom size disk offerings, and some of the offerings have tags, awsapi should try to choose a non-tagged custom offering first. There is a reason for people to tag a disk offering and using that on every user API call may not be preferable.
If all disk offerings are tagged however, awsapi will choose one of them.
2013-07-02 15:18:49 -07:00
f9de646c28
CLOUDSTACK-3093: UI - Infrastructure menu - zone detail - physical network - network service providers - Internal LB VM - add migrate, view console action.
2013-07-02 14:59:14 -07:00
05f4680735
CLOUDSTACK-3314: ListTemplates only show one entry for cross-zone
...
templates.
2013-07-02 13:54:40 -07:00
1f3a20cde7
Region selector UI: Fix overlap issue with other dialogs
...
Remove z-index from region select button, to prevent overlap with other dialogs.
2013-07-02 13:31:28 -07:00
6eb404ed0a
Project switcher: Fix select height
2013-07-02 12:49:30 -07:00
bd1ddee557
UI: Localize app name and 'about' window
2013-07-02 11:59:20 -07:00
d660bc7e8d
CLOUDSTACK-3089 [ZWPS] NPE while cancelling the Storage Maintenance
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-02 11:51:16 -07:00
2bc4cbf9fb
CLOUDSTACK-2571 Zone Wide Primary Storage blocker issues while Enabling in Maintenance State
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-02 11:49:16 -07:00
db5d526269
CLOUDSTACK-2808
2013-07-02 19:39:04 +05:30
43f31dcc66
Only print debug message when the planner fails to disperse
...
User Dispersion is a best effort of deployment planning and cannot
always guarantee the dispersion logic will work. However this does not
fail the deployment. Adjust the test so as to print a debug and exit
instead of fail.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-02 19:13:48 +05:30
8f380d97e4
CLOUDSTACK-3198: HashSet used for storing ACL rules doesn't maintain the order. Added rules directly to result string array after sorting.
2013-07-02 18:47:46 +05:30
2f3764ef94
CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites
...
involved in the GSLB
add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
2013-07-02 17:55:58 +05:30
Alex Huang
Jessica Wang
Devdeep Singh
Edison Su
Alena Prokharchyk
Milamber
Harikrishna Patnala
Prasanna Santhanam
Sanjay Tripathi
Chip Childers
Vijayendra Bhamidipati
Daan Hoogland
Nitin Mehta
Hugo Trippaers
Pranav Saxena
Radhika PC
Laszlo Hornyak
Min Chen
Prachi Damle
Brian Federle
Rajesh Battala
unknown
Kishan Kavala
Murali Reddy