This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from e0244e2f56c add NSX resource , api client, create tier1 gw
add fe70f4d801c Remove powermock from services (#7860)
add 8b5ba13b817 plugins: Add Custom hypervisor minimal changes (#7692)
add b0ae701ca4e Remove Super-Linter action and move `flake8` to pre-commit
(#7861)
add 7049a6058d2 UI: Add domain and account fields to Register/Upload
Template/ISO view (#7872)
add 1065e9046b1 Fix backup dates (#6473)
add 9083a677ae1 systeminstances field (#7871)
add 0b4afedb5b5 pre-commit: add hook to check for the existence of private
keys (#7805)
add 0bd7462c54a Link README logo to website (#7884)
add 19aacad46bb UI: Show iso urls (#7869)
add cf249f64a3b api: Force-stop descriptions (#7866)
add e8b491177f1 server: Replace Hashtable with LinkedHashMap in
createIsoResponse (#7844)
add c8d6e505393 VMware: add support for 8.0b (8.0.0.2), 8.0c (8.0.0.3)
(#7380)
add d8a5c890602 server: get only Ready ISO to mount (#7848)
add 87d6c4fbd5f packaging: install tzdata-java or timezone-java (#7875)
add 5b339673109 Fix role escalation prevention (#7853)
add add64bd7e69 security group: replace vm.getPrivateMacAddress() with
nic.getMacAddress() (#7293)
add f7345e861f8 cpvm: Fix CPVM not releasing CPU after closing console
(#7826)
add d296f54c7f2 Api: update command domainId/account descriptions (#7876)
add ddc2a362a88 UI: Add missing tooltips to Register/Upload Templates/ISOs
views (#7879)
add 6d242176363 server: Allow admins to disable the 2FA of users in
subdomains (#7870)
add 6cded7e0102 Support GNU sed apidoc for MacOS build (#7888)
add 405ef82aefd UI: Fix hide delete button for templates that are in
Installing template state (#7882)
add 78bdde9e981 AutoScaling: support Managed User Data (#7769)
add 5097d2aa8bd ui: fix creating zone with vxlan if Guest physical network
is not the last (#7801)
add db0e7a65afb server: check hostId when attach disk to a Stopped vm with
local storage (#7886)
add ea832bce136 Merge branch '4.18'
add 2ef159eeb84 merge issues
add 0e9a19f24db ui: Fix project theme on reload or refresh (#7893)
add e4117e68d2f engine/schema: fix duplicated guest OSes in 4.18.0.0
(#7799)
add 27f148e79e7 Merge branch '4.18'
add 8cb30551d58 UI: update ip ranges of shared networks (#7896)
add d87f39ad27f ui: make it clear that deletion of a volume will not
delete any snapshots (#7897)
add 594d212a8bc Merge branch '4.18'
add b37834fe759 ui: bump UI pkg version to match CloudStacks (#7894)
add 7cdf864c71d Merge release branch 4.18 to main
new d8998d08331 Merge branch 'main' of
https://github.com/apache/cloudstack into nsx-integration
new bb9b6441a23 update db
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/linter.yml | 19 --
.pre-commit-config.yaml | 31 ++-
README.md | 2 +-
.../main/java/com/cloud/hypervisor/Hypervisor.java | 18 +-
.../java/com/cloud/hypervisor/HypervisorGuru.java | 5 +
.../com/cloud/network/as/AutoScaleVmProfile.java | 4 +
api/src/main/java/com/cloud/storage/GuestOS.java | 2 +
.../java/org/apache/cloudstack/api/BaseCmd.java | 17 ++
.../api/command/admin/guest/AddGuestOsCmd.java | 8 +-
.../api/command/admin/guest/UpdateGuestOsCmd.java | 11 +-
.../admin/internallb/StopInternalLBVMCmd.java | 2 +-
.../api/command/admin/router/StopRouterCmd.java | 2 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 2 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 15 ++
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 17 ++
.../api/command/user/guest/ListGuestOsCmd.java | 14 +-
.../api/command/user/network/CreateNetworkCmd.java | 4 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 2 +-
.../command/user/template/RegisterTemplateCmd.java | 9 +-
.../api/command/user/vm/DeployVMCmd.java | 28 +--
.../api/command/user/vm/ResetVMUserDataCmd.java | 16 +-
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 15 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 3 +-
.../api/command/user/vm/UpdateVMCmd.java | 14 +-
.../api/command/user/vm/UpgradeVMCmd.java | 15 +-
.../api/command/user/volume/CreateVolumeCmd.java | 3 +-
.../api/command/user/volume/UploadVolumeCmd.java | 2 +-
.../api/response/AutoScaleVmProfileResponse.java | 48 ++++
.../cloudstack/api/response/BackupResponse.java | 10 +-
.../api/response/BackupRestorePointResponse.java | 10 +-
.../cloudstack/api/response/GuestOSResponse.java | 12 +
.../api/response/HostForMigrationResponse.java | 5 +-
.../cloudstack/api/response/HostResponse.java | 7 +-
.../response/HypervisorCapabilitiesResponse.java | 7 +-
.../cloudstack/api/response/UserVmResponse.java | 2 +-
.../api/response/VMSnapshotResponse.java | 7 +-
.../java/org/apache/cloudstack/backup/Backup.java | 14 +-
.../engine/orchestration/VolumeOrchestrator.java | 18 +-
.../dao/HypervisorCapabilitiesDaoImpl.java | 7 +
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 24 ++
.../com/cloud/storage/GuestOSHypervisorVO.java | 3 +-
.../src/main/java/com/cloud/storage/GuestOSVO.java | 14 ++
.../java/com/cloud/storage/dao/GuestOSDao.java | 11 +-
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 78 ++++++-
.../cloud/storage/dao/GuestOSHypervisorDao.java | 8 +-
.../storage/dao/GuestOSHypervisorDaoImpl.java | 8 +-
.../main/java/com/cloud/upgrade/GuestOsMapper.java | 126 +++++++++-
.../com/cloud/upgrade/dao/Upgrade41800to41810.java | 131 +++++++++++
.../com/cloud/upgrade/dao/Upgrade41810to41900.java | 111 +++++++++
.../org/apache/cloudstack/backup/BackupVO.java | 12 +-
.../resources/META-INF/db/schema-41720to41800.sql | 2 +
.../resources/META-INF/db/schema-41800to41810.sql | 11 +
.../resources/META-INF/db/schema-41810to41900.sql | 8 +-
.../cloud/network/as/AutoScaleVmProfileVOTest.java | 31 +++
.../src/test/resources/component.xml | 5 +
packaging/centos8/cloud.spec | 2 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 10 +-
.../NonStrictHostAntiAffinityProcessorTest.java | 4 +-
.../command/admin/ratelimit/ResetApiLimitCmd.java | 2 +-
.../cloudstack/backup/DummyBackupProvider.java | 2 +-
.../cloudstack/backup/NetworkerBackupProvider.java | 11 +-
.../backup/networker/NetworkerClient.java | 10 +-
.../cloudstack/backup/veeam/VeeamClient.java | 10 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 4 +-
.../cloud/hypervisor/guru/VmwareVmImplementer.java | 16 +-
.../hypervisor/vmware/resource/VmwareResource.java | 21 +-
.../hypervisor/guru/VmwareVmImplementerTest.java | 46 ++++
.../cloudstack/metrics/MetricsServiceImpl.java | 12 +-
.../cloudstack/response/HostMetricsResponse.java | 14 +-
.../src/main/resources/components-example.xml | 1 +
.../com/cloud/api/commands/StopNetScalerVMCmd.java | 2 +-
.../api/command/ListTungstenFabricTagCmd.java | 2 +-
.../util/ListElastistorVolumeResponse.java | 2 +-
.../api/response/LdapConfigurationResponse.java | 2 +-
.../api/response/LinkAccountToLdapResponse.java | 2 +-
.../api/response/LinkDomainToLdapResponse.java | 2 +-
.../java/com/cloud/api/ApiAsyncJobDispatcher.java | 6 +
server/src/main/java/com/cloud/api/ApiDBUtils.java | 5 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 28 ++-
server/src/main/java/com/cloud/api/ApiServer.java | 3 +
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 8 +-
.../com/cloud/api/query/ViewResponseHelper.java | 29 ++-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 2 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 10 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 4 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 4 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 12 +-
.../configuration/ConfigurationManagerImpl.java | 18 ++
.../com/cloud/hypervisor/HypervisorGuruBase.java | 5 +-
.../CustomServerDiscoverer.java} | 12 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 53 ++++-
.../network/security/SecurityGroupManagerImpl.java | 2 +-
.../security/SecurityGroupManagerImpl2.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 5 +-
.../com/cloud/server/ManagementServerImpl.java | 67 ++----
.../cloud/template/HypervisorTemplateAdapter.java | 16 +-
.../com/cloud/template/TemplateManagerImpl.java | 10 +-
.../java/com/cloud/user/AccountManagerImpl.java | 7 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 6 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 82 ++++++-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +-
.../spring-server-discoverer-context.xml | 5 +
.../java/com/cloud/api/ApiResponseHelperTest.java | 72 ++++++
.../cloud/network/as/AutoScaleManagerImplTest.java | 75 +++++-
.../com/cloud/user/AccountManagerImplTest.java | 13 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 29 ++-
.../src/test/java/common/ClientTest.java | 8 +-
.../org.mockito.plugins.MockMaker | 0
.../consoleproxy/ConsoleProxyNoVncClient.java | 12 +-
.../ConsoleProxyHttpHandlerHelperTest.java | 33 ++-
.../org.mockito.plugins.MockMaker | 0
.../resource/NfsSecondaryStorageResourceTest.java | 46 ++--
.../org.mockito.plugins.MockMaker | 0
test/integration/smoke/test_internal_lb.py | 7 +-
test/integration/smoke/test_vm_autoscaling.py | 69 ++++++
tools/apidoc/build-apidoc.sh | 8 +-
ui/package-lock.json | 2 +-
ui/package.json | 2 +-
ui/public/locales/en.json | 3 +-
ui/src/components/header/ProjectMenu.vue | 1 +
ui/src/components/view/ListResourceTable.vue | 5 +
ui/src/config/section/image.js | 2 +-
ui/src/config/section/infra/hosts.js | 4 +-
ui/src/store/getters.js | 3 +-
ui/src/store/modules/user.js | 27 ++-
ui/src/views/compute/AutoScaleVmProfile.vue | 92 ++++++--
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 257 +++++++++++++++++++--
ui/src/views/compute/ResetUserData.vue | 10 +-
ui/src/views/image/RegisterOrUploadIso.vue | 149 ++++++++++--
ui/src/views/image/RegisterOrUploadTemplate.vue | 178 ++++++++++++--
ui/src/views/image/TemplateZones.vue | 17 ++
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 7 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 5 +-
ui/src/views/network/CreateVlanIpRange.vue | 4 +-
ui/src/views/network/GuestIpRanges.vue | 129 +++++++++--
.../apache/cloudstack/utils/CloudStackVersion.java | 17 ++
.../cloudstack/utils/CloudStackVersionTest.java | 20 ++
139 files changed, 2400 insertions(+), 500 deletions(-)
copy
server/src/main/java/com/cloud/hypervisor/{kvm/discoverer/KvmServerDiscoverer.java
=> discoverer/CustomServerDiscoverer.java} (78%)
copy {agent =>
services/console-proxy/rdpconsole}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
services/console-proxy/server}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
services/secondary-storage/server}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
