- UI: use post when updating user
- S3: don't send s3 key in the response
- VPN: don't send preshared key in remoteaccessvpn api response
- Snapshot response should set zone id not volume's device id
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 02cadc3fb3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
server/src/com/cloud/api/ApiResponseHelper.java
This limits the likeliness of timing attacks against the API.
See http://codahale.com/a-lesson-in-timing-attacks/ for the
full rationale.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit 9b4e39e837)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/user/AccountManagerImpl.java
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE
Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Now they are informed that they cannot perform the operation.
To perform operation they have to remove VM snapshots of VM.
(cherry picked from commit f43ffb9a0f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/storage/VolumeApiServiceImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
(cherry picked from commit 513adab51b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
(cherry picked from commit 0e2e6995b7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
server/src/com/cloud/template/HypervisorTemplateAdapter.java
This makes setup/db/db/schema-421to430.sql same as in master branch. The
change is table view related and does not affect db at all. Making it same
as the version on master for sanity purposes.
Backported using a6ee4112a5 by
Koushik Das <koushik@apache.org>
CLOUDSTACK-7595: Config parameters "job.expire.minutes" and
"job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60
Removed the unnecessary multiply factor for both the config parameters. Also
removed the duplicate entries from Config.java as these are not required
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
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
This restriction was purposely avoid confusion of VPN setup, but later found too
strictly and cause troubles for deployment. Removed after testing one customer
gateway with multiple connections.
(cherry picked from commit 0a62eb8380)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
Added fields to /api and /server classes for CustomDiskOfferingMinSize
to be available in CapabilitiesResponse. Fixed UI code in Instance
Wizard to have this config value as the minimum selectable option when
we are in custom disk size mode.
(cherry picked from commit 883d7f17f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
server/src/com/cloud/server/ManagementServerImpl.java
... event bus by UserVmStateListener. Allow system VM resource state
post-transitions to be published.
(cherry picked from commit 9c4de764f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/vm/UserVmStateListener.java
However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties.
Local testing, checking a fresh install has the above property false by default.
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
(cherry picked from commit 05802004e2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Fix is to fail API calls with empty 'id' parameter value upfront rather than
going ahead and failing with NPE later on.
Backported using fix 4e07dd1dc4 by
Koushik Das <koushik@apache.org>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
(cherry picked from commit 7175247c5e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Increased the ram size of Internal load balancer vm service offering also
Backported from fix by Harikrishna Patnala <harikrishna.patnala@citrix.com>
https://reviews.apache.org/r/17941/
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Rohit Yadav
Anthony Xu
yichi.lu
Abhinandan Prateek
Pierre-Yves Ritschard
Anshul Gangwar
Koushik Das
Kelven Yang
Nitin Mehta
Alena Prokharchyk
Ilia Shakitko
Sheng Yang
Likitha Shetty
Gabor Apati-Nagy
Kishan Kavala
Tanner Danzey
jeff
Amogh Vasekar
Jayapal
Harikrishna Patnala
Murali Reddy
Damodar
Daniel Vega
Edison Su
Min Chen