Commit Graph

818 Commits

Author SHA1 Message Date
David Nalley 0c2ad0338e fixing the mysql client libraries dependency problem 2014-02-23 02:33:09 +00:00
Devdeep Singh 4961c1385a CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
(cherry picked from commit f0b861fede)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:21:39 -08:00
Devdeep Singh 9536569e1f CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
(cherry picked from commit 96d8e3c945)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:21:18 -08:00
Hugo Trippaers 220a2a1a0e Backport fixed for issues found by Findbugs
(cherry picked from commit 60ac12780b)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:14:44 -08:00
Animesh Chaturvedi 70ba92fc14 Updating pom.xml version numbers for release 4.3.0
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-21 17:29:51 -08:00
Marcus Sorensen 9df5c18850 CLOUDSTACK-5843
For some reason the mgmt server is required to have access to the template
being registered in order to check its size against resource limits
during registration. This is bad, but worse, it's a sync call, so this
call can hang for up to the default HTTP connection timeout.

Reducing http timeout as a quick workaround, but this check needs to
1) be removed or 2) done later or 3)registerTemplate needs to be async
and 4) moved off the mgmt server (ssvm is the only thing that needs access to
template url).
2014-01-10 17:57:10 -07:00
Marcus Sorensen 1f9ad23ba0 CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
equate empty string to untagged in api parameter input
2014-01-10 16:30:43 -07:00
Kelven Yang c75b0044ef CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues 2014-01-07 17:12:06 -08:00
Alena Prokharchyk 6fd030cbf2 CLOUDSTACK-5826: do netmask/gateway validation before calculating the POD cidr 2014-01-07 15:01:27 -08:00
Sheng Yang 88aefbf529 Fix tab issues in the Link.java 2014-01-02 14:04:15 -08:00
Sheng Yang 939f20559e CLOUDSTACK-5723: Add timeout for SSL handshake
To prevent malfunction agent block the future SSL connections
2014-01-02 13:53:42 -08:00
Daan Hoogland 61d48154fd compare null to non-null or not-empty-string 2014-01-02 21:24:32 +01:00
Daan Hoogland 9ec137e75b isSameIsolationId 2013-12-31 12:18:33 +01:00
Jayapal 0478aee78f Revert "CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier"
Reverted the commit as it is breaking vpc CLOUDSTACK-5652

This reverts commit ab4f095c68.
2013-12-27 11:25:13 +05:30
Saksham Srivastava d825b3dd14 CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier
Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-26 16:40:00 +05:30
Daan Hoogland 94abbb1367 check vlans and other isolation types 2013-12-23 13:51:34 +01:00
Syed Ahmed fb89a2d8f6 CLOUDSTACK-5296: Add certificate chain support for netscaler.
adds support for trust chains in the netscaler
2013-12-12 12:13:43 +05:30
Anthony Xu 0847ccfe97 XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/template/TemplateManagerImpl.java
2013-12-05 01:17:56 -08:00
Min Chen 8367a8fae1 CLOUDSTACK-5355: addImageStore should not log password in clear text in
the log.
2013-12-03 16:46:02 -08:00
Jayapal 8581e58165 CLOUDSTACK-1762 Fixed assigning network or broadcast ip to nic 2013-12-02 10:53:51 +05:30
Syed 0076307863 Squashed merge of Ssl Termination feature
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support

This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.

The following are the new API's that this patch adds

uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer

Unit tests are also included in the patch.
2013-11-08 16:49:16 +05:30
Min Chen dc3d279272 CLOUDSTACK-4833:[Automation][BVT] Template and ISO test cases failing
from BVT suite, during LIST api call.
2013-11-07 15:19:19 -08:00
Laszlo Hornyak cff5ea0949 FileUtil: use commons-io FileUtils
- removed the method body ot FileUtil.copyFile and replaced with FleUtils.copyFile

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-07 22:36:02 +01:00
Kishan Kavala 3f5b8f7063 CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router 2013-11-07 19:49:05 +05:30
Darren Shepherd 68ce3f56ac Missed a null check 2013-11-06 09:44:08 -07:00
Darren Shepherd 1460196496 Centralize loading of db.properties to one place
There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed
2013-10-30 17:03:13 -07:00
Laszlo Hornyak fa35490fef InputStream use fix in ProcessUtil
- use PropertiesUtil to load Properties from file

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-26 17:47:34 +02:00
Laszlo Hornyak dbaa818d1e InputStream use fix
Closes the FileInputStream opened at configuration in
- ClusterManagerImpl
- ClusterServiceServletAdapter
- TransactionLegacy
- AsyncJobManagerImpl
- DBEncryptionUtil
- EncryptionSecretKeyChecker

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-26 17:47:34 +02:00
Laszlo Hornyak 58477834b6 InputStream use fix in PropertiesUtil
- use PropertiesUtil.loadFromFile to read the properties
- test added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-26 17:47:34 +02:00
Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-10-23 12:31:53 -07:00
Laszlo Hornyak 4b530c874f Safe properties loader
- new utility method introduced in PropertiesUtil to load properties objects from files
- RegionManagerImpl modified to use the utility method
- Tests added for both

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-23 20:50:00 +02:00
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor'
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
Sateesh Chodapuneedi 00e57c0713 CLOUDSTACK-4911 [Mixed Hypervisor] VM Status is marked as alive when exit status of ping command is not available within command timeout
Supplementing the fix/commit 748315620b
While remote executing commands through ssh, wait for channel condition of EXIT_STATUS.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-10-23 08:51:43 +05:30
Sateesh Chodapuneedi 748315620b CLOUDSTACK-4911 - [Mixed Hypervisor] VM Status is marked as alive when exit status of ping command is not available within command timeout
Currently during ssh execution of remote command, if no response is received within timeout, Cloudstack is returning success result.
This is resulting in false positives. Fix is to check if exit status of remote command is available or not. If not, return failure result.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-10-21 16:34:57 +05:30
Hugo Trippaers 7623c4527a Fix wome warning due to conflicting xml libraries 2013-10-21 09:45:31 +01:00
Prachi Damle 9d625405d3 CLOUDSTACK-4895: Management server fails to start because snapshot policy time zones have day light savings
Changes:

-     Calendar throws IllegalArgumentException when the hour of the day happens to be skipped due to DST changes.
-     Fix will ask Calendar to adjust the time accordingly and get the next closest time
2013-10-18 17:25:14 -07:00
Damodar Reddy a92095a4a6 CLOUDSTACK-4811:Fixed zone creation wizard is allowing to accept wrong sub net mask which is cauing wrong cidr value for a given ip range
Signed-off-by: Jayapal <jayapal@apache.org>
2013-10-18 15:51:51 +05:30
Darren Shepherd 323bbccd50 Add unit tests for Transaction 2013-10-17 16:07:11 -07:00
Min Chen 25acfbad78 CLOUDSTACK-4816:provide configurable option to choose single vs
multipart upload to S3 object storage based on object size.
2013-10-17 10:28:59 -07:00
Darren Shepherd f62e28c1ec New Transaction API
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Marcus Sorensen d430473fe0 add missing license headers to PasswordGeneratorTest.java and an agent.properties 2013-10-14 11:56:21 -06:00
Hugo Trippaers 795366019b Don't capture stderr, this will return an error when the runscript command expects null when there is no default route. 2013-10-14 09:58:37 +02:00
Laszlo Hornyak 47dd1c1e95 PasswordGenerator tests
- StringBuffer replaced with a StringBuilder
- tests added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-11 20:09:37 +02:00
Laszlo Hornyak b76e501d26 removed PasswordGenerator.main
unused method, probably for debugging/testing purposes

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-11 20:09:37 +02:00
Laszlo Hornyak 982db550eb test fix: no assertion on the number of fileds returned
Removed the assertion on the number of fields from ReflectUtil because it did not work with bytecode manipulation like what sonar works with.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-11 18:49:10 +02:00
Laszlo Hornyak d1dd85a4c4 ReflectUtil: test for getAllFieldsForClass
- code comment turned to javadoc
- added braces to if and for statements to make it look more like the rest
- tests added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-09 20:39:41 +02:00
Laszlo Hornyak 66fe3abe3b ReflectUtil: findMethod removed
findMethod was not used, it is removed

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-09 20:39:41 +02:00
Min Chen f1895ea39a CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable. 2013-10-04 18:21:25 -07:00
Laszlo Hornyak 826c69fd29 ConstantTimeBackoff test and cleanup
- javadoc changed - the old one was copy-pasted from AgentShell
- start and stop method removed - they did the same as the overridden methods
- _counter removed as it was only written, but never read
- remove from _asleep map was moved to a finally block, to make sure it is removed even in case of the thread gets interrupted
- Tests created for the above scenarios.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 11:24:43 -07:00