19085 Commits

Author SHA1 Message Date
Prachi Damle
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
Jessica Wang
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
Min Chen
05f4680735 CLOUDSTACK-3314: ListTemplates only show one entry for cross-zone
templates.
2013-07-02 13:54:40 -07:00
Brian Federle
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
Brian Federle
6eb404ed0a Project switcher: Fix select height 2013-07-02 12:49:30 -07:00
Brian Federle
bd1ddee557 UI: Localize app name and 'about' window 2013-07-02 11:59:20 -07:00
Rajesh Battala
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
Rajesh Battala
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
unknown
db5d526269 CLOUDSTACK-2808 2013-07-02 19:39:04 +05:30
Prasanna Santhanam
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
Kishan Kavala
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
Murali Reddy
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
Sateesh Chodapuneedi
6aa9b2f356 CLOUDSTACK-3152 addVmwareDc API call fails if called more than once to add same VMware DC to same cloudstack zone.
Check if the associated VMware DC matches the one specified in API params. This check would yield success as the association exists between same entities (zone and VMware DC)
This scenario would result in if the API addVmwareDc is called more than once with same parameters. For such scenario, return success response with VmwareDatacenter object read from database. Also returns success if addVmwareDC is called agsin with same zone and VMwareDC where the zone already has resources added to it (clusters etc.)

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-02 17:31:09 +05:30
Prasanna Santhanam
02f207f6c9 include account and domainid in affinity group creation
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-02 17:02:00 +05:30
Prasanna Santhanam
46bd2f8a28 Cleanup list corrected
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-02 17:00:55 +05:30
Gaurav Aradhye
b8d876fff8 CLOUDSTACK-3168: Resolved 'Object NoneType' issue.
Replaces ipaddress by ipaddress.ipaddress wherever required

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-02 15:33:20 +05:30
Pranav Saxena
2da3be7e3f routerVM scale up response 2013-07-02 15:29:42 +05:30
Radhika PC
9d6bd567f3 CLOUDSTACK-3086 2013-07-02 15:23:05 +05:30
sanjeevneelarapu
479f89ca3c assertion fails because cluster could be None
Object is being used in one of the Assert statements however it is not
callable. Fixed it.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-02 15:22:05 +05:30
Pranav Saxena
cfd1098951 system VM Scale up response handling 2013-07-02 15:14:24 +05:30
Pranav Saxena
d53a359987 scale up VM response handling 2013-07-02 12:38:04 +05:30
Dave Brosius
625a9a1dc8 remove dead code
Signed-off-by: Dave Brosius <dbrosius@mebigfatguy.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Reviewed-by: Prachi Damle <prachi@cloud.com>
2013-07-02 12:17:39 +05:30
Bharat Kumar
61bc6c8477 Cloudstack-3302 VM deployement failed in VMWare due to dnsmasq configuration issue in case of multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-02 12:00:50 +05:30
Bharat Kumar
160c8f361b Cloudstack-3299 incorrect arguments sent to the script createIpalias in case of vmware, Cloudstack-3240 corrected a mistake in the script name.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-02 12:00:30 +05:30
Alena Prokharchyk
54c2133590 CLOUDSTACK-2984: createNetwork call - when vlan is specified, check that its not coming from the physical network vnet range as this range is used for dynamic vlan allocation during the network implementation stage 2013-07-01 16:17:43 -07:00
Jessica Wang
2c1c8045bb CLOUDSTACK-3286: UI - Add Network Offering dialog - reset provider dropdown to first enabled option only if selected option is diabled. 2013-07-01 15:24:11 -07:00
Sheng Yang
2fc6054a9d Baremetal: Move list APIs to the correct location 2013-07-01 15:19:39 -07:00
Alena Prokharchyk
37f12a31a3 CLOUDSTACK-236: log uuid instead of actual db id, in the updateNetworkOffering method 2013-07-01 15:13:19 -07:00
Brian Federle
41a8cc7c69 Multi-edit: edit rule UI: fix regression and restore functionality 2013-07-01 14:35:10 -07:00
Jessica Wang
1762be05a9 CLOUDSTACK-2084: API - when account type is ACCOUNT_TYPE_PROJECT, make listVlanIpRanges API to return accountName. 2013-07-01 14:22:06 -07:00
Min Chen
3d37b8c049 CLOUDSTACK-3277: Remove unused PrimaryDataStoreEntityImpl class 2013-07-01 14:00:44 -07:00
Alena Prokharchyk
4f89c88985 41-42 DB upgrade: fixed physicalNetworkUpdate method - one of the preparedStatement elements wasn't set 2013-07-01 12:00:54 -07:00
Murali Reddy
1c67e34c82 CLOUDSTACK-3287: [GSLB] API "updateGlobalLoadBalancerRule" is not
recognised by CloudStack

added api to managementServerImpl and ensure glsb config is applied to
gslb service providers
2013-07-02 00:07:58 +05:30
Sanjay Tripathi
301c91c099 CLOUDSTACK-3189: Primary storage usage is not getting decremented after deleting the DATA volumes.
When a volume is created the resource usage for it gets incremented. If it is deleted without being
attached to a volume, the decrement doesn't take place. Fixed the delete volume code to decrement
resource usage for a volume in allocated state too.
2013-07-01 23:41:10 +05:30
Laszlo Hornyak
16b7509a23 removed CleanupDelegate
It did not have an implementation

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-07-01 17:08:15 +02:00
Daan Hoogland
639592f3b7 readibilty of log- and exception messages
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-01 20:17:11 +05:30
Sanjay Tripathi
ffd5f1a777 CLOUDSTACK-2288: NPE while creating volume from snapshot when the primary storage is in maintenance state.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-01 20:17:11 +05:30
Murali Reddy
e07a8b3f51 CLOUDSTACK-3282:[GSLB] Unable to add multiple LB rules to same GSLB rule
-fixing regression due to adding GSLB monitor for GSLB service

-code to add/delete GSLB monitor and GSLB service-monitor binding is
made idempotenet so as to succeed if the resource exists.
2013-07-01 19:07:00 +05:30
Sateesh Chodapuneedi
f980341808 CLOUDSTACK-3279 Need mechanism to detect if hotadd for cpu/memory is supported per a specific guest OS supported by VMware.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-01 17:27:32 +05:30
Sebastien Goasguen
a12a13ccc9 CLOUDSTACK-3300: little fix for doc build 2013-07-01 06:33:16 -04:00
Radhika PC
b68cc3346a CLOUDSTACK-3300: Adding patches from cloudstack-1313 2013-07-01 12:01:39 +02:00
radhikap
0304034822 build fix 2013-07-01 14:07:21 +05:30
Prasanna Santhanam
9f12a25191 Fix injection of datastoreproviders in nonoss context
the datastore provider references are not in application context anymore
and have been moved to respective componentCOntexts. Plug them in by
default for nonoss server to startup successfully.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 01debd59d3a21c4164e4ef7e6f4d9e279933e34f)
2013-07-01 13:52:53 +05:30
Rayeesn
b4f6b57ef5 Adding axis2.xml to cloudstack-bridge/webapps/awsapi/WEB-INF/conf as part of defect CLOUDSTACK-2927 2013-07-01 11:43:09 +05:30
radhikap
9e62542283 portable ip 2013-07-01 10:06:20 +05:30
Prasanna Santhanam
34eabd957c Fix attr plugin import and class reference
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-30 21:44:16 +05:30
Hugo Trippaers
40f38521c4 It makes more sense to print the task uuid than the task type in the trace message
Add retry counter to exiting pong command message

Some additional code cleanup courtesy eclipse save actions, thanks Alex
2013-06-30 12:10:59 +02:00
Nitin Mehta
4c0425f918 CLOUDSTACK-2813 - Some deployment failures do not release the resources.
Applying the short term fix of force cleaning up if the answer recieved from startcommand is not valid
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-30 14:53:32 +05:30
Prasanna Santhanam
3684bafd37 pep8 fix
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-30 13:58:16 +05:30
Prasanna Santhanam
c7315975d2 Fix tab/space issues
Several test failures occurred due to tab issues

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-30 13:20:27 +05:30