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
Rajesh Battala
3c891fcf66
Fixed agent code to handle untagged public vlan while parsing the vlan id
...
(cherry picked from commit 7df148c762 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:17:16 -08:00
Murali Reddy
f93be7b2b6
CLOUDSTACK-5967: GRE tunnel creation is failing
...
after network orchestrator refactor, only network elements providingg
services as defined by network offering, are invloved network design and
imlement phase. So OVS network element need to be enables as
'Connectivity' service provider to make GRE tunnels work. This fix
introduced 'Ovs' provider as Connectivity service provider.
(cherry picked from commit 2e004878b1 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:16:52 -08:00
Hiroaki KAWAI
f5b9fedb11
stratosphere-ssp plugin: Fix HttpClient4 connection leak
...
Replaced HttpClient#execute(HttpUriRequest) with
HttpClient#execute(HttpUriRequest,ResponseHandler<T>).
The former requires extra EntityUtils#consume(HttpEntity).
(cherry picked from commit 09e27fd7bf )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:16:31 -08:00
Min Chen
85091e9b6b
CLOUDSTACK-6027:CreateVolume from snapshot is failing with S3 on Vmware.
...
(cherry picked from commit d7ec9ca815 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:15:45 -08:00
Min Chen
a439ec9b62
CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after
...
migarting to S3 datastore.(cherry picked from commit a3caea7e0a )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:15:18 -08:00
Min Chen
0d72e2ccf5
CLOUDSTACK-6019:CreateVolume from snapshot in NFS is throwing Warning
...
"sync snapshot from cache to region wide store failed for image store
test".
(cherry picked from commit b11c13d4a1 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:14:55 -08:00
edison
bd335d01cb
fix devcloud reboot issue: should not start heartbeat for devcloud
2014-02-06 14:19:29 -08:00
Likitha Shetty
5480a810a6
CLOUDSTACK-6002. [vCenter 5.5] restoreVM fails with ROOT-x-000001.vmdk not found.
...
(cherry picked from commit ba5b302ae6 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:08:56 -08:00
Hiroaki KAWAI
9961a8e710
Some rework stratosphere ssp plugin
...
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
(cherry picked from commit db3dc2ee17 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:03:11 -08:00
Daan Hoogland
a42a345684
findbugs replaced byte[].toString() with new String(byte[])
2014-02-02 19:50:58 +01:00
Daan Hoogland
438a4b0d5a
Revert "findbugs replaced byte[].toString() with Arrays.toString(byte[])(cherry picked from commit ce7c6d2357)"
...
This reverts commit 55ec8f3a2d .
2014-02-02 19:38:49 +01:00
Likitha Shetty
e089b91385
CLOUDSTACK-5994. Hitting IndexOutOfBoundsException in GetVmStatsCommand after upgrade.
...
To obtain network read/write statistics, multiply sample duration with the
average of the particular performance metric obtained over the sample period.
(cherry picked from commit 16c3f53793 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:59:37 -08:00
Daan Hoogland
55ec8f3a2d
findbugs replaced byte[].toString() with Arrays.toString(byte[])(cherry picked from commit ce7c6d2357)
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:57:50 -08:00
Animesh Chaturvedi
602faecafe
Revertng based on mail thread discussion "Fix findbug issues within LDAP authenticator"
...
This reverts commit 92b4f66d73 .
2014-01-30 17:55:39 -08:00
Ian Duffy
9776e1af1c
Fix findbug issues within LDAP authenticator
2014-01-29 21:31:12 +01:00
Marcus Sorensen
7ca27f6cc6
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
...
(cherry picked from commit e624632dfd )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:58:57 -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
Hugo Trippaers
1be40d6926
Findbugs finding : Incorrect use of equality
...
(cherry picked from commit 10cc5645e8b9713bc7c86d543413d396ce203cc6)
(cherry picked from commit f18c5a1910 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:12:10 -08:00
Jayapal
63e839c0f8
CLOUDSTACK-5966 Added enable/disable monitoring service in global config
...
(cherry picked from commit 782265e713 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 13:31:37 -08:00
Likitha Shetty
d4a3f7be81
CLOUDSTACK-5796. [VMware] Size column is not getting updated in snapshot_store_ref table when a snapshot is backed up in secondary storage.
...
Calculate and update the size of a backed up snapshot. This snapshot size is in turn used to update the secondary_storage count for an account.
(cherry picked from commit e8ba2d0850 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 13:23:34 -08:00
Devdeep Singh
ce1b393f73
CLOUDSTACK-5942: The agent at places logs the password of the user. It should mask the
...
password from the message string before writing to the log. Made a change to do so.
(cherry picked from commit 6d997bd689 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-27 19:54:01 -08:00
Anthony Xu
43d485c92d
Revert "CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled."
...
This reverts commit af5f3d5676 .
2014-01-22 15:07:47 -08:00
Alena Prokharchyk
aa6f4dc8a7
CLOUDSTACK-5930: Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
server/src/com/cloud/server/auth/UserAuthenticator.java
server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit f160b31f51 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-22 13:07:43 -08:00
Likitha Shetty
c14941edf8
CLOUDSTACK-5927. Storage garbage collector is trying to destroy the SSVM/CPVM root disk that is in use.
...
In case of VMware VM during root volume preparation if we are switching to a new volume, force expunge root disk that was created from the old template.
Because otherwise storage garbage collector will later try to expunge the old disk marked for expunge and fail with 'Cannot delete file' exception
since in VMware the new root vmdk has the same name and is now in use.
(cherry picked from commit 94ea2736f4 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-22 13:05:46 -08:00
Alena Prokharchyk
d5e0dcd2a7
Revert "Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased"
...
This reverts commit 7884bb8aaf .
2014-01-21 19:50:46 -08:00
Alena Prokharchyk
7884bb8aaf
Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
server/src/com/cloud/server/auth/UserAuthenticator.java
server/src/com/cloud/user/AccountManagerImpl.java
2014-01-21 18:09:15 -08:00
Anthony Xu
af5f3d5676
CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled.
2014-01-21 17:55:56 -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
Hugo Trippaers
7c4831df92
CLOUDSTACK-5884 make getTargetSwitch(NicTO nicTo) do all the work to select switch name, type and vlan token. Change preference to use the tags set on the physical network.
2014-01-21 08:18:21 +01:00
Mike Tutkowski
413c61b519
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-20 23:08:27 -07:00
Mike Tutkowski
0e053668b8
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-18 12:36:53 -07:00
Devdeep Singh
eb6bed8037
CLOUDSTACK-5894: A template created from a volume on hyper-v became unusable after
...
the management server was restarted. The template.properties file created for the
template has the format field in upper-case. This caused the template service to
not to recognise the format and it removed the entry from the template_store_ref
table in db. Fixed the format field in the templatee.properties.
2014-01-17 19:12:59 +05:30
Saksham Srivastava
330571cea6
CLOUDSTACK-5692: obscure passwords when using cifs as storage
2014-01-17 13:49:46 +05:30
Mike Tutkowski
e2364cfca6
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:08:05 -07:00
Anshul Gangwar
ab0a068d9f
CLOUDSTACK-5880: Communication between management server and hyper-v agent should be secure.
2014-01-16 14:42:24 +05:30
Edison Su
9ed4ab731f
CLOUDSTACK-5395: mark snapshot_store_ref as destroyed in case of backup snapshot failed
2014-01-15 18:46:57 -08:00
Mike Tutkowski
fef4c79cb2
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-15 00:18:34 -07:00
sbalineni
45065c712d
Contrail plugin fixes - removed wrappers for db updates
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-14 17:28:17 -08:00
Edison Su
e8307d9b3e
fix devcloud: after devcloud vm itself reboot, local storage's name label is changed to orignal
2014-01-14 14:35:55 -08:00
Sachchidanand Vaidya
8b9f7afc92
Add L3VPN isolation method for contrail plugin
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-14 13:52:40 -08:00
sbalineni
65f639219c
Make sure that Cloudstack DB should be atleast once synced with contrail api server
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-14 13:32:46 -08:00
Devdeep Singh
5bf5d3669d
CLOUDSTACK-5689: System vm creation on local storage fails for hyper-v. A
...
null pointer exception was getting generated when a VolumeTO object was
serialized to create an answer object. If a local storage is used the uri
field will be null. Added null checks for the same.
2014-01-14 19:53:26 +05:30
Jayapal
ac53932925
CLOUDSTACK-5747 Fixed network restart issue with SRX
2014-01-14 18:15:47 +05:30
jayapal
b177015121
CLOUDSTACK-5867 Fixed SetMonitorServiceCommand command path
2014-01-14 18:14:28 +05:30
Edison Su
f2519cf5fc
fix devcloud: user template's guest os type is changed
2014-01-13 15:37:52 -08:00
edison
8dda69952f
CLOUDSTACK-5857: for some reasons, delete secondary pool failed during copy template from secondary storage to primary storage, but the volume is already copied to primary storage, we didn't clean up the volume on primary storage, then all the following copy the same template to primary storage failed, as we are always using the same uuid when creating a new volume, libvirt complaining that the volume already exists.
...
Current fix is ignoring "the delete secondary storage error".
2014-01-13 14:55:47 -08:00
Murali Reddy
b6698f354c
CLOUDSTACK-5861: networks that failed to implement can not be destroyed
...
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
2014-01-13 23:24:12 +05:30
Likitha Shetty
6bb15a0005
CLOUDSTACK-5707. Hitting multiple 'User unauthenticated' exceptions when vCenter is upgraded to 5.5 from 5.1.
...
We hit these excptions whenever a management server held session that was with the old 5.1 vCenter server
is used to make resource calls to the new 5.5 vCenter.
Validate a vCenter session context before it is being used to make a resource call.
And if the context is invalid then discard the context and retrieve a new one.
During the invalidation of an old context handle the context disconnect better
by catching the appropriate exception and returning a newly created context.
2014-01-13 21:57:39 +05:30
Daan Hoogland
d03a47f0ea
CLOUDSTACK-5848 make sure <number> is interpreted as 'vlan://'<number>
2014-01-11 21:23:15 +01:00