This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from a36f3558777 NSX: Router Public nic to get IP from systemVM Ip range
(#8172)
add 288f066d9fc Add logs to script execution (#6874)
add 5362bad442e Storage Management (#7949)
add 2dac6cb6743 ui: fix snapshot copy actions for non-rootadmins (#8164)
add 548f0408c5d Merge branch 'main' of
https://github.com/apache/cloudstack into nsx-integration
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/agent/api/Command.java | 7 +
api/src/main/java/com/cloud/event/EventTypes.java | 3 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../api/command/admin/iso/ListIsosCmdByAdmin.java | 21 +
.../admin/snapshot/ListSnapshotsCmdByAdmin.java | 50 +++
.../admin/storage/DownloadImageStoreObjectCmd.java | 99 +++++
.../admin/storage/ListImageStoreObjectsCmd.java | 77 ++++
.../admin/storage/ListStoragePoolObjectsCmd.java | 78 ++++
...grateResourcesToAnotherSecondaryStorageCmd.java | 140 +++++++
.../admin/template/ListTemplatesCmdByAdmin.java | 25 +-
.../api/command/user/iso/ListIsosCmd.java | 8 +
.../command/user/snapshot/ListSnapshotsCmd.java | 11 +-
.../command/user/template/ListTemplatesCmd.java | 12 +
...eService.java => ImageStoreObjectDownload.java} | 21 +-
.../cloudstack/storage/ImageStoreService.java | 2 +
.../storage/browser/DataStoreObjectResponse.java | 120 ++++++
.../cloudstack/storage/browser/StorageBrowser.java | 35 ++
.../command/admin/iso/ListIsosCmdByAdminTest.java | 128 ++++++
.../storage/DownloadImageStoreObjectCmdTest.java | 119 ++++++
.../storage/ListImageStoreObjectsCmdTest.java | 98 +++++
.../storage/ListStoragePoolObjectsCmdTest.java | 96 +++++
...eResourcesToAnotherSecondaryStorageCmdTest.java | 90 ++++
.../template/ListTemplatesCmdByAdminTest.java | 94 +++++
.../api/command/user/iso/ListIsosCmdTest.java | 128 ++++++
.../user/template/ListTemplatesCmdTest.java | 94 +++++
.../api/storage/CreateEntityDownloadURLAnswer.java | 7 +-
.../com/cloud/resource/ServerResourceBase.java | 35 ++
.../browser/ListDataStoreObjectsAnswer.java | 113 +++++
.../browser/ListDataStoreObjectsCommand.java | 66 +++
.../com/cloud/resource/ServerResourceBaseTest.java | 37 ++
.../browser/ListDataStoreObjectsAnswerTest.java | 63 +++
.../browser/ListDataStoreObjectsCommandTest.java | 42 ++
.../service/StorageOrchestrationService.java | 2 +
.../engine/orchestration/DataMigrationUtility.java | 51 ++-
.../engine/orchestration/StorageOrchestrator.java | 83 +++-
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 18 +
.../com/cloud/storage/dao/VMTemplatePoolDao.java | 4 +
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 30 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 4 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 36 ++
.../upgrade/dao/BasicTemplateDataStoreDaoImpl.java | 10 +
.../datastore/db/ImageStoreObjectDownloadDao.java | 30 ++
.../db/ImageStoreObjectDownloadDaoImpl.java | 69 ++++
.../datastore/db/ImageStoreObjectDownloadVO.java | 81 ++++
.../storage/datastore/db/SnapshotDataStoreDao.java | 4 +
.../datastore/db/SnapshotDataStoreDaoImpl.java | 41 ++
.../storage/datastore/db/TemplateDataStoreDao.java | 4 +
.../storage/datastore/db/VolumeDataStoreDao.java | 2 +
...n-daos-between-management-and-usage-context.xml | 1 +
.../resources/META-INF/db/schema-41810to41900.sql | 20 +
.../storage/image/db/TemplateDataStoreDaoImpl.java | 35 ++
.../storage/image/db/VolumeDataStoreDaoImpl.java | 22 +-
.../kvm/resource/LibvirtComputingResource.java | 7 +
.../LibvirtListDataStoreObjectsCommandWrapper.java | 27 +-
.../hypervisor/vmware/resource/VmwareResource.java | 79 ++++
.../vmware/resource/VmwareResourceTest.java | 218 +++++++++-
.../xenserver/resource/CitrixResourceBase.java | 73 ++++
.../CitrixListDataStoreObjectsCommandWrapper.java | 50 +++
.../xenserver/resource/CitrixResourceBaseTest.java | 151 ++++++-
.../driver/CloudStackImageStoreDriverImpl.java | 9 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 8 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 90 +++-
.../com/cloud/api/query/ViewResponseHelper.java | 2 +-
.../com/cloud/api/query/dao/TemplateJoinDao.java | 2 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 78 +++-
.../com/cloud/server/ManagementServerImpl.java | 4 +
.../com/cloud/storage/ImageStoreServiceImpl.java | 65 ++-
.../java/com/cloud/storage/StorageManagerImpl.java | 17 +
.../diagnostics/to/DiagnosticsDataTO.java | 4 +
.../storage/browser/StorageBrowserImpl.java | 413 ++++++++++++++++++
.../core/spring-server-core-managers-context.xml | 2 +
.../com/cloud/api/query/QueryManagerImplTest.java | 1 +
.../storage/browser/StorageBrowserImplTest.java | 459 +++++++++++++++++++++
.../resource/NfsSecondaryStorageResource.java | 7 +
.../storage/template/UploadManagerImpl.java | 10 +-
.../smoke/test_image_store_object_migration.py | 233 +++++++++++
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/lib/base.py | 21 +
ui/public/locales/en.json | 5 +
ui/src/components/view/ImageStoreSelectView.vue | 193 +++++++++
ui/src/components/view/SearchView.vue | 60 ++-
ui/src/config/section/image.js | 18 +-
ui/src/config/section/infra/primaryStorages.js | 14 +
ui/src/config/section/infra/secondaryStorages.js | 19 +
ui/src/config/section/storage.js | 17 +-
ui/src/views/AutogenView.vue | 6 +-
ui/src/views/image/IsoZones.vue | 65 ++-
ui/src/views/image/TemplateZones.vue | 49 ++-
ui/src/views/infra/StorageBrowser.vue | 359 ++++++++++++++++
ui/src/views/storage/MigrateImageStoreResource.vue | 179 ++++++++
ui/src/views/storage/SnapshotZones.vue | 23 +-
.../main/java/com/cloud/utils/script/Script.java | 60 +--
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 5 +-
94 files changed, 5428 insertions(+), 144 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/snapshot/ListSnapshotsCmdByAdmin.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DownloadImageStoreObjectCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoreObjectsCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolObjectsCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateResourcesToAnotherSecondaryStorageCmd.java
copy api/src/main/java/org/apache/cloudstack/storage/{ImageStoreService.java
=> ImageStoreObjectDownload.java} (72%)
create mode 100644
api/src/main/java/org/apache/cloudstack/storage/browser/DataStoreObjectResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/storage/browser/StorageBrowser.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdminTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/storage/DownloadImageStoreObjectCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoreObjectsCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolObjectsCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/storage/MigrateResourcesToAnotherSecondaryStorageCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdminTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmdTest.java
create mode 100644
core/src/main/java/org/apache/cloudstack/storage/command/browser/ListDataStoreObjectsAnswer.java
create mode 100644
core/src/main/java/org/apache/cloudstack/storage/command/browser/ListDataStoreObjectsCommand.java
create mode 100644
core/src/test/java/org/apache/cloudstack/storage/command/browser/ListDataStoreObjectsAnswerTest.java
create mode 100644
core/src/test/java/org/apache/cloudstack/storage/command/browser/ListDataStoreObjectsCommandTest.java
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreObjectDownloadDao.java
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreObjectDownloadDaoImpl.java
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreObjectDownloadVO.java
copy
core/src/main/java/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
=>
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtListDataStoreObjectsCommandWrapper.java
(54%)
create mode 100644
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixListDataStoreObjectsCommandWrapper.java
create mode 100644
server/src/main/java/org/apache/cloudstack/storage/browser/StorageBrowserImpl.java
create mode 100644
server/src/test/java/org/apache/cloudstack/storage/browser/StorageBrowserImplTest.java
create mode 100644 test/integration/smoke/test_image_store_object_migration.py
create mode 100644 ui/src/components/view/ImageStoreSelectView.vue
create mode 100644 ui/src/views/infra/StorageBrowser.vue
create mode 100644 ui/src/views/storage/MigrateImageStoreResource.vue
