This is an automated email from the ASF dual-hosted git repository.
andrijapanic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from d8906d3 Merge remote-tracking branch 'origin/4.13'
add fd5bea8 New feature: Add support to destroy/recover volumes (#3688)
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 4 +
api/src/main/java/com/cloud/storage/Volume.java | 2 +
.../java/com/cloud/storage/VolumeApiService.java | 6 +-
.../admin/volume/DestroyVolumeCmdByAdmin.java | 54 +++
.../admin/volume/RecoverVolumeCmdByAdmin.java | 53 +++
.../command/user/config/ListCapabilitiesCmd.java | 1 +
.../api/command/user/volume/DeleteVolumeCmd.java | 4 +-
.../DestroyVolumeCmd.java} | 68 +--
.../api/command/user/volume/ListVolumesCmd.java | 8 +
...{DeleteVolumeCmd.java => RecoverVolumeCmd.java} | 42 +-
.../api/response/CapabilitiesResponse.java | 10 +-
.../engine/orchestration/VolumeOrchestrator.java | 4 +-
.../storage/volume/VolumeServiceImpl.java | 12 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 13 +-
.../com/cloud/server/ManagementServerImpl.java | 11 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 111 ++++-
.../java/com/cloud/user/AccountManagerImpl.java | 13 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 5 -
.../cloud/storage/VolumeApiServiceImplTest.java | 22 -
.../component/test_volume_destroy_recover.py | 507 +++++++++++++++++++++
tools/marvin/marvin/lib/base.py | 13 +
ui/l10n/ar.js | 4 +
ui/l10n/ca.js | 4 +
ui/l10n/de_DE.js | 4 +
ui/l10n/en.js | 4 +
ui/l10n/es.js | 4 +
ui/l10n/fr_FR.js | 4 +
ui/l10n/hu.js | 4 +
ui/l10n/it_IT.js | 4 +
ui/l10n/ja_JP.js | 4 +
ui/l10n/ko_KR.js | 4 +
ui/l10n/nb_NO.js | 4 +
ui/l10n/nl_NL.js | 4 +
ui/l10n/pl.js | 4 +
ui/l10n/pt_BR.js | 4 +
ui/l10n/ru_RU.js | 4 +
ui/l10n/zh_CN.js | 4 +
ui/scripts/cloudStack.js | 2 +
ui/scripts/sharedFunctions.js | 1 +
ui/scripts/storage.js | 143 +++++-
40 files changed, 1061 insertions(+), 112 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DestroyVolumeCmdByAdmin.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/volume/RecoverVolumeCmdByAdmin.java
copy
api/src/main/java/org/apache/cloudstack/api/command/user/{vm/RebootVMCmd.java
=> volume/DestroyVolumeCmd.java} (59%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/volume/{DeleteVolumeCmd.java
=> RecoverVolumeCmd.java} (65%)
create mode 100644 test/integration/component/test_volume_destroy_recover.py
