This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 32dcdb4ab41 4.20/main Health Check, please don't merge this!
add 7632814cd20 Instance lease: Allow deployment of instances with lease
duration and leaseexpiry action (#10560)
add fa85a75bc88 Log previous and new value of configuration when
reset/update API is called (#10769)
add 41b4f0afd53 ui: missing changes from #10115 (#10949)
add bce17b627d1 ui,api,server: template categorization based on os (#10773)
add 0869f00095f 4.20/main Health Check, please don't merge this!
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 (32dcdb4ab41)
\
N -- N -- N refs/heads/healthcheck-main (0869f00095f)
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:
.github/workflows/ci.yml | 3 +-
api/src/main/java/com/cloud/event/EventTypes.java | 14 +
.../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 +
.../main/java/com/cloud/vm/VmDetailConstants.java | 4 +
.../cloudstack/api/ApiCommandResourceType.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 8 +-
.../apache/cloudstack/api/ResponseGenerator.java | 31 +-
...eGuestOsCmd.java => AddGuestOsCategoryCmd.java} | 65 +-
.../DeleteGuestOsCategoryCmd.java} | 48 +-
.../UpdateGuestOsCategoryCmd.java} | 77 +-
.../api/command/admin/guest/UpdateGuestOsCmd.java | 32 +-
.../admin/offering/CreateServiceOfferingCmd.java | 26 +
.../command/user/config/ListCapabilitiesCmd.java | 1 +
.../user/guest/ListGuestOsCategoriesCmd.java | 77 +-
.../api/command/user/iso/ListIsosCmd.java | 37 +-
.../command/user/template/ListTemplatesCmd.java | 40 +-
.../api/command/user/vm/DeployVMCmd.java | 82 ++-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 98 ++-
.../api/command/user/vm/UpdateVMCmd.java | 56 +-
.../api/response/CapabilitiesResponse.java | 8 +
.../api/response/GuestOSCategoryResponse.java | 29 +-
.../api/response/ServiceOfferingResponse.java | 24 +
.../cloudstack/api/response/TemplateResponse.java | 10 +
.../cloudstack/api/response/UserVmResponse.java | 39 +-
.../apache/cloudstack/vm/lease/VMLeaseManager.java | 61 ++
.../guest/AddGuestOsCategoryCmdTest.java} | 28 +-
.../UpdateGuestOsCategoryCmdTest.java} | 38 +-
.../command/admin/guest/UpdateGuestOsCmdTest.java | 19 +-
.../offering/CreateServiceOfferingCmdTest.java | 23 +
.../user/guest/ListGuestOsCategoriesCmdTest.java | 87 +++
.../api/command/user/vm/ListVMsCmdTest.java | 223 ++++++
.../cloud/configuration/ConfigurationManager.java | 6 +-
.../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 +++
.../db/views/cloud.service_offering_view.sql | 8 +
.../META-INF/db/views/cloud.template_view.sql | 1 +
.../META-INF/db/views/cloud.user_vm_view.sql | 13 +-
.../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 | 96 ++-
.../java/com/cloud/api/query/QueryManagerImpl.java | 39 +-
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 6 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 40 +-
.../com/cloud/api/query/dao/UserVmJoinDao.java | 17 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 154 +++-
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 30 +-
.../com/cloud/api/query/vo/TemplateJoinVO.java | 15 +-
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 29 +-
.../configuration/ConfigurationManagerImpl.java | 137 +++-
.../resourceicon/ResourceIconManagerImpl.java | 17 +
.../com/cloud/server/ManagementServerImpl.java | 156 +++-
.../com/cloud/tags/ResourceManagerUtilImpl.java | 2 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 131 ++++
.../cloudstack/vm/lease/VMLeaseManagerImpl.java | 381 ++++++++++
.../core/spring-server-core-managers-context.xml | 5 +
.../java/com/cloud/api/ApiResponseHelperTest.java | 224 +++++-
.../ConfigurationManagerImplTest.java | 16 +-
.../com/cloud/server/ManagementServerImplTest.java | 393 ++++++++--
.../java/com/cloud/vm/UserVmManagerImplTest.java | 224 +++++-
.../cloud/vpc/MockConfigurationManagerImpl.java | 3 +-
.../vm/lease/VMLeaseManagerImplTest.java | 314 ++++++++
test/integration/component/test_deploy_vm_lease.py | 358 +++++++++
test/integration/smoke/test_service_offerings.py | 161 ++++-
tools/marvin/marvin/lib/base.py | 9 +-
ui/public/config.json | 3 +
ui/public/locales/en.json | 31 +-
ui/src/components/header/UserMenu.vue | 5 +
ui/src/components/view/DetailsTab.vue | 10 +
.../components/view/ImageDeployInstanceButton.vue | 150 ++++
ui/src/components/view/InfoCard.vue | 156 ++--
ui/src/components/view/ListView.vue | 54 +-
ui/src/components/view/ResourceIcon.vue | 16 +-
ui/src/components/view/SearchView.vue | 66 +-
.../components/widgets/BlockRadioGroupSelect.vue | 154 ++++
ui/src/components/widgets/OsLogo.vue | 53 +-
ui/src/config/section/compute.js | 5 +-
ui/src/config/section/config.js | 60 +-
ui/src/config/section/image.js | 4 +-
ui/src/config/section/offering.js | 2 +-
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 | 6 +
ui/src/views/auth/Login.vue | 4 +-
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 517 ++++++++-----
ui/src/views/compute/DeployVM.vue | 798 +++++++++++++--------
ui/src/views/compute/DeployVnfAppliance.vue | 650 +++++++++--------
ui/src/views/compute/EditVM.vue | 68 +-
ui/src/views/compute/ReinstallVm.vue | 183 ++++-
ui/src/views/compute/ResetUserData.vue | 8 +-
.../compute/wizard/ComputeOfferingSelection.vue | 32 +-
.../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/dashboard/UsageDashboard.vue | 27 +-
ui/src/views/image/IsoZones.vue | 148 ++--
ui/src/views/image/RegisterOrUploadTemplate.vue | 29 +-
ui/src/views/image/TemplateZones.vue | 139 ++--
ui/src/views/offering/AddComputeOffering.vue | 68 +-
.../java/com/cloud/utils/db/EntityManager.java | 3 +
116 files changed, 7291 insertions(+), 1599 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%)
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManager.java
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
server/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImpl.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImplTest.java
create mode 100644 test/integration/component/test_deploy_vm_lease.py
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%)
