66027f43bb
improve protocol enabling based on socket object type
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d62d511f47
2015-02-05 15:49:53 +05:30
f5f6c2d1a7
use a preferable protocol that works on jvm 1.6
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-28 13:41:00 +05:30
53c0ab856a
CLOUDSTACK-8160: use preferable protocols
...
(cherry picked from commit debfcdef78
2015-01-21 18:24:54 +05:30
bd5fe46e53
CID 1264632: Rely on a known and widely available encoding UTF8
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0763b5576d
2015-01-20 07:50:12 +05:30
87d444b05a
move ConstantTimeComparator to utils
...
(cherry picked from commit b2393c31ed
2015-01-14 20:47:27 +05:30
f47e32ec5f
cloudstack: change version to 4.3.2
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 19:08:36 +05:30
37058a8e56
CLOUDSTACK-7903: Fix build regression from previous fix
...
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1e0880cbab
2014-12-01 17:00:51 +05:30
2b264e6b57
CLOUDSTACK-6020 ipv4 address can be a larger number then
...
Interger.MAX_VALUE
(cherry picked from commit b3829e54d6
2014-11-26 18:37:18 +05:30
2a72afdc48
Revert "Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path""
...
The revert was an error, sorry about that.
- Rohit
This reverts commit 0aba9654f8
2014-11-21 18:04:33 +05:30
0aba9654f8
Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path"
...
This reverts commit c3c3bab41a
2014-11-20 20:35:45 +05:30
c3c3bab41a
Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path
...
This reverts commit e6d00bcc66
2014-11-20 14:04:43 +05:30
e6d00bcc66
Revert "Updating pom.xml version numbers for release 4.3.2-SNAPSHOT"
...
This reverts commit 063bb8f5b4
2014-11-18 16:04:33 +05:30
063bb8f5b4
Updating pom.xml version numbers for release 4.3.2-SNAPSHOT
...
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-09-16 09:16:47 -04:00
41c0eaa14d
Updating pom.xml version numbers for release 4.3.1
...
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-09-04 16:47:57 +02:00
514c2ef0fb
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>
(cherry picked from commit 7ada4ad50b
2014-09-01 16:09:36 +02:00
435fa225c6
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>
(cherry picked from commit 3b5aa42c6d
2014-09-01 16:06:48 +02:00
a654894dbd
Updating pom.xml version numbers for release 4.3.1-SNAPSHOT
...
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-08-25 09:16:27 -04:00
5673c036c0
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
...
(cherry picked from commit 3268f5bd1f
2014-06-25 17:12:33 +02:00
c05a007536
CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or
...
private
(cherry picked from commit 018b471ad3
2014-06-25 16:58:10 +02:00
e8047e11db
CLOUDSTACK-6472 (4.3 specific) listUsageRecords: Pull information from removed items as well, fixing NPEs/Null UUIDs with usage API calls.
...
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-05-06 08:57:30 -04:00
0c2ad0338e
fixing the mysql client libraries dependency problem
2014-02-23 02:33:09 +00:00
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
2014-02-07 13:21:39 -08:00
9536569e1f
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
...
(cherry picked from commit 96d8e3c945
2014-02-07 13:21:18 -08:00
220a2a1a0e
Backport fixed for issues found by Findbugs
...
(cherry picked from commit 60ac12780b
2014-01-28 14:14:44 -08:00
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
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
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
c75b0044ef
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-07 17:12:06 -08:00
6fd030cbf2
CLOUDSTACK-5826: do netmask/gateway validation before calculating the POD cidr
2014-01-07 15:01:27 -08:00
88aefbf529
Fix tab issues in the Link.java
2014-01-02 14:04:15 -08:00
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
61d48154fd
compare null to non-null or not-empty-string
2014-01-02 21:24:32 +01:00
9ec137e75b
isSameIsolationId
2013-12-31 12:18:33 +01:00
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
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
94abbb1367
check vlans and other isolation types
2013-12-23 13:51:34 +01:00
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
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
8367a8fae1
CLOUDSTACK-5355: addImageStore should not log password in clear text in
...
the log.
2013-12-03 16:46:02 -08:00
8581e58165
CLOUDSTACK-1762 Fixed assigning network or broadcast ip to nic
2013-12-02 10:53:51 +05:30
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
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
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
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
68ce3f56ac
Missed a null check
2013-11-06 09:44:08 -07:00
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
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
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
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
81d01369d7
Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
...
Conflicts:
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-10-23 12:31:53 -07:00
Rohit Yadav
Pierre-Yves Ritschard
Daan Hoogland
Sebastien Goasguen
Sam Schmit
David Nalley
Devdeep Singh
Hugo Trippaers
Animesh Chaturvedi
Marcus Sorensen
Kelven Yang
Alena Prokharchyk
Sheng Yang
Daan Hoogland
Jayapal
Saksham Srivastava
Syed Ahmed
Anthony Xu
Min Chen
Laszlo Hornyak
Kishan Kavala
Darren Shepherd