This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch 4.18-vm-autoscaling
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 05438aba9e0 AS DB: rename virtual.network.received/transmit to
public.network.received/transmit
add c83dee58517 server: fix exception in DeploymentPlanningManagerImplTest
(#6799)
add 713a236843c UserData as first class resource (#6202)
add d2e7922555e Merge remote-tracking branch 'apache/main' into
4.18-vm-autoscaling
add a0ff4d235e7 AS: fix build error after merging UserData PR 6202
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 5 +
.../main/java/com/cloud/network/NetworkModel.java | 6 +-
.../java/com/cloud/server/ManagementService.java | 31 +
.../com/cloud/template/TemplateApiService.java | 5 +
.../com/cloud/template/VirtualMachineTemplate.java | 6 +
.../{uservm/UserVm.java => user/UserData.java} | 27 +-
api/src/main/java/com/cloud/uservm/UserVm.java | 8 +
api/src/main/java/com/cloud/vm/UserVmService.java | 63 +-
.../cloudstack/annotation/AnnotationService.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 6 +
.../apache/cloudstack/api/ResponseGenerator.java | 8 +-
.../command/admin/vm/ResetVMUserDataCmdAdmin.java} | 32 +-
.../command/user/userdata/DeleteUserDataCmd.java | 120 ++++
.../user/userdata/LinkUserDataToTemplateCmd.java | 130 ++++
.../api/command/user/userdata/ListUserDataCmd.java | 85 +++
.../command/user/userdata/RegisterUserDataCmd.java | 148 ++++
.../api/command/user/vm/DeployVMCmd.java | 26 +
.../api/command/user/vm/ResetVMUserDataCmd.java | 173 +++++
.../api/command/user/vm/UpdateVMCmd.java | 32 +-
.../cloudstack/api/response/TemplateResponse.java | 44 ++
.../cloudstack/api/response/UserDataResponse.java | 128 ++++
.../cloudstack/api/response/UserVmResponse.java | 45 ++
.../api/command/test/ResetVMUserDataCmdTest.java | 138 ++++
.../user/userdata/DeleteUserDataCmdTest.java | 98 +++
.../userdata/LinkUserDataToTemplateCmdTest.java | 109 +++
.../command/user/userdata/ListUserDataCmdTest.java | 89 +++
.../user/userdata/RegisterUserDataCmdTest.java | 113 +++
.../engine/subsystem/api/storage/TemplateInfo.java | 5 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
.../main/java/com/cloud/storage/VMTemplateVO.java | 27 +
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 17 +-
.../src/main/java/com/cloud/user/UserDataVO.java | 120 ++++
.../main/java/com/cloud/user/dao/UserDataDao.java | 27 +-
.../java/com/cloud/user/dao/UserDataDaoImpl.java | 66 ++
.../src/main/java/com/cloud/vm/UserVmVO.java | 30 +-
.../src/main/java/com/cloud/vm/dao/UserVmDao.java | 16 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 19 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41710to41800.sql | 163 ++++-
.../storage/configdrive/ConfigDriveBuilder.java | 35 +-
.../configdrive/ConfigDriveBuilderTest.java | 72 +-
.../storage/image/store/TemplateObject.java | 11 +
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 2 +-
...ernetesClusterResourceModifierActionWorker.java | 4 +-
.../KubernetesClusterStartWorker.java | 8 +-
.../contrail/management/ServiceVirtualMachine.java | 2 +-
.../contrail/management/ManagementServerMock.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 18 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 23 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 7 +
.../com/cloud/api/query/vo/TemplateJoinVO.java | 34 +
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 35 +
.../java/com/cloud/network/NetworkModelImpl.java | 18 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 20 +-
.../network/element/ConfigDriveNetworkElement.java | 29 +-
.../cloud/network/router/CommandSetupHelper.java | 24 +-
.../com/cloud/server/ManagementServerImpl.java | 240 ++++++-
.../com/cloud/template/TemplateManagerImpl.java | 39 ++
.../src/main/java/com/cloud/vm/UserVmManager.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 223 ++++--
.../annotation/AnnotationManagerImpl.java | 6 +
.../deploy/DeploymentPlanningManagerImplTest.java | 3 +
.../com/cloud/network/MockNetworkModelImpl.java | 2 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 12 +-
.../element/ConfigDriveNetworkElementTest.java | 2 +-
.../cloud/network/lb/AssignLoadBalancerTest.java | 6 +-
.../network/router/CommandSetupHelperTest.java | 82 +++
.../com/cloud/server/ManagementServerImplTest.java | 323 ++++++++-
.../cloud/storage/VolumeApiServiceImplTest.java | 10 +-
.../cloud/template/TemplateManagerImplTest.java | 82 +++
.../java/com/cloud/vm/UserVmManagerImplTest.java | 245 ++++++-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 2 +-
.../java/com/cloud/vm/dao/UserVmDaoImplTest.java | 2 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 2 +-
.../cloudstack/affinity/AffinityApiUnitTest.java | 2 +-
.../affinity/AffinityGroupServiceImplTest.java | 2 +-
test/integration/smoke/test_register_userdata.py | 766 +++++++++++++++++++++
tools/marvin/marvin/lib/base.py | 59 +-
ui/public/locales/en.json | 20 +
ui/public/locales/pl.json | 1 +
ui/src/components/view/AnnotationsTab.vue | 1 +
ui/src/components/view/DetailsTab.vue | 7 +
ui/src/components/view/InfoCard.vue | 8 +
ui/src/components/view/ListView.vue | 4 +-
ui/src/config/section/compute.js | 86 ++-
ui/src/config/section/image.js | 9 +-
ui/src/core/lazy_lib/icons_use.js | 4 +-
ui/src/views/compute/DeployVM.vue | 255 ++++++-
ui/src/views/compute/RegisterUserData.vue | 255 +++++++
ui/src/views/compute/ResetUserData.vue | 394 +++++++++++
ui/src/views/compute/wizard/UserDataSelection.vue | 202 ++++++
ui/src/views/image/RegisterOrUploadIso.vue | 104 ++-
ui/src/views/image/RegisterOrUploadTemplate.vue | 104 ++-
ui/src/views/image/UpdateISO.vue | 307 +++++++++
ui/src/views/image/UpdateTemplate.vue | 131 +++-
96 files changed, 6257 insertions(+), 263 deletions(-)
copy api/src/main/java/com/cloud/{uservm/UserVm.java => user/UserData.java}
(67%)
copy api/src/main/java/{com/cloud/uservm/UserVm.java =>
org/apache/cloudstack/api/command/admin/vm/ResetVMUserDataCmdAdmin.java} (51%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteUserDataCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/userdata/LinkUserDataToTemplateCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListUserDataCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMUserDataCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/test/ResetVMUserDataCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/userdata/DeleteUserDataCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/userdata/LinkUserDataToTemplateCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/userdata/ListUserDataCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmdTest.java
create mode 100644 engine/schema/src/main/java/com/cloud/user/UserDataVO.java
copy api/src/main/java/com/cloud/uservm/UserVm.java =>
engine/schema/src/main/java/com/cloud/user/dao/UserDataDao.java (61%)
create mode 100644
engine/schema/src/main/java/com/cloud/user/dao/UserDataDaoImpl.java
create mode 100644
server/src/test/java/com/cloud/network/router/CommandSetupHelperTest.java
create mode 100644 test/integration/smoke/test_register_userdata.py
create mode 100644 ui/src/views/compute/RegisterUserData.vue
create mode 100644 ui/src/views/compute/ResetUserData.vue
create mode 100644 ui/src/views/compute/wizard/UserDataSelection.vue
create mode 100644 ui/src/views/image/UpdateISO.vue
