etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,914 Commits 326 Branches 325 Tags 910 MiB
Commit Graph

805 Commits

Author SHA1 Message Date
Sheng Yang 3c9e14e85a CLOUDSTACK-5241: Remove Rot13 usage 2014-12-03 19:38:47 -08:00
amoghvk 960b7bbf74 CLOUDSTACK-7977 
Fix password generator, add guards for minimum length
 2014-11-26 15:08:48 -08:00
Rohit Yadav 7ff31f1b22 Merge remote-tracking branch 'origin/inetaddress' 
- Tested locally against unit tests
- TravisCI build passed: https://travis-ci.org/apache/cloudstack/builds/41990351
- Manual QA passed for basic auth and saml auth using default IDP settings

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServlet.java
 2014-11-25 14:32:09 +05:30
Wido den Hollander 72ba98b1b8 Validate IPv4 address using Apache Commons Validator 2014-11-24 14:43:48 +01:00
Laszlo Hornyak 3577423da9 removed executable flags from java classes 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:49:01 +01:00
Laszlo Hornyak 55c449aa07 Properties loading simplification 
- Using the PropertiesUtil methods, the resource handling could be elliminated

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:48:56 +01:00
Laszlo Hornyak b2023d04ba Simplification on Properties handling 
- Added method to create properties and load contents from file

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:48:56 +01:00
Laszlo Hornyak ca9dd457f9 Stream handling simplification in PropertiesUtil 
- use resource block instead of finally block

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:48:55 +01:00
Min Chen 9ac93d3e43 CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong url. 2014-11-21 14:36:36 -08:00
Daan Hoogland f2ccee7a03 name convention adherence 2014-11-18 16:52:46 +01:00
Hugo Trippaers 16de4a7176 Fix for potential NPE 2014-11-18 14:12:14 +01:00
Daan Hoogland 638da54fce CID-1254833 refactor condition to include null-case 2014-11-18 12:12:00 +01:00
Santhosh Edukulla ef6ec7b276 Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences 2014-11-13 17:26:24 +05:30
Kishan Kavala 990da08451 Add check to ensure VR template version matches digit.digit.digit format. Returns version as 0 otherwise 2014-11-10 15:33:50 +05:30
Sheng Yang 57c4841403 CLOUDSTACK-7814: Fix default passphrase for keystores 
In upgrade case, the db.properties file is not changed, but the following commit
would require passphrase for keystore in it, thus result in error(NPE in fact
due to there is no such properity).

commit 918c320438
Author: Upendra Moturi <upendra.moturi@sungard.com>
Date: Fri Jun 20 11:41:58 2014 +0530
CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value

This commit fix it by put default value for passphrases, also set correct
passphrase if fail-safe keystore is used.
 2014-10-28 16:25:52 -07:00
Daan Hoogland 1de0cb7094 restore barematel work after merge 2014-10-17 10:24:01 +02:00
Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
 2014-10-16 12:29:37 +02:00
Damodar 50185b7c3a CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events 2014-10-13 14:42:00 +05:30
Anshul Gangwar e43d5b1c7d CLOUDSTACK-7575: improved performance of cleanString method in StringUtils 
(cherry picked from commit 7972f53c8d)
 2014-10-13 00:02:11 -04:00
David Nalley ac48aa8e0c cleaning up some from a revert 2014-10-12 23:30:04 -04:00
Santhosh Edukulla 31a42d2b7a Fixed few coverity patches 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-10-09 11:45:26 +05:30
Anshul Gangwar 7972f53c8d CLOUDSTACK-7575: improved performance of cleanString method in StringUtils 2014-09-26 14:02:41 +05:30
Hugo Trippaers 6f54d48772 CID-1116298 path can be null, make sure that is properly handled 2014-09-19 11:54:21 +02:00
Frank Zhang 8b89494a35 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-18 16:54:37 -07:00
Hugo Trippaers d1d8009c68 Fix a stupid bug i introduced 2014-09-18 16:02:26 +02:00
Rohit Yadav bd1752811c CID-1116250: Lock on s_appContextDelegates before calling get in ComponentContext 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:52:18 +02:00
Rohit Yadav ec134cf010 CID-1116231: Use implicit lock, synchronize _key in Link 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:21:57 +02:00
Hugo Trippaers de26a7228e Fix resource leaks on exception paths 
Make it clear that the server socket isn't a leaked resource
 2014-09-16 16:43:32 +02:00
Anshul Gangwar d90a2d3962 CLOUDSTACK-7370: Fixed password visible in plain text if password passed is in the end in url 2014-09-12 15:33:24 +05:30
Frank.Zhang 10544e287b CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-05 16:28:34 -07:00
Rohit Yadav 7ada4ad50b NetUtils: Check for NPE in getDefaultHostIp method when processing nic/mac 
On hosts or containers where they don't have valid mac address on nic resulting
in null, NetUtils.getNetworkParam can throw NPE.

This was a case found on TravisCI where OpenVZ containers are used. This method
(getDefaultHostIp) is used at several other places within the ACS codebase to
get the host IP and if null is caught we fallback to localhost or 127.0.0.1, so
we therefore set info to null before trying to process network param and if we
fail we return null and expect other layers to use localhost.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-21 11:41:07 +02:00
Santhosh Edukulla 023811286e Fixed few coverity issues 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-08-19 22:01:15 +05:30
Rohit Yadav 3b5aa42c6d CLOUDSTACK-4770: In MacAddress skip macAddress when parsed value is 0x00 
In MacAddress class, we start by settig macAddress String as null and go through
the output of ifconfig -a and pick the one string that is a valid mac address
but is not 0x00 and 0xff. With each loop we set the macAddress to null so that
it does not pick the last one if everything fails.

Tested on Ubuntu where I had an interface called cloud0 whose mac id was 0x00
and it was skipped to get the next one:

$ java -classpath <path-to-cloud-utils.jar> com.cloud.utils.net.MacAddress
addr in integer is 5071953436
addr in bytes is  0 1 2e 4f de 1c
addr in char is 00:01:2e:4f:de:1c

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-13 15:04:04 +02:00
Min Chen a22abeb0e7 CLOUDSTACK-7328:[Automation] Register ISO failing with invalid iso 
format error.
 2014-08-12 15:26:50 -07:00
Min Chen e3564658be CLOUDSTACK-6940, CLOUDSTACK-7312, CLOUDSTACK-5512: Template/ISO/Volume 
upload rejects some valid URL formats. Also consolidate URL format check
into one util routine.
 2014-08-12 11:43:08 -07:00
Rohit Yadav bae8f2a8cb utils: fix pom.xml to have references for javax.servlet api interfaces 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:32 +02:00
Rohit Yadav 315feb0683 utils: refactor HTTP transport stuff to HttpUtils 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 12:01:31 +02:00
Santhosh Edukulla fd96ad02d7 Fixed few coverity reported issues around concurrency, null checks 2014-08-11 16:55:23 +05:30
Jayapal d28da9d986 CLOUDSTACK-7212: Failed creating LB rule on public port 8081 for VR as LB provider 2014-08-01 15:54:17 +05:30
Alena Prokharchyk 89017a7d7b CS-19072: got rid of unneeded type casting when apply pagination to different resources 2014-07-30 10:33:45 -07:00
Alena Prokharchyk ca8d3672e8 listNetworks: moved pagination post processing to StringUtils class 2014-07-28 14:43:55 -07:00
Hugo Trippaers 47bb175bd4 Partially reverting c61c636ce8. Changing the name if cloud.keystore has bigger impact than just changing the name. 2014-07-28 14:52:41 +02:00
Kishan Kavala c61c636ce8 CLOUDSTACK-5946: Commit 2774b62d64 changed keystore file along with coverity fixes. Use varible name for keystore filename to keep it in sync 2014-07-25 14:07:46 +05:30
amoghvk c804660c74 CLOUDSTACK-7168: Revert "Fixed Coverity Issues reported" that broke CI 
This reverts commit 4523490d44.
 2014-07-23 11:37:36 -07:00
Santhosh Edukulla 4523490d44 Fixed Coverity Issues reported 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-07-22 18:03:36 +05:30
Mike Tutkowski b080eaf327 Updates to the way resizing a volume works 2014-07-17 21:09:19 -06:00
Koushik Das aacf8ef77b Findbugs fixes in cloud-utils project and a few other places 2014-07-15 14:23:17 +05:30
Frank.Zhang 3ddc9e7674 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-07-07 11:40:21 -07:00
Sheng Yang a08528cfd9 Polish IPv6 input error information 2014-07-01 15:17:46 -07:00
Hugo Trippaers cd0ef09344 Fix typo and add the right exception to the error map. 2014-06-25 15:51:28 +02:00