This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch netris-integration-upstream
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 5e0a431903d fix test
add bce17b627d1 ui,api,server: template categorization based on os (#10773)
add c25a7e5554f Merge branch 'main' of
https://github.com/apache/cloudstack into netris-integration-upstream
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 3 +
.../java/com/cloud/server/ManagementService.java | 9 +
.../java/com/cloud/server/ResourceIconManager.java | 6 +
.../main/java/com/cloud/server/ResourceTag.java | 1 +
.../java/com/cloud/storage/GuestOsCategory.java | 5 +
.../cloudstack/api/ApiCommandResourceType.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../apache/cloudstack/api/ResponseGenerator.java | 31 +-
...eGuestOsCmd.java => AddGuestOsCategoryCmd.java} | 65 +-
.../DeleteGuestOsCategoryCmd.java} | 48 +-
.../UpdateGuestOsCategoryCmd.java} | 77 ++-
.../api/command/admin/guest/UpdateGuestOsCmd.java | 32 +-
.../user/guest/ListGuestOsCategoriesCmd.java | 77 ++-
.../api/command/user/iso/ListIsosCmd.java | 37 +-
.../command/user/template/ListTemplatesCmd.java | 40 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 89 ++-
.../api/response/GuestOSCategoryResponse.java | 29 +-
.../cloudstack/api/response/TemplateResponse.java | 10 +
.../guest/AddGuestOsCategoryCmdTest.java} | 28 +-
.../UpdateGuestOsCategoryCmdTest.java} | 38 +-
.../command/admin/guest/UpdateGuestOsCmdTest.java | 19 +-
.../user/guest/ListGuestOsCategoriesCmdTest.java | 87 +++
.../api/command/user/vm/ListVMsCmdTest.java | 223 +++++++
.../cloud/resource/icon/dao/ResourceIconDao.java | 3 +
.../resource/icon/dao/ResourceIconDaoImpl.java | 31 +-
.../java/com/cloud/storage/GuestOSCategoryVO.java | 45 +-
.../cloud/storage/dao/GuestOSCategoryDaoImpl.java | 1 -
.../java/com/cloud/storage/dao/GuestOSDao.java | 8 +-
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 21 +-
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 43 ++
.../resources/META-INF/db/schema-42010to42100.sql | 90 +++
.../META-INF/db/views/cloud.template_view.sql | 1 +
.../cloud/storage/dao/VMTemplateDaoImplTest.java | 113 ++++
.../main/java/com/cloud/dao/EntityManagerImpl.java | 8 +
.../main/java/com/cloud/utils/db/GenericDao.java | 6 +
.../java/com/cloud/utils/db/GenericDaoBase.java | 11 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 86 ++-
.../java/com/cloud/api/query/QueryManagerImpl.java | 25 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 40 +-
.../com/cloud/api/query/vo/TemplateJoinVO.java | 15 +-
.../resourceicon/ResourceIconManagerImpl.java | 17 +
.../com/cloud/server/ManagementServerImpl.java | 154 ++++-
.../com/cloud/tags/ResourceManagerUtilImpl.java | 2 +
.../java/com/cloud/api/ApiResponseHelperTest.java | 224 +++++--
.../com/cloud/server/ManagementServerImplTest.java | 386 +++++++++--
ui/public/config.json | 3 +
ui/public/locales/en.json | 21 +-
ui/src/components/header/UserMenu.vue | 5 +
.../components/view/ImageDeployInstanceButton.vue | 150 +++++
ui/src/components/view/InfoCard.vue | 132 ++--
ui/src/components/view/ListView.vue | 21 +-
ui/src/components/view/ResourceIcon.vue | 16 +-
ui/src/components/view/SearchView.vue | 39 +-
.../components/widgets/BlockRadioGroupSelect.vue | 154 +++++
ui/src/components/widgets/OsLogo.vue | 53 +-
ui/src/config/section/config.js | 60 +-
ui/src/config/section/image.js | 4 +-
ui/src/core/lazy_lib/components_use.js | 2 +
ui/src/core/lazy_lib/icons_use.js | 4 +
ui/src/main.js | 4 +-
ui/src/store/modules/user.js | 3 +-
ui/src/utils/plugins.js | 19 +-
ui/src/views/AutogenView.vue | 3 +
ui/src/views/auth/Login.vue | 4 +-
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 517 ++++++++++-----
ui/src/views/compute/DeployVM.vue | 721 ++++++++++++---------
ui/src/views/compute/DeployVnfAppliance.vue | 650 +++++++++++--------
ui/src/views/compute/ReinstallVm.vue | 183 ++++--
ui/src/views/compute/ResetUserData.vue | 8 +-
.../views/compute/wizard/NetworkConfiguration.vue | 1 +
.../compute/wizard/OsBasedImageRadioGroup.vue | 208 ++++++
.../views/compute/wizard/OsBasedImageSelection.vue | 373 +++++++++++
.../wizard/OsBasedImageSelectionSearchView.vue | 119 ++++
.../wizard/ZoneBlockRadioGroupSelect.vue} | 31 +-
ui/src/views/image/IsoZones.vue | 148 +++--
ui/src/views/image/RegisterOrUploadTemplate.vue | 29 +-
ui/src/views/image/TemplateZones.vue | 139 ++--
.../java/com/cloud/utils/db/EntityManager.java | 3 +
79 files changed, 4717 insertions(+), 1398 deletions(-)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/{RemoveGuestOsCmd.java
=> AddGuestOsCategoryCmd.java} (60%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/{cluster/DeleteClusterCmd.java
=> guest/DeleteGuestOsCategoryCmd.java} (74%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/{domain/UpdateDomainCmd.java
=> guest/UpdateGuestOsCategoryCmd.java} (59%)
copy
api/src/test/java/org/apache/cloudstack/api/command/{user/project/CreateProjectCmdTest.java
=> admin/guest/AddGuestOsCategoryCmdTest.java} (58%)
copy
api/src/test/java/org/apache/cloudstack/api/command/admin/{offering/UpdateServiceOfferingCmdTest.java
=> guest/UpdateGuestOsCategoryCmdTest.java} (50%)
copy
framework/cluster/src/test/java/com/cloud/cluster/ClusterManagerImplTest.java
=>
api/src/test/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmdTest.java
(72%)
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmdTest.java
create mode 100644 ui/src/components/view/ImageDeployInstanceButton.vue
create mode 100644 ui/src/components/widgets/BlockRadioGroupSelect.vue
create mode 100644 ui/src/views/compute/wizard/OsBasedImageRadioGroup.vue
create mode 100644 ui/src/views/compute/wizard/OsBasedImageSelection.vue
create mode 100644
ui/src/views/compute/wizard/OsBasedImageSelectionSearchView.vue
copy ui/src/views/{exception/403.vue =>
compute/wizard/ZoneBlockRadioGroupSelect.vue} (50%)
