24101 Commits

Author SHA1 Message Date
Rohit Yadav
e71009a571 appliance: fix branch finding method from e16414e even Junio can be wrong
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit bbaefb8e5def610a654fba907c8ec3f868416bdf)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-08 20:30:42 +02:00
Mihaela Stoica
57f611df16 CLOUDSTACK-6695: Added support to the UI for uploading a chain of certificates
In the "SSL Certificate" dialog we added:
- new field for the root certificate;
- a button to add intermediate certificates if necessary; when this is pressed, a new field, called "Intermediate certificate 1" is added; pressed again, "Intermediate certificate 2" field is added, and so on.

We upload the certificates in order: first the root certificate (with id=1), then the intermediate certificates (with id=2,3,..) and finally the server certificate.
When uploading a certificate, we wait for the upload to be completed successfully and only then we proceed to uploading the next one. If one fails, we report failure and don't continue with the remaining.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-08-08 10:57:12 -07:00
Rohit Yadav
ffe0f2f60f appliance: use the right way to get git branch name
Taken from Junio C Hamano's blog [1], git's maintainer, he must not be wrong :)

[1] http://git-blame.blogspot.ch/2013/06/checking-current-branch-programatically.html

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e16414e56d8f398f8ddbbde89d3ee833582b8bb2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-08 19:22:20 +02:00
Min Chen
d33278250d CLOUDSTACK-7264:NPE while creating scheduled/recurring snapshots for the
removed account with cleanup_needed=1.
2014-08-08 09:42:55 -07:00
Rohit Yadav
2491630f51 git: don't let db-police hook fail for no changes in setup/db
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-08 15:52:07 +02:00
Rohit Yadav
a0006a6990 appliance: change the way we find git branch in build.sh
(cherry picked from commit 493c0a68d2332cb9275902128c28f926a909f4ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	tools/appliance/build.sh
2014-08-08 15:44:33 +02:00
Gaurav Aradhye
a52a1cd4fc CLOUDSTACK-7292: Fixed issue in test_deploy_vm_root_resize.py
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-08 18:06:36 +05:30
Rohit Yadav
2020183cd8 ListStorageTagsCmd: Seif forgot to add license in 67ca255
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-08 14:32:19 +02:00
Rohit Yadav
47625af7c3 CLOUDSTACK-6360: Fix JDK paths in ubuntu packaging init scripts, don't use 1.6
Since we've agreed to use JDK/JRE 1.7, this enforces that for Ubuntu builds
- this fix remove usage of 1.6 paths in JDK_DIR for cloud-{agent, management, usage}.
- adds oracle jdk 1.7 path (in case a user is using that)
- adds mysql-connector-java path to CLASSPATH for usage server
- adds libmysql-java pkg dependency (tested and available for precise and trusty)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 96d6a2a03734ebbb9f41196d56c409d544a268ea)

Conflicts:
	packaging/debian/init/cloud-usage
Adds pessimistic logic to try the hard coded paths if Rajani's logic fails
2014-08-08 14:26:47 +02:00
Joris van Lieshout
b8deb6ba3f volume /usr was sized to small and ends up being 100% full on SSVMs and CVMs. By juggling some partman-auto numbers the space gets devided more evenly. After this patch /usr should be around 80% full. I've also reduced the swap space because this makes no sense on virtual instances.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-08-08 12:58:12 +02:00
Rohit Yadav
38928a44b5 CLOUDSTACK-6323: Change getUser API arg to userapikey
By default the getUser API picks apikey arg from HTTP request to return the
User object with that api key. We use apikey in the request, so it would return
the same user calling the API. This commit uses the USER_API_KEY in the API
annotation instead.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 72e06b4d9b40c42d28cc148a331c9c5461a10f6e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-08 12:55:13 +02:00
Likitha Shetty
b41a78ce0f CLOUDSTACK-7248. [VMware] Extract volume fails with an NPE.
Synchronize attach disk to VM on the VM object value instead of using a DB lock.
2014-08-08 15:31:03 +05:30
Likitha Shetty
bb7fc59947 Revert "CLOUDSTACK-7077. Quickly attaching multiple data disks to a VM fails."
This reverts commit a9b3ab089d6cb0bc1494e10b2be90292f4c79289.
2014-08-08 15:31:03 +05:30
Jessica Wang
74847dce47 UI > dialog widget > text field > set default value > pass context to function(){}. 2014-08-07 18:55:52 -07:00
seif
67ca2557f9 Changes for a new API command to list the storage tags 2014-08-07 17:46:06 -06:00
Alena Prokharchyk
6d1482b97b CLOUDSTACK-7283: listUsers API is available for regular users now 2014-08-07 14:01:58 -07:00
Doug Clark
6220947dbe CLOUDSTACK-7281: Fix error in debug line
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-07 21:00:13 +05:30
Doug Clark
a75646b185 CLOUDSTACK-7269 - Fix expunge from non-Admin account error in Marvin
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-07 15:40:09 +05:30
John Dilley
7ff7e9cf5a CLOUDSTACK-7268: Ignore "already exists" error in createEgressFirewallRule
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-07 14:26:40 +05:30
John Dilley
5f816e3e3f CLOUDSTACK-7271: Accept any hypervisor in error message
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-07 14:02:38 +05:30
Gaurav Aradhye
1e3a689793 CLOUDSTACK-6873: Moved test cases that run only on simulator and those should be run serially to misc folder and also tagged them with required_hardware='simulator only'
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-07 12:49:28 +05:30
Nitin Mehta
f424a04b0c CLOUDSTACK-7272: Router stop fails with NPE. Fixing it by making the hostId as Long object than native type long. The issue was the response was checking for getHostId() != null to populate attribute hypervisor. But since the hostId is declared as long it will never be null, resulting in the NPE when populating hypervisor. Fixed that 2014-08-06 18:06:33 -07:00
Rohit Yadav
8d27c19ae2 tools/git: add git hook to help self police schema changes
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-06 22:37:22 +02:00
Kishan Kavala
c09888fcb5 CLOUDSTACK-7237 : Added TAR image processor for templates with tar extension 2014-08-06 18:03:02 +05:30
Santhosh Edukulla
6bccf5ff41 Fixed coverity reported concurrency issues 2014-08-06 17:28:49 +05:30
Gaurav Aradhye
0a7af329f5 CLOUDSTACK-7255: Fixed marvin issue related to creating random account usernames
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-06 15:54:07 +05:30
Gaurav Aradhye
c38a15f6e8 Removing invalid import from test_escalations_templates.py
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-06 15:32:47 +05:30
Gaurav Aradhye
adcfdf2547 CLOUDSTACK-7241: Fixed error in test_escalations_ipaddresses.py
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-06 15:29:35 +05:30
Santhosh Edukulla
dda2820552 Fixed Coverity reported type issues 2014-08-06 15:27:00 +05:30
Santhosh Edukulla
bf9036c5a0 Fixed a regression issue reported 2014-08-06 12:37:05 +05:30
Santhosh Edukulla
0ca3b4a4e4 Fixed coverity reported concurrency issue
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-06 10:15:39 +05:30
Min Chen
9866c648eb CLOUDSTACK-7260: Management server not responding after some time for
Vmware due to Oom (cannot create native thread).
2014-08-05 17:36:53 -07:00
Nitin Mehta
b9d834e838 CLOUDSTACK-4200: listSystemVMs API and listRouters API should return hypervisor property since dynamic scaling is not enabled for all the hypervisors and that action can be showed only for the hypervisors that support it. 2014-08-05 17:29:34 -07:00
Anthony Xu
129437c636 added more log 2014-08-05 16:41:38 -07:00
Frank.Zhang
12ad254069 CLOUDSTACK-6278
Baremetal Advanced Networking support

    add missing license header
2014-08-05 11:11:02 -07:00
Doug Clark
f7c72cdedc test_06_destroy_vm in test/integration/smoke/test_vm_life_cycle.py fails because the expunge parameter is set to true, this also cause tests that execute in test_vm_life_cycle.py after this test to fail.
Signed-off-by: Nitin Mehta <nitin.mehta@citrix.com>
2014-08-05 11:04:26 -07:00
Rohit Yadav
1176a836af server: use scoped variable in pom.xml for build.properties file path
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-05 18:30:14 +02:00
Ilia Shakitko
07f916dfc6 CLOUDSTACK-7159 Added "state" parameter to the "listPublicIpAddresses" API call
Signed-off-by: Ilia Shakitko <i.shakitko@tech.leaseweb.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-05 18:13:38 +02:00
Rohit Yadav
3433eb7c09 README: Import README sections from 4.4 branch into master
We had a README file in our release branches, this commit grabs few useful
sections from that file into master's README file.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-05 17:44:08 +02:00
Rohit Yadav
fc7b2baba3 README: Fix links for viewing on Github
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-05 16:02:44 +02:00
Rohit Yadav
d753e765f7 README: Give CloudStack its much deserved readme file
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-05 15:54:40 +02:00
namita.chaudhari
fce2880b9f CLOUDSTACK-2694: Able to configure duplicate firewall rule with protocol and no ports
Signed-off-by: Jayapal <jayapal@apache.org>
2014-08-05 17:57:54 +05:30
Gaurav Aradhye
c76302cdd8 CLOUDSTACK-7240: Fixed expunge VM issue in test_persistent_networks.py
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-05 17:30:41 +05:30
Santhosh Edukulla
64b9ca0a35 Fixed a coverity reported concurrency issue
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-05 17:16:09 +05:30
Damodar
221c118b4f CLOUDSTACK-7245: listIsos call does not return isdynamicallyscalable in the response attributes as mentioned in API docs. 2014-08-05 16:06:01 +05:30
Harikrishna Patnala
2dfd278625 CLOUDSTACK-7087: Latest OS X VPN client not working Downgrading openswan version to 1:2.6.37-3
Reviewed-by: Abhinandan

Signed-off-by: Sheng Yang
2014-08-05 16:06:00 +05:30
Gaurav Aradhye
2109418469 Fixed Marvin Issue: Hypervisor value was hardcoded to XenServer while deploying VM if not specified
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-05 16:04:19 +05:30
Sateesh Chodapuneedi
dfa607fb44 CLOUDSTACK-7250 [vCenter 5.5] SourceNAT,StaticNAT and Portfowrding is not working with Vmware DVS in vCenter 5.5
Change in vCenter 5.5 API from prior versions forced code change in CloudStack. Update property value of property "VirtualE1000.deviceInfo.summary" is accommodated now.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-08-05 10:00:00 +05:30
Ritu Sabharwal
cc725e53e3 Fixing Summary:Coverity findings for brocade-plugin 2014-08-05 14:59:15 +05:30
Jayapal
1bfb1f6503 CLOUDSTACK-7246: corrected script name of createipalias 2014-08-05 14:41:12 +05:30