Commit Graph

873 Commits

Author SHA1 Message Date
Daan Hoogland 9e97030e79 Updating pom.xml version numbers for release 4.4.3
Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-03-25 10:36:19 +01:00
Rohit Yadav b1f54db18f utils: use a better extended implementation of SSLSocketFactory
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4a5a32a74)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
2015-03-16 15:52:38 +05:30
Rohit Yadav c3d6996771 improve protocol enabling based on socket object type
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d62d511f47)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 15:49:14 +05:30
Rohit Yadav 2a74548093 use a preferable protocol that works on jvm 1.6
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f5f6c2d1a7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
2015-01-29 16:00:50 +05:30
Rohit Yadav 0269456152 CLOUDSTACK-8160: use preferable protocols
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
2015-01-21 18:11:38 +05:30
Rohit Yadav 70f9db34cb 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)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 07:49:56 +05:30
Pierre-Yves Ritschard 7cb19f5aa4 move ConstantTimeComparator to utils
(cherry picked from commit b2393c31ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServer.java
2015-01-14 20:42:17 +05:30
Daan Hoogland 8cf67c0bf7 logging in clustering code, to find faulty vif plug on xenserver from clustered ms on nic orchestration for start command 2015-01-05 12:57:00 +01:00
Rohit Yadav d1f008e2f2 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)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 16:46:56 +05:30
Daan Hoogland 7e409ea300 Updating pom.xml version numbers for release 4.4.3-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-25 15:36:02 +01:00
Daan Hoogland e0420a6fec Updating pom.xml version numbers for release 4.4.2
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-21 03:41:26 +01:00
Daan Hoogland b9620c2cbe Updating pom.xml version numbers for release 4.4.2-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-10-19 20:46:15 +02:00
Rohit Yadav 47fee57312 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-08-13 21:10:19 +02:00
Hugo Trippaers 9a7cdc0adb Small fix for people that have JDK 1.8 installed on MacOSX and don't bother to fix their links
(cherry picked from commit 8b5ec64842)
2014-08-11 15:58:38 +02:00
Sheng Yang bb5ba26b60 Polish IPv6 input error information
(cherry picked from commit 09abcf354f)
2014-07-28 16:02:50 +02:00
Daan Hoogland c9383c441e Updating pom.xml version numbers for release 4.4.1-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-07-23 16:55:31 +02:00
Anthony Xu 7fe353d499 CLOUDSTACK-6662
CLOUDSTACK-6844

 exit status delivery might get delayed

 Please enter the commit message for your changes. Lines starting

(cherry picked from commit 2ec7359b4e)
2014-07-16 13:38:15 +02:00
Daan Hoogland 8cb2a87815 CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
(cherry picked from commit 3268f5bd1f)
2014-06-25 17:18:07 +02:00
Daan Hoogland ce69bd707d CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or
private
(cherry picked from commit 018b471ad3)
2014-06-25 17:17:39 +02:00
Sheng Yang f7dd1720cb CLOUDSTACK-6854: Fix inconsistent IPv6 address formats
fc00:0003:1373::0002 should be treated the same as fc00:3:1373::2.
(cherry picked from commit dfe20f34f2)
2014-06-23 20:25:43 +02:00
Santhosh Edukulla 61cf175f1c Coverity issues: Fixed conflicts
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-17 13:49:55 +02:00
Santhosh Edukulla 87c3d77518 Fixed coverity issues
(cherry picked from commit 4ba3aae2ea)
2014-06-12 14:44:26 +02:00
Nitin Mehta 9286417f05 CLOUDSTACK-6599:
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls

(cherry picked from commit 48ea9e0b5e)
2014-06-03 10:02:06 +02:00
Anshul Gangwar 4c4134721d CLOUDSTACK-6287, CLOUDSTACK-6315 : fixed password visible in plain text in some hyperv request params/json response 2014-04-18 14:05:19 +05:30
Anthony Xu b3ad4192dd fixed ssh execution log 2014-03-24 15:18:50 -07:00
Nitin Mehta 33a0dec965 CLOUDSTACK-6221:
Publish first class objects involved in an operation (for now vm uuid) on the event bus . Example -  during attach/detachIso along with iso id, vm id should be available as well.
2014-03-10 16:22:34 -07:00
Min Chen 793becf524 CLOUDSTACK-5920: Add some interface methods and constants required by
IAM.
2014-03-05 09:40:55 -08:00
miguelaferreira ef547108dd NetUtils testing
- Refactor tests:
  - Upgrade tests to use jUnit4
  - Add hamcrest dependency (contribution of by Laszio Hornyak)
  - Break big tests in small unit tests
  - Replace assertTrue/False with complex conditions by assertThat with
specific matchers
- Remove dead code:
  - Private static method never called locally
- Add test for method that validates cidrs

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-25 19:23:13 +01:00
Antonio Fornie 808c6df6d7 Fix and add some Rest unit and IT tests. Fix by adding a missing type of RoutingConfig.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-19 09:30:57 +01:00
Hugo Trippaers 594b51c629 Fixup the license headers in the utils project. All files now use the same license header and this is enforced by the maven-license-check plugin. 2014-02-18 12:08:36 +01:00
Hugo Trippaers a369647bca Fix license headers 2014-02-18 10:16:31 +01:00
Antonio Fornie 510972abde Nvp and rest refactoring and more tests
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-18 09:51:54 +01:00
Hugo Trippaers 97bad4f9b3 Fix checkstyle and license issues 2014-02-14 18:37:47 +01:00
wrodrigues 3199de69fe Fixes on Contrail and Mon InMemory plugins; adding comments about the changes.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:47 +01:00
Laszlo Hornyak 351ccf3755 Cleanup in UriUtils.getUpdateUri
- String instantiation replaced with StringBuilder and empty string constant

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-11 20:44:57 +01:00
Laszlo Hornyak 59364ee9a4 Added test for UriUtils.getUpdateUri
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-11 20:43:49 +01:00
Hugo Trippaers 6c770958f1 Fix unittest issue when you are in a locale that uses comma for decimal separation. 2014-02-11 14:45:45 +01:00
Alena Prokharchyk e0de79b170 Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command 2014-02-10 12:05:59 -08:00
Devdeep Singh 306ffa0218 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.
2014-02-10 10:29:09 +05:30
Laszlo Hornyak 8ed9162de7 Cleanup in UriUtils.encodeURIComponent
- StringBuffer replaced with StringBuilder
- nullcheck of tokens array removed since String.split does not return null
- unit test added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 21:57:07 +01:00
Laszlo Hornyak 8d801bffab Replaced String concatenation in loop
Replaced String concatenation in loop with StringBuilder
Unit test added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 21:27:28 +01:00
Devdeep Singh a24263fe81 CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db. 2014-02-05 15:44:09 +05:30
Alena Prokharchyk 6af6ce7e9e 1) Added External UUID control support for network.
2) Moved UUIDManager interface to cloud-util package
2014-02-04 15:47:12 -08:00
Daan Hoogland b3829e54d6 CLOUDSTACK-6020 ipv4 address can be a larger number then
Interger.MAX_VALUE
2014-02-04 18:40:18 +01:00
Sheng Yang 285f23f11b CLOUDSTACK-5779: Generalize calling to execute or create file for KVM 2014-01-24 18:28:25 -08:00
Sheng Yang 2d100f1269 CLOUDSTACK-5779: Generalize calling to execute or create file for Xen 2014-01-24 18:27:55 -08:00
Hugo Trippaers d19157fbb1 Fix a bug found by findbug, compare Long objects with equals instead of == 2014-01-23 09:06:32 +01:00
Marcus Sorensen effa4c75b4 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 18:12:46 -07:00
Marcus Sorensen 8ee61f3a57 CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
equate empty string to untagged in api parameter input
2014-01-10 17:09:41 -07:00
Kelven Yang 1e2e1ea051 CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues 2014-01-09 14:29:13 -08:00