This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch healthcheck-4.20 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit 7da03d11141 dummy commit , please don't merge 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 c56fc7f81c7 fix section divider display on auth page (#9966) add a73841a693c get expunged VM data for job result (#9949) add d54b105a037 Linstor: add support for ISO block devices and direct download (#9792) add 37eec061669 Allow VMWare import via another host (#9787) add a8cb7abca36 Add new column `last_id` to the table volumes (#9759) add 4189bac8e0d enable to create VPC portfowarding rules with source cidr (#7081) add b6937b6a51a UI: Allow accounts of the `User` type to add other accounts or users to projects through UI (#9927) add 7cfeab1a6b1 UI: Tooltip on the host information card to display the CPU speed in MHz and the memory value in MB (to 3 decimal places) (#9971) add da542345855 Merge branch '4.19' into 4.20.merge add 666efc4b974 Simplify validation for creating volume templates via UI (#9828) add b3dc402aa8f engine/schema: move SQLs to 4.20.0 to 4.20.1 upgrade (#10018) add ef1a58d8370 Remove user from project before deletion (#10008) add a2ea719bced cloudstack-migrate-databases: sql AND added (#10033) add 52584d93dc7 Prevent password updates for SAML and LDAP users (#9999) add 5ee61c226a3 Merge branch '4.19' into 4.20 add 9960e400309 UI: Fix userdata and load balancer selection (#10016) add 762d5493ddc move sql code to the right file (#10035) add 8b9db0869f3 Merge release branch 4.19 to 4.20 add 0eb94a13962 move upgrade code to the right file (#10036) add 4c801e24f44 Fix Create dropdown menu not changing language (#10023) add 810c4108c7b engine/schema: Add access modifier to `VolumeVO` (#9394) add 47f60190a92 .github: fix test_certauthority_root in 4.19 (#10037) add 971a5b25ec3 Remove SNI option that is correct as default in _run.sh (#10028) add 9231c1c6ba9 Merge remote-tracking branch 'origin/4.19' into 4.20 add e57a82a4f52 UI: Fixes in the Usage UI (#10000) add 992bb03c9b6 dummy commit , please don't merge 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 (7da03d11141) \ N -- N -- N refs/heads/healthcheck-4.20 (992bb03c9b6) 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: .../cloud/agent/api/to/PortForwardingRuleTO.java | 13 + 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 +- .../java/com/cloud/network/rules/RulesService.java | 5 +- .../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 | 38 + .../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/admin/vm/ImportVmCmd.java | 12 +- .../api/command/user/account/ListAccountsCmd.java | 8 + .../user/firewall/CreatePortForwardingRuleCmd.java | 22 +- .../user/firewall/UpdatePortForwardingRuleCmd.java | 15 +- .../loadbalancer/CreateLoadBalancerRuleCmd.java | 2 +- .../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 +- .../com/cloud/agent/api/ConvertInstanceAnswer.java | 11 + ...wer.java => ImportConvertedInstanceAnswer.java} | 8 +- .../agent/api/ImportConvertedInstanceCommand.java | 63 + .../facade/SetPortForwardingRulesConfigItem.java | 2 +- .../virtualnetwork/model/ForwardingRule.java | 9 +- .../java/com/cloud/capacity/CapacityManager.java | 12 + .../java/com/cloud/storage/StorageManager.java | 5 + .../com/cloud/vm/snapshot/VMSnapshotManager.java | 2 +- .../cloud/network/dao/FirewallRulesCidrsDao.java | 2 + .../network/dao/FirewallRulesCidrsDaoImpl.java | 21 +- .../cloud/network/dao/FirewallRulesDaoImpl.java | 3 - .../cloud/network/rules/PortForwardingRuleVO.java | 29 +- .../rules/dao/PortForwardingRulesDaoImpl.java | 44 +- .../com/cloud/projects/dao/ProjectAccountDao.java | 2 + .../cloud/projects/dao/ProjectAccountDaoImpl.java | 11 + .../src/main/java/com/cloud/storage/VolumeVO.java | 69 +- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 + .../com/cloud/upgrade/dao/Upgrade41910to41920.java | 66 ++ .../com/cloud/upgrade/dao/Upgrade42000to42010.java | 83 ++ .../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 + .../cloud.idempotent_add_foreign_key.sql | 28 + .../META-INF/db/schema-41910to41920-cleanup.sql | 23 + .../resources/META-INF/db/schema-41910to41920.sql | 23 + .../META-INF/db/schema-42000to42010-cleanup.sql | 20 + .../resources/META-INF/db/schema-42000to42010.sql | 34 + .../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 + .../motion/StorageSystemDataMotionStrategy.java | 2 + .../vmsnapshot/DefaultVMSnapshotStrategy.java | 2 +- .../storage/volume/VolumeServiceImpl.java | 1 + .../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 +- .../dao/ManagementServerHostPeerJoinDao.java | 15 +- .../dao/ManagementServerHostPeerJoinDaoImpl.java | 42 + .../cloudstack/framework/config/ConfigKey.java | 1 + .../utils/crypt/EncryptionSecretKeyChanger.java | 2 +- .../apache/cloudstack/quota/QuotaManagerImpl.java | 2 +- .../kvm/resource/LibvirtComputingResource.java | 31 +- .../kvm/resource/LibvirtDomainXMLParser.java | 24 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 24 +- .../LibvirtConvertInstanceCommandWrapper.java | 27 +- ...virtImportConvertedInstanceCommandWrapper.java} | 164 +-- .../kvm/storage/KVMStorageProcessor.java | 5 +- .../kvm/storage/LibvirtStorageAdaptor.java | 6 +- .../LibvirtConvertInstanceCommandWrapperTest.java | 47 - ...ImportConvertedInstanceCommandWrapperTest.java} | 115 +- ...ernetesClusterResourceModifierActionWorker.java | 2 +- .../contrail/management/MockAccountManager.java | 4 +- plugins/storage/volume/linstor/CHANGELOG.md | 6 + .../kvm/storage/LinstorStorageAdaptor.java | 59 +- 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 +- .../network/firewall/FirewallManagerImpl.java | 78 +- .../cloud/network/router/CommandSetupHelper.java | 2 + .../router/VirtualNetworkApplianceManagerImpl.java | 13 +- .../com/cloud/network/rules/RulesManagerImpl.java | 52 +- .../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 | 70 +- .../java/com/cloud/user/AccountManagerImpl.java | 68 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 36 +- .../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 11 +- .../cloudstack/network/RoutedIpv4ManagerImpl.java | 75 +- .../cloudstack/vm/UnmanagedVMsManagerImpl.java | 163 ++- .../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 | 92 +- .../network/element/VirtualRouterElementTest.java | 56 + .../network/firewall/FirewallManagerTest.java | 132 ++- .../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 | 75 ++ .../com/cloud/user/MockAccountManagerImpl.java | 4 +- .../java/com/cloud/vm/UserVmManagerImplTest.java | 2 +- .../cloud/vm/snapshot/VMSnapshotManagerTest.java | 3 - .../network/RoutedIpv4ManagerImplTest.java | 1217 ++++++++++++++++++++ .../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 293 ++++- systemvm/agent/scripts/_run.sh | 2 +- systemvm/debian/opt/cloud/bin/configure.py | 10 +- systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 2 +- .../debian/opt/cloud/bin/cs_forwardingrules.py | 22 +- ui/public/locales/en.json | 26 +- ui/public/locales/pt_BR.json | 6 +- ui/src/components/header/CreateMenu.vue | 32 +- ui/src/components/view/InfoCard.vue | 38 +- ui/src/components/view/ListView.vue | 2 +- 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/storage.js | 4 +- ui/src/config/section/user.js | 7 + ui/src/views/auth/Login.vue | 2 +- ui/src/views/compute/CreateSSHKeyPair.vue | 25 +- ui/src/views/compute/DeployVM.vue | 12 +- .../views/compute/wizard/LoadBalancerSelection.vue | 9 + ui/src/views/compute/wizard/UserDataSelection.vue | 10 +- ui/src/views/dashboard/VerifyTwoFa.vue | 66 +- ui/src/views/iam/EditAccount.vue | 190 +++ ui/src/views/iam/EditUser.vue | 18 +- ui/src/views/infra/ManagementServerPeerTab.vue | 111 ++ ui/src/views/infra/UsageRecords.vue | 21 +- .../views/network/CreateIpv4SubnetForNetwork.vue | 1 + ui/src/views/network/CreateIsolatedNetworkForm.vue | 5 +- ui/src/views/network/CreateVpc.vue | 4 + ui/src/views/network/LoadBalancing.vue | 6 +- ui/src/views/network/NicsTab.vue | 32 +- ui/src/views/network/PortForwarding.vue | 27 +- ui/src/views/offering/AddNetworkOffering.vue | 13 + ui/src/views/offering/AddVpcOffering.vue | 13 + ui/src/views/project/AddAccountOrUserToProject.vue | 95 +- ui/src/views/storage/ResizeVolume.vue | 13 + ui/src/views/tools/ImportUnmanagedInstance.vue | 59 +- ui/src/views/tools/ManageInstances.vue | 3 +- 175 files changed, 5495 insertions(+), 909 deletions(-) create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/PeerManagementServerNodeResponse.java copy core/src/main/java/com/cloud/agent/api/{ConvertInstanceAnswer.java => ImportConvertedInstanceAnswer.java} (80%) create mode 100644 core/src/main/java/com/cloud/agent/api/ImportConvertedInstanceCommand.java create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41910to41920.java create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42000to42010.java create mode 100644 engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_add_foreign_key.sql create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41910to41920-cleanup.sql create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42000to42010-cleanup.sql create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql 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 engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsDao.java => framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerJoinDao.java (71%) create mode 100644 framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerJoinDaoImpl.java copy plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtConvertInstanceCommandWrapper.java => LibvirtImportConvertedInstanceCommandWrapper.java} (64%) copy plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtConvertInstanceCommandWrapperTest.java => LibvirtImportConvertedInstanceCommandWrapperTest.java} (69%) create mode 100644 server/src/test/java/org/apache/cloudstack/network/RoutedIpv4ManagerImplTest.java create mode 100644 ui/src/views/iam/EditAccount.vue create mode 100644 ui/src/views/infra/ManagementServerPeerTab.vue