This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from ef6c0c443d6 Prepend VPC name to VPC network tier name (#9780)
add a2d5aa997fc displaying info of the labels from form CreateSSHKeyPair
(#9970)
add dc0ebe985c4 Remove info about the environment from exception when
revert VM snapshot (#9944)
add 2c412f8947c Adjust misformatted logs (#9889)
add 5886780240b Change vmsnapshot.max config to be dynamic (#9883)
add 8f63660424a pom.xml: revert systemvm template version to 4.20.0.0
(#10004)
add 22a66044918 Routed mode: minor improvements and fixes (#9697)
add 34056d956ca Improvement: management server peer states (#9885)
add 8a1da3804c0 Resize volume: add pool capacity disablethreshold for
resize and allow volume auto migration (#9761)
add 58138f2da30 fix: remove double <form> element from 2FA form (#9851)
add d17de834a57 Disable API Key Access for users, accounts and domains
(#9741)
add f3a474bb9ef UI: make a newly added Network the default one (#9708)
(#10022)
add 52e7b41a54e Add support for functionality in hypervisor class (#9736)
add da94ae2c1c5 Merge remote-tracking branch 'apache/4.20'
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/bgp/BGPService.java | 5 +
api/src/main/java/com/cloud/event/EventTypes.java | 1 +
.../main/java/com/cloud/hypervisor/Hypervisor.java | 47 +-
.../cloud/server/ManagementServerHostStats.java | 2 +
api/src/main/java/com/cloud/user/Account.java | 4 +
.../main/java/com/cloud/user/AccountService.java | 5 +-
api/src/main/java/com/cloud/user/User.java | 5 +
.../org/apache/cloudstack/api/ApiConstants.java | 36 +
.../command/admin/account/UpdateAccountCmd.java | 15 +-
.../api/command/admin/management/ListMgmtsCmd.java | 10 +
.../api/command/admin/user/GetUserKeysCmd.java | 9 +-
.../api/command/admin/user/ListUsersCmd.java | 16 +-
.../api/command/admin/user/UpdateUserCmd.java | 8 +
.../api/command/user/account/ListAccountsCmd.java | 8 +
.../command/user/template/RegisterTemplateCmd.java | 4 +-
.../api/command/user/volume/ResizeVolumeCmd.java | 8 +
.../cloudstack/api/response/AccountResponse.java | 8 +
.../api/response/ManagementServerResponse.java | 21 +
.../response/PeerManagementServerNodeResponse.java | 100 ++
.../cloudstack/api/response/RegisterResponse.java | 13 +-
.../cloudstack/api/response/UserResponse.java | 8 +
.../cloudstack/api/response/ZoneResponse.java | 13 +
.../cloudstack/network/RoutedIpv4Manager.java | 9 +
.../org/apache/cloudstack/query/QueryService.java | 3 +-
.../java/com/cloud/capacity/CapacityManager.java | 12 +
.../java/com/cloud/storage/StorageManager.java | 5 +
.../com/cloud/vm/snapshot/VMSnapshotManager.java | 2 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 +
...e41600to41610.java => Upgrade42000to42010.java} | 19 +-
.../src/main/java/com/cloud/user/AccountVO.java | 13 +
.../src/main/java/com/cloud/user/UserVO.java | 12 +
.../java/com/cloud/user/dao/AccountDaoImpl.java | 30 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
...ex.sql => cloud.idempotent_add_foreign_key.sql} | 13 +-
.../resources/META-INF/db/schema-41910to42000.sql | 7 +
...cleanup.sql => schema-42000to42010-cleanup.sql} | 2 +-
...302to40-cleanup.sql => schema-42000to42010.sql} | 6 +-
.../META-INF/db/views/cloud.account_view.sql | 1 +
.../META-INF/db/views/cloud.mshost_peer_view.sql | 44 +
.../META-INF/db/views/cloud.user_view.sql | 1 +
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 2 +-
.../java/com/cloud/cluster/ClusterManager.java | 4 +-
.../java/com/cloud/cluster/ClusterManagerImpl.java | 98 +-
.../cluster/ManagementServerHostPeerJoinVO.java | 177 +++
.../cluster/dao/ManagementServerHostDaoImpl.java | 2 +-
.../cluster/dao/ManagementServerHostPeerDao.java | 9 +-
.../dao/ManagementServerHostPeerDaoImpl.java | 42 +-
...o.java => ManagementServerHostPeerJoinDao.java} | 9 +-
.../dao/ManagementServerHostPeerJoinDaoImpl.java | 23 +-
.../cloudstack/framework/config/ConfigKey.java | 1 +
.../apache/cloudstack/quota/QuotaManagerImpl.java | 2 +-
.../contrail/management/MockAccountManager.java | 4 +-
pom.xml | 2 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 6 +-
server/src/main/java/com/cloud/api/ApiServer.java | 33 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 79 +-
.../com/cloud/api/query/ViewResponseHelper.java | 6 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 3 +
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 3 +
.../cloud/api/query/dao/UserAccountJoinDao.java | 3 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 6 +-
.../java/com/cloud/api/query/vo/AccountJoinVO.java | 7 +
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 7 +
.../main/java/com/cloud/bgp/BGPServiceImpl.java | 59 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 3 +-
.../main/java/com/cloud/configuration/Config.java | 1 -
.../configuration/ConfigurationManagerImpl.java | 31 +-
.../deploy/DeploymentPlanningManagerImpl.java | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 13 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 13 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 21 +-
.../server/ManagementServerHostStatsEntry.java | 10 +
.../com/cloud/server/ManagementServerImpl.java | 11 -
.../main/java/com/cloud/server/StatsCollector.java | 24 +
.../java/com/cloud/storage/StorageManagerImpl.java | 25 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 68 +-
.../java/com/cloud/user/AccountManagerImpl.java | 60 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 36 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 11 +-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 75 +-
.../src/test/java/com/cloud/api/ApiServerTest.java | 29 +
.../com/cloud/api/query/QueryManagerImplTest.java | 94 ++
.../java/com/cloud/bgp/BGPServiceImplTest.java | 133 ++-
.../com/cloud/network/NetworkServiceImplTest.java | 91 +-
.../network/element/VirtualRouterElementTest.java | 56 +
.../network/router/CommandSetupHelperTest.java | 110 +-
.../VirtualNetworkApplianceManagerImplTest.java | 63 +
.../com/cloud/network/vpc/VpcManagerImplTest.java | 27 +
.../com/cloud/storage/StorageManagerImplTest.java | 79 ++
.../cloud/storage/VolumeApiServiceImplTest.java | 108 ++
.../com/cloud/user/AccountManagerImplTest.java | 45 +
.../com/cloud/user/MockAccountManagerImpl.java | 4 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 2 +-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 3 -
.../network/RoutedIpv4ManagerImplTest.java | 1217 ++++++++++++++++++++
ui/public/locales/en.json | 15 +-
ui/src/components/view/InfoCard.vue | 18 +-
ui/src/components/view/SearchView.vue | 13 +-
ui/src/config/section/account.js | 21 +-
ui/src/config/section/infra/managementServers.js | 4 +
ui/src/config/section/infra/zones.js | 9 +-
ui/src/config/section/network.js | 15 +-
ui/src/config/section/user.js | 7 +
ui/src/views/compute/CreateSSHKeyPair.vue | 25 +-
ui/src/views/dashboard/VerifyTwoFa.vue | 66 +-
ui/src/views/iam/EditAccount.vue | 190 +++
ui/src/views/iam/EditUser.vue | 18 +-
...syncJobsTab.vue => ManagementServerPeerTab.vue} | 63 +-
.../views/network/CreateIpv4SubnetForNetwork.vue | 1 +
ui/src/views/network/CreateIsolatedNetworkForm.vue | 5 +-
ui/src/views/network/CreateVpc.vue | 4 +
ui/src/views/offering/AddNetworkOffering.vue | 13 +
ui/src/views/offering/AddVpcOffering.vue | 13 +
ui/src/views/storage/ResizeVolume.vue | 13 +
114 files changed, 3733 insertions(+), 360 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/PeerManagementServerNodeResponse.java
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41600to41610.java =>
Upgrade42000to42010.java} (87%)
copy
engine/schema/src/main/resources/META-INF/db/procedures/{cloud.idempotent_create_unique_index.sql
=> cloud.idempotent_add_foreign_key.sql} (64%)
copy
engine/schema/src/main/resources/META-INF/db/{schema-41510to41520-cleanup.sql
=> schema-42000to42010-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-302to40-cleanup.sql
=> schema-42000to42010.sql} (66%)
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.mshost_peer_view.sql
create mode 100644
framework/cluster/src/main/java/com/cloud/cluster/ManagementServerHostPeerJoinVO.java
copy
framework/cluster/src/main/java/com/cloud/cluster/dao/{ManagementServerStatusDao.java
=> ManagementServerHostPeerJoinDao.java} (76%)
copy engine/schema/src/main/java/com/cloud/network/dao/SslCertDaoImpl.java =>
framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerJoinDaoImpl.java
(55%)
create mode 100644
server/src/test/java/org/apache/cloudstack/network/RoutedIpv4ManagerImplTest.java
create mode 100644 ui/src/views/iam/EditAccount.vue
copy ui/src/views/infra/{AsyncJobsTab.vue => ManagementServerPeerTab.vue} (52%)
