735 Commits

Author SHA1 Message Date
Chip Childers
8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
John Burwell
1ae682de78 - CLOUDSTACK-3229: Properly serialize the https property to the s3Xen
plugin
  - Extracts the duplicated serializeProperties methods to
    ReflectUtils#flattenProperties
  - Adds unit tests for ReflectUtils#flattenProperties
2013-08-01 00:14:43 -04:00
Alex Huang
1e1ee902a2 Moved over the new jobs framework from vmsync. This has not been integrated into the server package yet. Will do that next 2013-07-30 15:00:58 -07:00
Likitha Shetty
6cbcd9777d CLOUDSTACK-3139 - If management server doesn't have internet connection RegisterTemplate and UploadVolume will fail when CS tries to verify if the account has exceeded its secondary storage limit.
No change in behavior if management server has internet connection.
Now if management server doesn't have internet connection download process will not fail. But CS will noly check if the account has already reached or maxed its limits instead of checking if the limit will be breached with the addition of the new storage
2013-07-30 19:35:26 +05:30
Alex Huang
3d2e49bcfc Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format 2013-07-26 20:35:49 -07:00
Alex Huang
3f7c558de5 Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project 2013-07-26 16:34:08 -07:00
Alex Huang
f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
frank
697b7c9471 make UCS api name better 2013-07-26 11:28:47 -07:00
frank
42738c2fda change associatesUcsProfileToBlade to async api 2013-07-25 15:26:51 -07:00
Prasanna Santhanam
2c5388afac For some reason cat is under /bin on some linuses
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit b8129d6a8e6634f6a101e09d8f0a9620a2379d67)
2013-07-25 19:18:21 +05:30
Laszlo Hornyak
76e283687f test for Script
a unit test for the most frequently used methods in the Script class

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-25 16:46:10 +05:30
Amogh Vasekar
a47faa9d28 Adding HTTPS support for UCS, refactored code for o.a.c.httpclient.contrib
CLOUDSTACK-3285
UCS: Need support for HTTP redirects and HTTPS Certificate handling
2013-07-24 13:55:23 -07:00
Edison Su
d22bea6031 CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:59 -07:00
Edison Su
be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -07:00
Min Chen
d423a755f5 CLOUDSTACK-3274: API Refactoring: secretkey and accesskey of the backing
store is found in plaintext in the logs.

Conflicts:
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java
2013-07-20 18:01:49 -07:00
Alex Huang
5af61a85ae Fixed build. Not sure why it didn't come up on my compile before the commit 2013-07-18 22:53:30 -07:00
Alex Huang
b18c72626b Moved the SprintUtils which is for testing only to be in test directory. Changed pom.xml for different projects to use the utils test-jar. Removed some @Component annotations. Moved majority of the dependencies from cloudstack pom to utils pom 2013-07-18 21:53:51 -07:00
Laszlo Hornyak
226bed7ec8 Removed unused classes
ScriptBuilder and Executor was not actually used.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-07-18 15:43:04 -07:00
Abhinandan Prateek
6cfcbc665e reverting a local change 2013-07-18 16:22:08 +05:30
ahuang
11971b5a58 Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
ahuang
52e6ef7eb8 Added exception in error log 2013-07-17 17:48:57 -07:00
Bharat Kumar
d73bb22802 Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Rebased with master.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 12:35:06 +05:30
Edison Su
bf32776f9f be able to upload template into swift 2013-07-16 18:07:06 -07:00
ahuang
aa131525ba Added missing files 2013-07-16 11:24:21 -07:00
ahuang
11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Edison Su
8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Murali Reddy
3c1b3c71fe CLOUDSTACK-3440: action events are not published due to conflict of
Eventutils and ActionEventUtils files

removing the 'EventUtils' file which got merged back during the Spring
changes to master at 4.1. 'EventUtils' file was replaced by
'ActionEventUtils', and the original file was removed for events
frameworks. This file conflict was resulting in action events not to be
published on to event bus
2013-07-10 16:44:08 +05:30
Marcus Sorensen
97f1e88314 Summary: usage db connection missing url parameters property
Detail: users should be able to add url parameters to the usage database
connection string, just like with the cloud database

BUG-ID: CLOUDSTACK-3410
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1373350596 -0600
2013-07-09 00:16:36 -06:00
Edison Su
b59b1b4c93 fix can't find host ip address on Mac OS 2013-07-03 14:34:37 -07:00
Laszlo Hornyak
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
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
Mike Tutkowski
99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Laszlo Hornyak
882e5fa4e0 FileUtil simplified
- writeToFile removed since no references to it
- readFileAsString replaced with FileUtils.readFileToString
- minor code duplication removed in dependent method getNicStats
- unit test added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-27 11:08:03 -07:00
Hugo Trippaers
881a6e164e Disable the NioTest, it is far to dependent on the network configuration of the machine running the test. 2013-06-25 12:20:51 -07:00
Edison Su
9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Prasanna Santhanam
168fb29d69 add some logging to NioTest
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-19 09:28:16 +05:30
Min Chen
1eb39665bd CLOUDSTACK-3030: Object_Store_Refactor - Download template from S3
should not set template to public-readable.
2013-06-18 09:45:50 -07:00
Laszlo Hornyak
c88d8fb3a2 use commons-lang StringUtils
commons-lang is already a transitive dependency of the utils project, which allows removing some duplicated functionality.
This patch replaces StringUtils.join(String, Object...) with it's commons-lang counterpart.
It also replaces calls to String join(Iterable<? extends Object>, String) in cases where an array is already exist and it is only wrapped into a List.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:17:22 +01:00
Laszlo Hornyak
564013bec0 String instantiation is not needed
Removed a String instntiation, test case added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:17:22 +01:00
Hugo Trippaers
b0ea02e65a Allow DSA public keys.
DSA can't be used for encryption with the bouncycastle library, so make
sure this situation is properly handled.
2013-06-17 10:04:59 -07:00
Edison Su
f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Sheng Yang
fbe6b273e3 CLOUDSTACK-1170: Redundant Router: Ensure MACs are same on other than first public nic 2013-06-13 16:05:15 -07:00
Min Chen
18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3cea30339cfff40c1002906634291b373) into object_store.
2013-06-12 11:20:32 -07:00
Bharat Kumar
ca13586331 Cloudstack-2511 Multiple_Ip_Ranges: Adding guest ip range in subset/superset to existing CIDR is allowed Cloudstack-2651 [Shared n/w]Add IP range should ask for gateway and netmask
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 16:27:56 +05:30
Chiradeep Vittal
971c40d98e Fix RAT check broken by a1a68ed0c4b722 2013-06-10 20:38:24 -07:00
Alex Huang
a1a68ed0c4 Review 11752 applied 2013-06-10 16:07:05 -07:00
Min Chen
1d6ed8ac20 A hack to handle RiakCS bug in generating ETAG for multi-part upload
object.
2013-06-07 16:00:19 -07:00
Saksham Srivastava
5dc7387d3b CLOUDSTACK-1647: IP Reservation should not happen if the guest-vm cidr and network cidr is not same but their start ip and end ip are same.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-07 16:54:40 +05:30
Min Chen
4e404953ad Support Multi part upload for S3 using TransferManager. 2013-06-05 09:40:33 -07:00
Anthony Xu
6a7cc2021e when VR is rebooted, CloudStack will reapply all ips/rules to VR,
this patch will reduce time the VR reboot takes
 - remove 1 s sleep in vmware
 - reduce the time arping takes
2013-05-29 13:45:07 -07:00