This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit 0b3389c2d3b do not merge
add 5362bad442e Storage Management (#7949)
add 2dac6cb6743 ui: fix snapshot copy actions for non-rootadmins (#8164)
add b2b707b90ed Add pre-commit hooks: check-symlinks and
destroyed-symlinks (#8071)
add 9c4d18f9b13 role ispublic param on UI (#7973)
add f090c77f419 misc: fix spelling (#7549)
add e1b6093c64d add 'management.network.cidr' ip to mgmt certificate
(#7728)
add b712b4a8c09 do not merge
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0b3389c2d3b)
\
N -- N -- N refs/heads/dummy (b712b4a8c09)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.pre-commit-config.yaml | 2 +
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/acl/CreateRoleCmd.java | 3 +-
.../api/command/admin/host/DeleteHostCmd.java | 4 +-
.../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 +
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 2 +-
.../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 +++-
.../offerings/dao/NetworkOfferingDaoImpl.java | 2 +-
.../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 ++
.../cloud/upgrade/DatabaseIntegrityChecker.java | 2 +-
.../upgrade/dao/BasicTemplateDataStoreDaoImpl.java | 10 +
.../java/com/cloud/upgrade/dao/Upgrade218to22.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade224to225.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade301to302.java | 2 +-
.../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 +
.../main/resources/META-INF/db/schema-21to22.sql | 4 +-
.../resources/META-INF/db/schema-2212to2213.sql | 2 +-
.../main/resources/META-INF/db/schema-2214to30.sql | 2 +-
.../main/resources/META-INF/db/schema-225to226.sql | 2 +-
.../main/resources/META-INF/db/schema-227to228.sql | 2 +-
.../main/resources/META-INF/db/schema-228to229.sql | 2 +-
.../resources/META-INF/db/schema-229to2210.sql | 2 +-
.../main/resources/META-INF/db/schema-302to40.sql | 2 +-
.../main/resources/META-INF/db/schema-307to410.sql | 2 +-
.../main/resources/META-INF/db/schema-410to420.sql | 8 +-
.../resources/META-INF/db/schema-41310to41400.sql | 2 +-
.../resources/META-INF/db/schema-41720to41800.sql | 2 +-
.../resources/META-INF/db/schema-41810to41900.sql | 20 +
.../main/resources/META-INF/db/schema-420to421.sql | 2 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 2 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 2 +-
.../storage/endpoint/DefaultEndPointSelector.java | 2 +-
.../storage/image/db/TemplateDataStoreDaoImpl.java | 43 +-
.../storage/image/db/VolumeDataStoreDaoImpl.java | 22 +-
.../apache/cloudstack/storage/BaseTypeTest.java | 4 +-
.../cloudstack/ca/provider/RootCAProvider.java | 35 +-
.../HypervResource/CloudStackTypes.cs | 2 +-
.../HypervResourceController1Test.cs | 10 +-
.../HypervResourceControllerTest.cs | 10 +-
.../hypervisor/kvm/resource/KVMGuestOsMapper.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 7 +
.../LibvirtListDataStoreObjectsCommandWrapper.java | 27 +-
.../scripts/vm/hypervisor/ovm/OvmVolumeModule.py | 2 +-
.../hypervisor/vmware/resource/VmwareResource.java | 79 ++++
.../vmware/resource/VmwareResourceTest.java | 218 +++++++++-
.../xenserver/resource/CitrixResourceBase.java | 85 +++-
.../resource/XenServerStorageProcessor.java | 2 +-
.../CitrixListDataStoreObjectsCommandWrapper.java | 50 +++
.../xenserver/resource/CitrixResourceBaseTest.java | 151 ++++++-
.../driver/CloudStackImageStoreDriverImpl.java | 9 +-
.../storage/datastore/util/ElastistorUtil.java | 2 +-
.../storage/datastore/util/DateraUtil.java | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 2 +-
.../vm/hypervisor/xenserver/cloud-plugin-storage | 4 +-
scripts/vm/hypervisor/xenserver/vmops | 4 +-
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 6 +-
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 +++-
.../main/java/com/cloud/configuration/Config.java | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 2 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 2 +-
.../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 +
.../network/vpc/NetworkACLServiceImplTest.java | 6 +-
.../storage/browser/StorageBrowserImplTest.java | 459 +++++++++++++++++++++
.../resource/NfsSecondaryStorageResource.java | 7 +
.../storage/template/UploadManagerImpl.java | 10 +-
setup/db/create-schema.sql | 2 +-
setup/db/templates.sql | 4 +-
test/integration/component/test_browse_volumes.py | 6 +-
.../component/test_vpc_vm_life_cycle.py | 6 +-
.../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/role.js | 4 +-
ui/src/config/section/storage.js | 17 +-
ui/src/views/AutogenView.vue | 6 +-
ui/src/views/iam/CreateRole.vue | 10 +-
ui/src/views/iam/ImportRole.vue | 9 +-
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 +-
usage/src/test/resources/cloud1.xml | 2 +-
usage/src/test/resources/cloud2.xml | 2 +-
.../java/com/cloud/utils/net/Ip4AddressTest.java | 4 +-
.../src/test/java/com/cloud/utils/net/IpTest.java | 4 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 5 +-
148 files changed, 5535 insertions(+), 214 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
