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 a05e79529e6 address comments
add fb3bb3fd568 pre-commit: upgrade markdownlint to the latest version
(#11066)
add 165ab0aabe2 Fix HTML license; standardize HTML code (#11067)
add 1fbe1d76827 pre-commit: add gitleaks to detect hardcoded secrets
(#11064)
add 071e612f404 UI: Fix OS Type displayed for a VM (#11075)
add 7da5f9002b2 misc: fix typo `sercurity` -> `security` (#10966)
add 83bccead3db schema, refactor: rename cloud.user_vm_details to
cloud.vm_instance_details (#10736)
add 22b753e9302 [UI] Deploy VM: Preselect first available template (#11207)
add b333d068a59 Merge branch 'main' of
https://github.com/apache/cloudstack into netris-integration-upstream
No new revisions were added by this update.
Summary of changes:
.github/linters/.markdown-lint.yml | 3 +
.pre-commit-config.yaml | 8 +-
.../com/cloud/vm/VirtualMachineProfileImpl.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 36 +++----
.../engine/orchestration/CloudOrchestrator.java | 10 +-
.../engine/orchestration/VolumeOrchestrator.java | 18 ++--
.../cloud/vm/VirtualMachineManagerImplTest.java | 8 +-
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 8 +-
...UserVmDetailVO.java => VMInstanceDetailVO.java} | 8 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 8 +-
...VmDetailsDao.java => VMInstanceDetailsDao.java} | 4 +-
...sDaoImpl.java => VMInstanceDetailsDaoImpl.java} | 6 +-
...n-daos-between-management-and-usage-context.xml | 2 +-
.../resources/META-INF/db/schema-42010to42100.sql | 5 +
.../META-INF/db/views/cloud.user_vm_view.sql | 14 +--
.../storage/test/ChildTestConfiguration.java | 4 +-
.../presetvariables/PresetVariableHelper.java | 14 +--
...VmDetailsDao.java => VMInstanceDetailsDao.java} | 4 +-
...sDaoImpl.java => VMInstanceDetailsDaoImpl.java} | 14 +--
...UserVmDetailVO.java => VMInstanceDetailVO.java} | 8 +-
.../quota/spring-framework-quota-context.xml | 2 +-
.../presetvariables/PresetVariableHelperTest.java | 20 ++--
.../implicitplanner/ImplicitPlannerTest.java | 8 +-
.../main/resources/security_group_agent/cs-sgagent | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 53 +++++------
.../KubernetesClusterActionWorker.java | 10 +-
.../management/IntegrationTestConfiguration.java | 4 +-
.../manager/allocator/impl/FirstFitAllocator.java | 12 +--
server/src/main/java/com/cloud/api/ApiDBUtils.java | 14 +--
.../java/com/cloud/api/query/QueryManagerImpl.java | 24 ++---
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 94 +++++++++---------
.../com/cloud/capacity/CapacityManagerImpl.java | 10 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 6 +-
.../java/com/cloud/deploy/FirstFitPlanner.java | 4 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 6 +-
.../cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java | 13 +--
.../metadata/ResourceMetaDataManagerImpl.java | 4 +-
.../network/element/ConfigDriveNetworkElement.java | 24 ++---
.../router/VirtualNetworkApplianceManagerImpl.java | 4 +-
.../com/cloud/resource/ResourceManagerImpl.java | 8 +-
.../resource/RollingMaintenanceManagerImpl.java | 10 +-
.../com/cloud/server/ManagementServerImpl.java | 14 +--
.../com/cloud/storage/VolumeApiServiceImpl.java | 18 ++--
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 69 +++++++-------
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 20 ++--
.../consoleproxy/ConsoleAccessManagerImpl.java | 16 ++--
.../resource/ResourceCleanupServiceImpl.java | 6 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 4 +-
.../cloudstack/vm/lease/VMLeaseManagerImpl.java | 69 +++++++-------
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 4 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 8 +-
.../hypervisor/kvm/dpdk/DpdkHelperImplTest.java | 23 ++---
.../element/ConfigDriveNetworkElementTest.java | 12 +--
.../network/element/VirtualRouterElementTest.java | 5 +-
.../VirtualNetworkApplianceManagerImplTest.java | 4 +-
.../SecurityGroupManagerTestConfiguration.java | 4 +-
.../cloud/resource/ResourceManagerImplTest.java | 12 +--
.../RollingMaintenanceManagerImplTest.java | 16 ++--
.../com/cloud/server/ManagementServerImplTest.java | 33 ++-----
.../java/com/cloud/vm/FirstFitPlannerTest.java | 8 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 101 ++++++++++----------
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 24 ++---
.../java/com/cloud/vpc/VpcTestConfiguration.java | 4 +-
.../consoleproxy/ConsoleAccessManagerImplTest.java | 4 +-
.../networkoffering/CreateNetworkOfferingTest.java | 4 +-
.../resource/ResourceCleanupServiceImplTest.java | 10 +-
.../vm/lease/VMLeaseManagerImplTest.java | 74 +++++++-------
.../src/test/resources/createNetworkOffering.xml | 2 +-
.../SecondaryStorageManagerImpl.java | 4 +-
systemvm/agent/ui/viewer.ftl | 10 +-
.../maint/test_egress_rules_host_maintenance.py | 6 +-
test/integration/component/test_egress_rules.py | 60 ++++++------
.../component/test_project_resources.py | 6 +-
test/integration/component/test_security_groups.py | 72 +++++++-------
tools/apidoc/generatecommands.xsl | 2 +-
tools/ngui/templates/index.html | 106 +++++++++++----------
ui/public/example.html | 2 +-
ui/public/index.html | 2 +-
ui/src/components/view/InfoCard.vue | 14 +--
.../compute/wizard/OsBasedImageRadioGroup.vue | 5 +
80 files changed, 685 insertions(+), 688 deletions(-)
rename engine/schema/src/main/java/com/cloud/vm/{UserVmDetailVO.java =>
VMInstanceDetailVO.java} (90%)
rename engine/schema/src/main/java/com/cloud/vm/dao/{UserVmDetailsDao.java =>
VMInstanceDetailsDao.java} (84%)
rename engine/schema/src/main/java/com/cloud/vm/dao/{UserVmDetailsDaoImpl.java
=> VMInstanceDetailsDaoImpl.java} (81%)
rename
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{UserVmDetailsDao.java
=> VMInstanceDetailsDao.java} (87%)
rename
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{UserVmDetailsDaoImpl.java
=> VMInstanceDetailsDaoImpl.java} (80%)
rename
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/{UserVmDetailVO.java
=> VMInstanceDetailVO.java} (89%)
