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 3cba37dac7e Increase code coverage (#54) add d9774a8462b Updating pom.xml version numbers for release 4.21.0.0-SNAPSHOT add 26095e28ded Add support for telugu language (#9956) add 528fca2f179 Added-cpu-core-and-memory-range-fot-type-offers-CustomConstrained (#9930) add db2e89a3a2c UI: make a newly added Network the default one (#9708) add 546ef31aedb UI: Add UI support for `forvpc` and `guestiptype` parameters of the `listNetworkOfferings` API (#9947) add ef6c0c443d6 Prepend VPC name to VPC network tier name (#9780) add da94ae2c1c5 Merge remote-tracking branch 'apache/4.20' add 9b6f9b5f7d8 Merge release branch 4.20 to main add 4ac4d9cf29a API to validate Quota activation rule (#9605) add 205ebfb8b5d Merge release branch 4.20 to main add 97f9e8e8163 Merge release branch 4.20 to main add 27d2de180ff Merge release branch 4.20 to main add cb530c1749d Merge remote-tracking branch 'origin/4.20' add c94d0abab49 Merge remote-tracking branch 'origin/4.20' add f75a194c095 Persist IP addresses related to VM access via CPVM (#9534) add 91ab67c9522 Add logs to VMware instance configuration process (#9080) add 54bc1501402 fix typo in SnapshotManager.java (#10104) add 73c3339bf15 List users by their authentication source (#10115) add 9295a1624df Merge release branch 4.20 to main add b1ba9bf626d text in echo change in git-pr add ee893d12027 Clean up Python code; Python `2` to `3` (#8993) add 0b2952ca43f Merge release branch 4.20 to main add 631bba279b1 README: it's that time of the year! (#10125) add 6a2c7b02201 pre-commit: enable markdownlint rule `MD012` (#9364) add b48de4e0234 pre-commit: enable `markdownlint` rule `MD018` (#9134) add 2daffa34f22 Merge release branch 4.20 to main add 57867dc6b03 pre-commit: add hook `check-yaml` (#9133) add 0b66f5a86a7 pre-commit: remove trailing-whitespace from more file types (#10131) add 0128046429f pre-commit update markdownlint; enable rules MD009,MD019; fix license header (#10145) add fd24509ba7e pre-commit: fix `.cs` files with the `trailing-whitespace` hook (#9794) add 2b070880c10 pre-commit check `.cfg` files with the trailing whitespace hook (#10151) add 0f3ea8ceb2e Add pre-commit hook `fix-byte-order-marker` (#10147) add 5bae1188ff6 pre-commit fix mixed line endings in XML files (#10148) add 30b2588c062 Merge release branch 4.20 to main add d1cf45365a6 Revert "pre-commit: add hook `check-yaml` (#9133)" (#10161) add fadb39ece73 Merge release branch 4.20 to main add bd874eaa44e Merge release branch 4.20 to main add baad8ddc914 network: Add BGP+EVPN+VXLAN script to main repository and Agent package (#9778) add 0c13ded943c Merge release branch 4.20 to main add 449d3c7cb1d Create API to list Quota credits (#9590) add 0ed6895db4f feature and bug templates (#10186) add ecd60a4e461 Merge release branch 4.20 to main add 1c626c884c6 Update bug.yml add 81e052cfebf Merge release branch 4.20 to main add 98f56639541 Merge branch '4.20' add 789e2699406 Add lucas-a-martins as a project collaborator (#10283) add 048649d3515 Merge release branch 4.20 to main add 3b108b968f0 Support for Management Server Maintenance Mode (#9854) add 398ffc3b2c7 Add preset variable account created (#10200) add 5df15a7aa62 KVM/s390x Support: Add support for KVM on s390x architecture (#10038) add 4cf6fc95f22 Revert Holiday season Apache logo (#10302) add 7abda3b9639 Merge remote-tracking branch 'apache/4.20' add 2654890e868 Merge branch '4.20' add cd81398cb71 removing inactive collaborators from .asf.yaml (#10298) add 22c71928dd2 Change debian packages maintainer (#10321) add 2ef16132ee9 Merge remote-tracking branch 'origin/4.20' add 648170cf9bb Fix lint error coming up in main (#10342) add a7beaaf73b8 Add Resource Limits to Backups and Object Storage (#10017) add 0a92cc03496 UI: Add VM state to Volume list view (#10341) add 0dcb8da03a2 Merge branch '4.20' add f8563b86e7d Fix NPE during kubernetes cluster creation when network has rules with ports saved as null on DB (#9223) add 2a4a1f73d04 Support multi-scope configuration settings (#10300) add a093f00ab52 Add IOPS and bytes preset variables to `VOLUME` usage type (#10326) add 617fee84165 Add `offerHa` and `forceHa` preset variables to `RUNNING_VM` usage type (#9500) add 864751d5f99 Fix ordering of secondary storages with the algorithm `firstfitleastconsumed` (#8557) add a8b18a53942 Add nicoschmdt as a project collaborator (#10422) add 24b7c662519 Merge branch '4.20' add 48f890a6931 resolve merge problems in the backup framework (#10457) add e8ac477e9f8 engine/orchestration: fix missing vm powerstate update vm state (#10407) add 37c4df9ada1 fix: enforce the cpu shares within allowed range (#10221) add 4e321d43565 Updating pom.xml version numbers for release 4.19.2.0 add 4a3686297dc Updating pom.xml version numbers for release 4.19.3.0-SNAPSHOT add 5526ef0168c spurious versions add 91db905659d Merge commit '5526ef0168c' into 4.20 add 1f092667641 UI: Fix filtering of templates by account (#10425) add a09c579b5b2 UI: Fixes and minor enhacements to the Public IP Addresses section (#10351) add f992ebb52a5 fix volume migration across cluster-scope pools (#10266) add 88916dcf2bb Merge branch '4.19' into 4.20 add 3a28a87483e Merge branch '4.20' of https://github.com/apache/cloudstack add 2d00933d65e systemvmtemplate: bump version Debian 12.9.0 and ACS 4.20.1 (#10462) add 69cf299c62a Merge remote-tracking branch 'origin/4.20' add 06f7c310186 Merge branch 'main' of https://github.com/apache/cloudstack into netris-integration-upstream No new revisions were added by this update. Summary of changes: .asf.yaml | 6 +- .../cloud-ssh.in => .github/ISSUE_TEMPLATE/bug.yml | 33 +- .../ISSUE_TEMPLATE/feature_request.yaml | 12 +- .github/linters/.markdown-lint.yml | 12 - .gitignore | 4 +- .pre-commit-config.yaml | 8 +- CHANGES.md | 6 - CONTRIBUTING.md | 7 +- ISSUE_TEMPLATE.md | 3 - PULL_REQUEST_TEMPLATE.md | 3 - agent/conf/agent.properties | 2 +- agent/pom.xml | 2 +- agent/src/main/java/com/cloud/agent/Agent.java | 142 +- .../src/main/java/com/cloud/agent/AgentShell.java | 9 + .../src/main/java/com/cloud/agent/IAgentShell.java | 4 + .../cloud/agent/properties/AgentProperties.java | 2 +- .../consoleproxy/ConsoleProxyResource.java | 5 +- api/pom.xml | 2 +- .../java/com/cloud/configuration/Resource.java | 12 +- api/src/main/java/com/cloud/event/EventTypes.java | 3 + api/src/main/java/com/cloud/host/Host.java | 2 + api/src/main/java/com/cloud/host/Status.java | 1 + .../java/com/cloud/resource/ResourceService.java | 8 +- .../cloud/server/ManagementServerHostStats.java | 5 + .../java/com/cloud/storage/MigrationOptions.java | 11 +- .../java/com/cloud/storage/VolumeApiService.java | 2 + .../org/apache/cloudstack/api/ApiConstants.java | 42 +- ...nanceCmd.java => CancelHostMaintenanceCmd.java} | 2 +- .../api/command/admin/host/ListHostsCmd.java | 8 + ...eCmd.java => PrepareForHostMaintenanceCmd.java} | 2 +- .../api/command/admin/user/ListUsersCmd.java | 24 + .../api/command/user/backup/CreateBackupCmd.java | 19 +- .../user/backup/CreateBackupScheduleCmd.java | 10 + .../api/command/user/bucket/CreateBucketCmd.java | 2 +- .../api/command/user/bucket/UpdateBucketCmd.java | 2 +- .../cloudstack/api/response/AccountResponse.java | 108 + .../cloudstack/api/response/AsyncJobResponse.java | 16 +- .../api/response/BackupScheduleResponse.java | 14 +- .../cloudstack/api/response/BucketResponse.java | 2 +- .../cloudstack/api/response/DomainResponse.java | 108 + .../cloudstack/api/response/HostResponse.java | 26 +- .../cloudstack/api/response/LoginCmdResponse.java | 12 + .../api/response/ManagementServerResponse.java | 24 + .../cloudstack/api/response/ProjectResponse.java | 108 + .../response/ResourceLimitAndCountResponse.java | 24 + .../cloudstack/api/response/UserResponse.java | 2 +- .../java/org/apache/cloudstack/backup/Backup.java | 22 + .../apache/cloudstack/backup/BackupManager.java | 84 +- .../apache/cloudstack/backup/BackupProvider.java | 44 +- .../apache/cloudstack/backup/BackupSchedule.java | 1 + .../consoleproxy/ConsoleAccessManager.java | 2 +- .../management/ManagementServerHost.java | 2 +- .../storage/object/BucketApiService.java | 51 +- client/pom.xml | 4 +- core/pom.xml | 2 +- .../api/ConsoleAccessAuthenticationCommand.java | 12 +- ...swer.java => MigrateAgentConnectionAnswer.java} | 18 +- .../agent/api/MigrateAgentConnectionCommand.java} | 19 +- .../java/com/cloud/agent/api/StartupCommand.java | 9 + .../com/cloud/agent/api/TransferAgentCommand.java | 10 + .../java/com/cloud/resource/ServerResource.java | 4 + .../api/agent/test/CheckOnHostCommandTest.java | 5 + debian/changelog | 8 +- debian/cloudstack-cli.install | 4 +- debian/cloudstack-docs.install | 4 +- debian/control | 2 +- developer/pom.xml | 2 +- engine/api/pom.xml | 2 +- engine/components-api/pom.xml | 2 +- .../main/java/com/cloud/agent/AgentManager.java | 7 + .../java/com/cloud/capacity/CapacityManager.java | 8 +- .../java/com/cloud/network/vpc/VpcManager.java | 18 + .../java/com/cloud/resource/ResourceManager.java | 2 + .../java/com/cloud/storage/StorageManager.java | 2 +- engine/orchestration/pom.xml | 4 +- .../com/cloud/agent/manager/AgentManagerImpl.java | 282 +- .../agent/manager/ClusteredAgentManagerImpl.java | 303 +- .../cluster/ClusteredAgentRebalanceService.java | 1 + .../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 10 +- .../datacenter/entity/api/db/EngineHostVO.java | 12 + .../engine/orchestration/NetworkOrchestrator.java | 2 +- .../vm/VirtualMachinePowerStateSyncImplTest.java | 107 + engine/pom.xml | 2 +- engine/schema/pom.xml | 2 +- .../java/com/cloud/dc/ClusterDetailsDaoImpl.java | 17 + .../main/java/com/cloud/domain/dao/DomainDao.java | 2 + .../java/com/cloud/domain/dao/DomainDaoImpl.java | 10 + .../src/main/java/com/cloud/host/HostVO.java | 12 + .../src/main/java/com/cloud/host/dao/HostDao.java | 15 +- .../main/java/com/cloud/host/dao/HostDaoImpl.java | 48 +- .../com/cloud/network/dao/FirewallRulesDao.java | 4 +- .../cloud/network/dao/FirewallRulesDaoImpl.java | 21 +- .../main/java/com/cloud/storage/dao/BucketDao.java | 4 + .../java/com/cloud/storage/dao/BucketDaoImpl.java | 35 + .../storage/dao/StoragePoolDetailsDaoImpl.java | 15 + .../upgrade/ConfigurationGroupsAggregator.java | 2 +- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 + .../cloud/upgrade/dao/DatabaseAccessObject.java | 30 + .../java/com/cloud/upgrade/dao/DbUpgradeUtils.java | 16 + ...e41910to42000.java => Upgrade42010to42100.java} | 75 +- .../java/com/cloud/user/AccountDetailsDaoImpl.java | 10 + .../main/java/com/cloud/vm/ConsoleSessionVO.java | 22 + .../java/com/cloud/vm/dao/ConsoleSessionDao.java | 2 +- .../com/cloud/vm/dao/ConsoleSessionDaoImpl.java | 3 +- .../apache/cloudstack/backup/BackupScheduleVO.java | 14 +- .../org/apache/cloudstack/backup/BackupVO.java | 11 + .../apache/cloudstack/backup/dao/BackupDao.java | 5 + .../cloudstack/backup/dao/BackupDaoImpl.java | 50 + .../backup/dao/BackupScheduleDaoImpl.java | 1 + .../datastore/db/ImageStoreDetailsDaoImpl.java | 19 +- ...cleanup.sql => schema-42010to42100-cleanup.sql} | 2 +- .../resources/META-INF/db/schema-42010to42100.sql | 39 + .../META-INF/db/views/cloud.account_view.sql | 32 + .../META-INF/db/views/cloud.domain_view.sql | 36 +- .../upgrade/ConfigurationGroupsAggregatorTest.java | 76 + .../upgrade/dao/DatabaseAccessObjectTest.java | 53 + .../com/cloud/upgrade/dao/DbUpgradeUtilsTest.java | 29 + .../cloud/upgrade/dao/Upgrade42010to42100Test.java | 73 + engine/service/pom.xml | 2 +- engine/service/src/main/webapp/WEB-INF/beans.xml | 106 +- engine/service/src/main/webapp/WEB-INF/web.xml | 54 +- engine/storage/cache/pom.xml | 2 +- engine/storage/configdrive/pom.xml | 2 +- engine/storage/datamotion/pom.xml | 2 +- .../KvmNonManagedStorageDataMotionStrategy.java | 2 +- .../motion/StorageSystemDataMotionStrategy.java | 20 +- engine/storage/image/pom.xml | 2 +- .../manager/ImageStoreProviderManagerImpl.java | 49 +- .../manager/ImageStoreProviderManagerImplTest.java | 63 + engine/storage/integration-test/pom.xml | 2 +- engine/storage/object/pom.xml | 2 +- engine/storage/pom.xml | 2 +- engine/storage/snapshot/pom.xml | 2 +- engine/storage/volume/pom.xml | 2 +- engine/userdata/cloud-init/pom.xml | 2 +- engine/userdata/pom.xml | 2 +- framework/agent-lb/pom.xml | 2 +- .../cloudstack/agent/lb/IndirectAgentLB.java | 22 + framework/ca/pom.xml | 2 +- framework/cluster/pom.xml | 2 +- .../java/com/cloud/cluster/ClusterManagerImpl.java | 24 +- .../cloud/cluster/dao/ManagementServerHostDao.java | 6 +- .../cluster/dao/ManagementServerHostDaoImpl.java | 42 +- .../cluster/dao/ManagementServerHostPeerDao.java | 3 + .../dao/ManagementServerHostPeerDaoImpl.java | 33 + framework/config/pom.xml | 2 +- .../apache/cloudstack/config/Configuration.java | 7 +- .../cloudstack/framework/config/ConfigDepot.java | 3 + .../cloudstack/framework/config/ConfigKey.java | 165 +- .../framework/config/ScopedConfigStorage.java | 5 + .../framework/config/dao/ConfigurationDao.java | 3 + .../framework/config/dao/ConfigurationDaoImpl.java | 11 + .../framework/config/impl/ConfigDepotImpl.java | 62 +- .../framework/config/impl/ConfigurationVO.java | 15 +- .../cloudstack/framework/config/ConfigKeyTest.java | 29 + .../framework/config/impl/ConfigDepotImplTest.java | 80 + framework/db/pom.xml | 2 +- .../main/java/com/cloud/utils/db/SearchBase.java | 3 + .../java/com/cloud/utils/db/SearchCriteria.java | 2 +- framework/direct-download/pom.xml | 2 +- framework/events/pom.xml | 2 +- framework/ipc/pom.xml | 2 +- framework/jobs/pom.xml | 2 +- .../framework/jobs/impl/AsyncJobManagerImpl.java | 55 +- framework/managed-context/pom.xml | 2 +- framework/pom.xml | 2 +- framework/quota/pom.xml | 2 +- .../apache/cloudstack/quota/QuotaManagerImpl.java | 6 + .../activationrule/presetvariables/Account.java | 16 + .../presetvariables/ComputeOffering.java | 14 + .../{ComputeOffering.java => Configuration.java} | 20 +- .../DiskOfferingPresetVariables.java | 165 + .../presetvariables/PresetVariableHelper.java | 69 +- .../presetvariables/PresetVariables.java | 24 + .../activationrule/presetvariables/Value.java | 20 +- .../cloudstack/quota/constant/QuotaTypes.java | 16 + .../cloudstack/quota/dao/QuotaCreditsDao.java | 2 +- .../cloudstack/quota/dao/QuotaCreditsDaoImpl.java | 54 +- .../apache/cloudstack/quota/vo/QuotaCreditsVO.java | 6 + .../cloudstack/quota/QuotaManagerImplTest.java | 1 + .../presetvariables/PresetVariableHelperTest.java | 94 +- framework/rest/pom.xml | 2 +- framework/security/pom.xml | 2 +- framework/spring/lifecycle/pom.xml | 2 +- framework/spring/module/pom.xml | 2 +- plugins/acl/dynamic-role-based/pom.xml | 2 +- plugins/acl/project-role-based/pom.xml | 2 +- plugins/acl/static-role-based/pom.xml | 2 +- .../explicit-dedication/pom.xml | 2 +- .../host-affinity/pom.xml | 2 +- .../host-anti-affinity/pom.xml | 2 +- .../non-strict-host-affinity/pom.xml | 2 +- .../non-strict-host-anti-affinity/pom.xml | 2 +- plugins/alert-handlers/snmp-alerts/pom.xml | 2 +- plugins/alert-handlers/syslog-alerts/pom.xml | 2 +- plugins/api/discovery/pom.xml | 2 +- plugins/api/rate-limit/pom.xml | 2 +- plugins/api/solidfire-intg-test/pom.xml | 2 +- plugins/api/vmware-sioc/pom.xml | 2 +- plugins/backup/dummy/pom.xml | 2 +- .../cloudstack/backup/DummyBackupProvider.java | 28 +- plugins/backup/nas/pom.xml | 2 +- .../cloudstack/backup/NASBackupProvider.java | 50 +- plugins/backup/networker/pom.xml | 2 +- .../cloudstack/backup/NetworkerBackupProvider.java | 175 +- plugins/backup/veeam/pom.xml | 2 +- .../cloudstack/backup/VeeamBackupProvider.java | 104 +- .../cloudstack/backup/veeam/VeeamClient.java | 4 +- plugins/ca/root-ca/pom.xml | 2 +- plugins/database/mysql-ha/pom.xml | 2 +- plugins/database/quota/pom.xml | 2 +- .../api/command/QuotaCreditsListCmd.java | 122 + ...md.java => QuotaValidateActivationRuleCmd.java} | 40 +- .../api/response/QuotaBalanceResponse.java | 4 +- .../api/response/QuotaCreditsResponse.java | 63 +- .../api/response/QuotaResponseBuilder.java | 6 + .../api/response/QuotaResponseBuilderImpl.java | 215 +- .../QuotaValidateActivationRuleResponse.java | 76 + .../apache/cloudstack/quota/QuotaServiceImpl.java | 4 + .../api/command/QuotaCreditsListCmdTest.java | 79 + .../QuotaValidateActivationRuleCmdTest.java | 26 +- .../api/response/QuotaResponseBuilderImplTest.java | 253 +- plugins/dedicated-resources/pom.xml | 2 +- .../implicit-dedication/pom.xml | 2 +- .../user-concentrated-pod/pom.xml | 2 +- .../deployment-planners/user-dispersing/pom.xml | 2 +- plugins/drs/cluster/balanced/pom.xml | 2 +- plugins/drs/cluster/condensed/pom.xml | 2 +- plugins/event-bus/inmemory/pom.xml | 2 +- plugins/event-bus/kafka/pom.xml | 2 +- plugins/event-bus/rabbitmq/pom.xml | 2 +- plugins/event-bus/webhook/pom.xml | 2 +- plugins/ha-planners/skip-heurestics/pom.xml | 2 +- plugins/host-allocators/random/pom.xml | 2 +- plugins/hypervisors/baremetal/pom.xml | 102 +- .../DotNet/ServerResource/.nuget/NuGet.Config | 2 +- .../AgentShell/AgentService.Designer.cs | 8 +- .../ServerResource/AgentShell/AgentService.cs | 2 +- .../AgentShell/AgentSettings.Designer.cs | 76 +- .../AgentShell/AgentSettings.settings | 2 +- .../ServerResource/AgentShell/AgentShell.csproj | 2 +- .../AgentShell/AgentShellException.cs | 2 +- .../DotNet/ServerResource/AgentShell/App.config | 2 +- .../DotNet/ServerResource/AgentShell/Program.cs | 2 +- .../AgentShell/ProjectInstaller.Designer.cs | 4 +- .../ServerResource/AgentShell/ProjectInstaller.cs | 2 +- .../AgentShell/Properties/AssemblyInfo.cs | 12 +- .../ServerResource/AgentShell/packages.config | 2 +- .../ServerResource/HypervResource/App.config | 2 +- .../HypervResource/CloudStackTypes.cs | 24 +- .../HypervResource/HypervResource.csproj | 2 +- .../HypervResource/HypervResourceController.cs | 10 +- .../ServerResource/HypervResource/IWmiCallsV2.cs | 2 +- .../HypervResource/Properties/AssemblyInfo.cs | 12 +- .../ServerResource/HypervResource/WmiCallsV2.cs | 146 +- .../ServerResource/HypervResource/packages.config | 2 +- .../ServerResource/ServerResource.Tests/App.config | 2 +- .../HypervResourceController1Test.cs | 18 +- .../HypervResourceControllerTest.cs | 12 +- .../Properties/AssemblyInfo.cs | 12 +- .../ServerResource.Tests.csproj | 2 +- .../ServerResource.Tests/packages.config | 2 +- .../DotNet/ServerResource/ServerResource.sln | 2 +- .../WmiWrappers/Properties/AssemblyInfo.cs | 12 +- .../ROOT.CIMV2.Win32_OperatingSystem.cs | 712 +- .../WmiWrappers/ROOT.CIMV2.Win32_Processor.cs | 920 +- .../ROOT.virtualization.v2.Msvm_ComputerSystem.cs | 482 +- .../ROOT.virtualization.v2.Msvm_ConcreteJob.cs | 422 +- ...on.v2.Msvm_EthernetPortAllocationSettingData.cs | 324 +- ...OT.virtualization.v2.Msvm_EthernetSwitchPort.cs | 486 +- ....Msvm_EthernetSwitchPortBandwidthSettingData.cs | 262 +- ...on.v2.Msvm_EthernetSwitchPortVlanSettingData.cs | 318 +- ....virtualization.v2.Msvm_ExternalEthernetPort.cs | 480 +- ...irtualization.v2.Msvm_ImageManagementService.cs | 350 +- ....virtualization.v2.Msvm_KvpExchangeComponent.cs | 388 +- ...tion.v2.Msvm_KvpExchangeComponentSettingData.cs | 286 +- ...T.virtualization.v2.Msvm_KvpExchangeDataItem.cs | 208 +- .../ROOT.virtualization.v2.Msvm_LANEndpoint.cs | 354 +- ...OOT.virtualization.v2.Msvm_MemorySettingData.cs | 306 +- .../ROOT.virtualization.v2.Msvm_MigrationJob.cs | 446 +- ....virtualization.v2.Msvm_ProcessorSettingData.cs | 300 +- ...zation.v2.Msvm_ResourceAllocationSettingData.cs | 278 +- ...OOT.virtualization.v2.Msvm_ShutdownComponent.cs | 384 +- ...ization.v2.Msvm_StorageAllocationSettingData.cs | 318 +- .../ROOT.virtualization.v2.Msvm_StorageJob.cs | 444 +- ...OT.virtualization.v2.Msvm_SummaryInformation.cs | 466 +- ...ion.v2.Msvm_SyntheticEthernetPortSettingData.cs | 292 +- ...virtualization.v2.Msvm_VirtualEthernetSwitch.cs | 350 +- ....Msvm_VirtualEthernetSwitchManagementService.cs | 344 +- ...alization.v2.Msvm_VirtualHardDiskSettingData.cs | 328 +- ...ation.v2.Msvm_VirtualSystemManagementService.cs | 384 +- ...vm_VirtualSystemManagementServiceSettingData.cs | 236 +- ...zation.v2.Msvm_VirtualSystemMigrationService.cs | 362 +- ...on.v2.Msvm_VirtualSystemMigrationSettingData.cs | 288 +- ...tualization.v2.Msvm_VirtualSystemSettingData.cs | 458 +- .../DotNet/ServerResource/WmiWrappers/Readme.txt | 2 +- .../ServerResource/WmiWrappers/WmiWrappers.csproj | 2 +- ...fFormattedData_Counters_ProcessorInformation.cs | 404 +- plugins/hypervisors/hyperv/pom.xml | 2 +- plugins/hypervisors/kvm/pom.xml | 2 +- .../kvm/resource/LibvirtComputingResource.java | 82 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 6 +- .../kvm/storage/KVMStorageProcessor.java | 6 + .../apache/cloudstack/utils/linux/KVMHostInfo.java | 7 + .../kvm/resource/LibvirtComputingResourceTest.java | 4 +- plugins/hypervisors/ovm/pom.xml | 2 +- plugins/hypervisors/ovm3/pom.xml | 2 +- .../test/resources/scripts/create_pool_cluster.py | 83 +- plugins/hypervisors/simulator/pom.xml | 2 +- plugins/hypervisors/ucs/pom.xml | 2 +- plugins/hypervisors/vmware/pom.xml | 2 +- .../hypervisor/vmware/resource/VmwareResource.java | 6 + plugins/hypervisors/xenserver/pom.xml | 2 +- .../xenserver/resource/CitrixResourceBase.java | 6 + .../xenserver/resource/XenServer56Resource.java | 7 +- .../xenserver/XenServerResourceNewBase.java | 7 +- plugins/integrations/cloudian/pom.xml | 2 +- plugins/integrations/kubernetes-service/pom.xml | 2 +- .../cluster/KubernetesClusterManagerImpl.java | 7 +- ...ernetesClusterResourceModifierActionWorker.java | 13 +- .../cluster/KubernetesClusterManagerImplTest.java | 11 +- plugins/integrations/prometheus/pom.xml | 2 +- plugins/{shutdown => maintenance}/pom.xml | 6 +- .../api/command/BaseMSMaintenanceActionCmd.java} | 8 +- .../api/command/CancelMaintenanceCmd.java} | 21 +- .../cloudstack/api/command/CancelShutdownCmd.java | 10 +- .../api/command/PrepareForMaintenanceCmd.java} | 33 +- .../api/command/PrepareForShutdownCmd.java | 9 +- .../api/command/ReadyForShutdownCmd.java | 44 +- .../cloudstack/api/command/TriggerShutdownCmd.java | 10 +- .../ManagementServerMaintenanceResponse.java} | 80 +- .../ManagementServerMaintenanceListener.java | 7 +- .../ManagementServerMaintenanceManager.java | 108 + .../ManagementServerMaintenanceManagerImpl.java | 598 + .../BaseShutdownManagementServerHostCommand.java | 2 +- ...celMaintenanceManagementServerHostCommand.java} | 7 +- .../CancelShutdownManagementServerHostCommand.java | 2 +- ...eForMaintenanceManagementServerHostCommand.java | 22 +- ...pareForShutdownManagementServerHostCommand.java | 2 +- ...TriggerShutdownManagementServerHostCommand.java | 2 +- .../cloudstack/maintenance}/module.properties | 2 +- .../maintenance/spring-maintenance-context.xml} | 4 +- ...anagementServerMaintenanceManagerImplTest.java} | 21 +- plugins/metrics/pom.xml | 2 +- .../org/apache/cloudstack/api/MetricConstants.java | 2 + .../cloudstack/metrics/MetricsServiceImpl.java | 7 +- .../response/ManagementServerMetricsResponse.java | 17 + plugins/network-elements/bigswitch/pom.xml | 2 +- plugins/network-elements/brocade-vcs/pom.xml | 2 +- plugins/network-elements/cisco-vnmc/pom.xml | 2 +- .../network/cisco/create-acl-policy-ref.xml | 68 +- .../network/cisco/create-acl-policy-set.xml | 64 +- .../scripts/network/cisco/create-acl-policy.xml | 62 +- .../network/cisco/create-acl-rule-for-dnat.xml | 156 +- .../network/cisco/create-acl-rule-for-pf.xml | 304 +- .../scripts/network/cisco/create-dnat-rule.xml | 174 +- .../network/cisco/create-egress-acl-rule.xml | 328 +- .../create-generic-egress-acl-no-protocol-rule.xml | 180 +- .../cisco/create-generic-egress-acl-rule.xml | 234 +- .../cisco/create-generic-ingress-acl-rule.xml | 234 +- .../network/cisco/create-ingress-acl-rule.xml | 328 +- .../main/scripts/network/cisco/create-ip-pool.xml | 108 +- .../network/cisco/create-nat-policy-ref.xml | 68 +- .../scripts/network/cisco/create-nat-policy.xml | 66 +- .../main/scripts/network/cisco/create-pf-rule.xml | 324 +- .../scripts/network/cisco/create-port-pool.xml | 136 +- .../network/cisco/delete-acl-policy-set.xml | 60 +- .../scripts/network/cisco/delete-acl-policy.xml | 66 +- .../scripts/network/cisco/delete-edge-firewall.xml | 60 +- .../network/cisco/delete-edge-security-profile.xml | 76 +- .../network/cisco/delete-nat-policy-set.xml | 60 +- .../scripts/network/cisco/delete-nat-policy.xml | 66 +- .../src/main/scripts/network/cisco/delete-rule.xml | 62 +- .../main/scripts/network/cisco/delete-tenant.xml | 60 +- .../src/main/scripts/network/cisco/delete-vdc.xml | 60 +- .../scripts/network/cisco/disassoc-asa1000v.xml | 60 +- .../scripts/network/cisco/list-acl-policies.xml | 54 +- .../main/scripts/network/cisco/list-children.xml | 46 +- .../scripts/network/cisco/list-nat-policies.xml | 54 +- .../network/cisco/list-policyrefs-in-policyset.xml | 54 +- plugins/network-elements/dns-notifier/pom.xml | 2 +- .../network-elements/elastic-loadbalancer/pom.xml | 2 +- plugins/network-elements/globodns/pom.xml | 2 +- .../network-elements/internal-loadbalancer/pom.xml | 2 +- plugins/network-elements/juniper-contrail/pom.xml | 2 +- plugins/network-elements/netscaler/pom.xml | 2 +- plugins/network-elements/nicira-nvp/pom.xml | 2 +- plugins/network-elements/nsx/pom.xml | 2 +- plugins/network-elements/opendaylight/pom.xml | 2 +- plugins/network-elements/ovs/pom.xml | 2 +- plugins/network-elements/palo-alto/pom.xml | 2 +- plugins/network-elements/stratosphere-ssp/pom.xml | 2 +- plugins/network-elements/tungsten/pom.xml | 2 +- plugins/network-elements/vxlan/pom.xml | 2 +- .../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +- .../nested-cloudstack/pom.xml | 2 +- .../outofbandmanagement-drivers/redfish/pom.xml | 2 +- plugins/pom.xml | 4 +- .../cloudstack/shutdown/ShutdownManager.java | 60 - .../cloudstack/shutdown/ShutdownManagerImpl.java | 265 - .../META-INF/cloudstack/shutdown/module.properties | 18 - plugins/storage-allocators/random/pom.xml | 2 +- plugins/storage/image/default/pom.xml | 2 +- plugins/storage/image/s3/pom.xml | 2 +- plugins/storage/image/sample/pom.xml | 2 +- plugins/storage/image/swift/pom.xml | 2 +- plugins/storage/object/ceph/pom.xml | 2 +- .../driver/CephObjectStoreDriverImpl.java | 2 +- plugins/storage/object/minio/pom.xml | 2 +- plugins/storage/object/simulator/pom.xml | 2 +- plugins/storage/sharedfs/storagevm/pom.xml | 2 +- plugins/storage/volume/adaptive/pom.xml | 2 +- plugins/storage/volume/cloudbyte/pom.xml | 2 +- plugins/storage/volume/datera/pom.xml | 2 +- plugins/storage/volume/default/pom.xml | 2 +- plugins/storage/volume/flasharray/pom.xml | 2 +- plugins/storage/volume/linstor/pom.xml | 2 +- plugins/storage/volume/nexenta/pom.xml | 2 +- plugins/storage/volume/primera/pom.xml | 2 +- plugins/storage/volume/sample/pom.xml | 2 +- plugins/storage/volume/scaleio/pom.xml | 2 +- plugins/storage/volume/solidfire/pom.xml | 2 +- plugins/storage/volume/storpool/README.md | 6 - plugins/storage/volume/storpool/pom.xml | 2 +- plugins/user-authenticators/ldap/pom.xml | 2 +- plugins/user-authenticators/md5/pom.xml | 2 +- plugins/user-authenticators/oauth2/pom.xml | 2 +- plugins/user-authenticators/pbkdf2/pom.xml | 2 +- plugins/user-authenticators/plain-text/pom.xml | 2 +- plugins/user-authenticators/saml2/pom.xml | 2 +- plugins/user-authenticators/sha256salted/pom.xml | 2 +- .../static-pin/pom.xml | 2 +- .../user-two-factor-authenticators/totp/pom.xml | 2 +- pom.xml | 2 +- quickcloud/pom.xml | 2 +- .../vnet/{modifyvxlan.sh => modifyvxlan-evpn.sh} | 47 +- server/pom.xml | 2 +- .../src/main/java/com/cloud/api/ApiDispatcher.java | 2 +- .../main/java/com/cloud/api/ApiResponseHelper.java | 2 +- server/src/main/java/com/cloud/api/ApiServer.java | 16 +- .../java/com/cloud/api/query/QueryManagerImpl.java | 26 +- .../com/cloud/api/query/ViewResponseHelper.java | 28 + .../cloud/api/query/dao/AccountJoinDaoImpl.java | 38 +- .../cloud/api/query/dao/AsyncJobJoinDaoImpl.java | 15 +- .../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 36 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 11 + .../java/com/cloud/api/query/vo/AccountJoinVO.java | 56 + .../java/com/cloud/api/query/vo/DomainJoinVO.java | 69 +- .../main/java/com/cloud/configuration/Config.java | 30 +- .../configuration/ConfigurationManagerImpl.java | 20 +- .../java/com/cloud/consoleproxy/AgentHookBase.java | 3 +- .../com/cloud/hypervisor/HypervisorGuruBase.java | 2 + .../com/cloud/network/IpAddressManagerImpl.java | 2 +- .../java/com/cloud/network/NetworkServiceImpl.java | 12 + .../com/cloud/network/SshKeysDistriMonitor.java | 30 +- .../network/firewall/FirewallManagerImpl.java | 2 +- .../network/security/SecurityGroupListener.java | 33 +- .../java/com/cloud/network/vpc/VpcManagerImpl.java | 17 +- .../com/cloud/resource/ResourceManagerImpl.java | 21 +- .../resource/RollingMaintenanceManagerImpl.java | 4 +- .../resourcelimit/ResourceLimitManagerImpl.java | 74 +- .../server/ManagementServerHostStatsEntry.java | 21 + .../com/cloud/server/ManagementServerImpl.java | 47 +- .../main/java/com/cloud/server/StatsCollector.java | 7 +- .../java/com/cloud/storage/StorageManagerImpl.java | 8 +- .../com/cloud/storage/VolumeApiServiceImpl.java | 19 +- .../cloud/storage/listener/StoragePoolMonitor.java | 74 +- .../cloud/storage/snapshot/SnapshotManager.java | 2 +- .../agent/lb/IndirectAgentLBServiceImpl.java | 213 +- .../cloudstack/backup/BackupManagerImpl.java | 246 +- .../consoleproxy/ConsoleAccessManagerImpl.java | 9 +- .../jsinterpreter/JsInterpreterHelper.java | 240 + .../storage/object/BucketApiServiceImpl.java | 38 +- .../core/spring-server-core-managers-context.xml | 6 +- .../com/cloud/api/query/QueryManagerImplTest.java | 3 + .../ConfigurationManagerImplTest.java | 53 +- .../com/cloud/network/NetworkServiceImplTest.java | 34 + .../cloud/resource/MockResourceManagerImpl.java | 17 +- .../ResourceLimitManagerImplTest.java | 121 +- .../com/cloud/server/ManagementServerImplTest.java | 56 + .../com/cloud/storage/StorageManagerImplTest.java | 1 - .../cloud/vpc/dao/MockConfigurationDaoImpl.java | 12 +- .../cloudstack/backup/BackupManagerTest.java | 365 +- .../jsinterpreter/JsInterpreterHelperTest.java | 228 + .../storage/object/BucketApiServiceImplTest.java | 182 + .../resources/SecurityGroupManagerTestContext.xml | 42 +- .../src/test/resources/SnapshotDaoTestContext.xml | 50 +- .../test/resources/StoragePoolDaoTestContext.xml | 80 +- .../src/test/resources/VpcApiUnitTestContext.xml | 80 +- server/src/test/resources/VpcTestContext.xml | 124 +- .../src/test/resources/createNetworkOffering.xml | 1 + server/src/test/resources/testContext.xml | 160 +- services/console-proxy/pom.xml | 2 +- services/console-proxy/rdpconsole/pom.xml | 2 +- services/console-proxy/rdpconsole/rdp-config.bat | 10 +- .../rdpconsole/src/test/doc/dev-rdp-config.bat | 24 +- services/console-proxy/server/pom.xml | 2 +- .../java/com/cloud/consoleproxy/ConsoleProxy.java | 5 +- services/pom.xml | 2 +- services/secondary-storage/controller/pom.xml | 2 +- services/secondary-storage/pom.xml | 2 +- services/secondary-storage/server/pom.xml | 2 +- setup/dev/advancedsg.cfg | 142 +- setup/dev/basic.cfg | 2 +- .../system/hyperv-daemons.hv-fcopy-daemon.service | 2 +- .../system/hyperv-daemons.hv-kvp-daemon.service | 2 +- .../system/hyperv-daemons.hv-vss-daemon.service | 2 +- .../etc/systemd/system/open-vm-tools.service | 2 +- .../debian/etc/systemd/system/xe-daemon.service | 2 +- systemvm/pom.xml | 2 +- test/conf/config.xml | 206 +- ...py => test_ms_maintenance_and_safe_shutdown.py} | 65 +- .../delegatedAdmin/delegated_admin_cleanup.xml | 252 +- .../delegatedAdmin/delegated_admin_createusers.xml | 624 +- .../delegated_admin_verify_part1.xml | 840 +- .../delegated_admin_verify_part2.xml | 1904 +-- .../pickuser_domainlevel1_domainlevel2.xml | 244 +- ...ickuser_domainlevel1admin_domainlevel1admin.xml | 244 +- .../pickuser_domainlevel1admin_rootadmin.xml | 244 +- .../pickuser_domainlevel2_child_domainlevel1.xml | 244 +- ...pickuser_domainlevel2_nonchild_domainlevel1.xml | 244 +- .../pickuser_domainlevel2_rootadmin1.xml | 244 +- .../pickuser_rootadmin1_rootadmin2.xml | 244 +- .../pickuser_rootadmin_vs_domainlevel1admin.xml | 244 +- test/metadata/func/directnw_regression.xml | 3820 ++--- test/metadata/func/expunge.xml | 2414 +-- test/metadata/func/flatnetwork.xml | 1066 +- test/metadata/func/ha.xml | 734 +- test/metadata/func/iso.xml | 1814 +- test/metadata/func/loadbalancers.xml | 4072 ++--- test/metadata/func/localstorage_volume_test.xml | 306 +- test/metadata/func/mgmtvmsync.xml | 1302 +- test/metadata/func/private_templates.xml | 1822 +- test/metadata/func/regression.xml | 8886 +++++----- test/metadata/func/regression_new.xml | 15344 ++++++++--------- test/metadata/func/regression_test.xml | 6966 ++++---- test/metadata/func/regression_user.xml | 4764 +++--- test/metadata/func/regression_works.xml | 16836 +++++++++---------- test/metadata/func/resource_limits.xml | 3788 ++--- test/metadata/func/roughflatstress.xml | 1382 +- test/metadata/func/roughregression.xml | 12024 ++++++------- test/metadata/func/securitygroups.xml | 1540 +- test/metadata/func/sharedstorage_volume_test.xml | 2748 +-- test/metadata/func/snapshot_iso.xml | 1292 +- test/metadata/func/snapshots.xml | 1654 +- test/metadata/func/snapshots_contd.xml | 1252 +- test/metadata/func/templatedwnldstress.xml | 1514 +- test/metadata/func/templates_sync.xml | 2120 +-- test/metadata/func/userapi.xml | 2586 +-- test/metadata/func/vmapi.xml | 1782 +- test/metadata/func/vmsync.xml | 814 +- test/pom.xml | 2 +- test/scripts/run.bat | 4 +- tools/apidoc/gen_toc.py | 3 +- tools/apidoc/generatecommand.xsl | 48 +- tools/apidoc/generatetoc_footer.xsl | 8 +- tools/apidoc/generatetoc_header.xsl | 12 +- tools/apidoc/includes/main.css | 14 +- tools/apidoc/pom.xml | 2 +- .../scripts/configure_systemvm_services.sh | 2 +- .../template-base_aarch64-target_aarch64.json | 4 +- .../template-base_x86_64-target_aarch64.json | 4 +- .../template-base_x86_64-target_x86_64.json | 4 +- tools/checkstyle/pom.xml | 2 +- .../devcloud-kvm/devcloud-kvm-advanced-fusion.cfg | 94 +- tools/devcloud-kvm/devcloud-kvm-advanced.cfg | 102 +- tools/devcloud-kvm/devcloud-kvm.cfg | 68 +- tools/devcloud-kvm/pom.xml | 2 +- tools/devcloud4/README.md | 4 - tools/devcloud4/advanced/README.md | 2 - tools/devcloud4/advanced/marvin.cfg | 4 +- tools/devcloud4/basic/README.md | 2 - tools/devcloud4/basic/marvin.cfg | 4 +- tools/devcloud4/pom.xml | 2 +- tools/docker/Dockerfile | 2 +- tools/docker/Dockerfile.marvin | 4 +- tools/docker/README.md | 4 - tools/git/git-pr | 2 +- .../marvin/config/Baremetal_AdvZone_Vmware.cfg | 6 +- tools/marvin/marvin/config/setup.cfg | 2 +- tools/marvin/marvin/misc/build/CI.md | 37 +- tools/marvin/marvin/misc/build/README.md | 41 +- tools/marvin/marvin/misc/build/asf_test.cfg | 142 +- tools/marvin/marvin/misc/build/kvm.cfg | 212 +- tools/marvin/marvin/misc/build/xen.cfg | 212 +- tools/marvin/pom.xml | 2 +- tools/marvin/setup.py | 2 +- tools/ngui/README.md | 34 +- tools/ngui/static/css/app.css | 2 +- tools/pom.xml | 2 +- ui/docs/development.md | 2 - ui/public/locales/en.json | 41 +- ui/public/locales/pt_BR.json | 9 +- ui/public/locales/te.json | 3737 ++++ ui/src/components/header/TranslationMenu.vue | 1 + ui/src/components/page/GlobalLayout.vue | 22 +- ui/src/components/view/DetailsTab.vue | 12 + ui/src/components/view/InfoCard.vue | 5 + ui/src/components/view/ListResourceTable.vue | 2 +- ui/src/components/view/ListView.vue | 19 +- ui/src/components/view/ResourceCountUsage.vue | 2 +- ui/src/components/view/ResourceLimitTab.vue | 6 +- ui/src/components/view/SearchView.vue | 24 +- ui/src/components/widgets/Status.vue | 10 +- ui/src/config/section/infra/hosts.js | 3 +- ui/src/config/section/infra/managementServers.js | 41 +- ui/src/config/section/network.js | 12 +- ui/src/config/section/offering.js | 14 +- ui/src/config/section/storage.js | 2 +- ui/src/config/section/user.js | 23 +- ui/src/store/getters.js | 2 + ui/src/store/modules/app.js | 6 + ui/src/store/modules/user.js | 19 + ui/src/store/mutation-types.js | 1 + ui/src/style/README.md | 1 - ui/src/style/objects/form.scss | 8 + ui/src/views/AutogenView.vue | 6 +- ui/src/views/compute/backup/BackupSchedule.vue | 5 + ui/src/views/compute/backup/FormSchedule.vue | 13 + ui/src/views/dashboard/UsageDashboard.vue | 32 +- ui/src/views/iam/AddUser.vue | 124 +- ui/src/views/infra/Confirmation.vue | 40 +- .../{AsyncJobsTab.vue => ConnectedAgentsTab.vue} | 48 +- ui/src/views/plugins/quota/CreateQuotaTariff.vue | 52 +- ui/src/views/plugins/quota/EditQuotaTariff.vue | 59 +- ui/src/views/storage/CreateBucket.vue | 5 +- ui/src/views/storage/UpdateBucket.vue | 2 +- usage/pom.xml | 2 +- utils/pom.xml | 2 +- .../java/com/cloud/utils/nio/NioConnection.java | 69 +- utils/src/test/resources/testContext.xml | 96 +- vmware-base/pom.xml | 2 +- .../hypervisor/vmware/mo/VirtualMachineMO.java | 6 + 633 files changed, 76713 insertions(+), 66557 deletions(-) copy agent/bindir/cloud-ssh.in => .github/ISSUE_TEMPLATE/bug.yml (51%) copy agent/bindir/cloud-ssh.in => .github/ISSUE_TEMPLATE/feature_request.yaml (71%) rename api/src/main/java/org/apache/cloudstack/api/command/admin/host/{CancelMaintenanceCmd.java => CancelHostMaintenanceCmd.java} (98%) rename api/src/main/java/org/apache/cloudstack/api/command/admin/host/{PrepareForMaintenanceCmd.java => PrepareForHostMaintenanceCmd.java} (98%) copy core/src/main/java/com/cloud/agent/api/{GetVmVncTicketAnswer.java => MigrateAgentConnectionAnswer.java} (70%) copy core/src/main/java/{org/apache/cloudstack/agent/lb/SetupMSListCommand.java => com/cloud/agent/api/MigrateAgentConnectionCommand.java} (75%) create mode 100644 engine/orchestration/src/test/java/com/cloud/vm/VirtualMachinePowerStateSyncImplTest.java copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41910to42000.java => Upgrade42010to42100.java} (55%) copy engine/schema/src/main/resources/META-INF/db/{schema-41510to41520-cleanup.sql => schema-42010to42100-cleanup.sql} (93%) create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql create mode 100644 engine/schema/src/test/java/com/cloud/upgrade/ConfigurationGroupsAggregatorTest.java create mode 100644 engine/schema/src/test/java/com/cloud/upgrade/dao/Upgrade42010to42100Test.java copy framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/{ComputeOffering.java => Configuration.java} (68%) create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/DiskOfferingPresetVariables.java create mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsListCmd.java copy plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/{QuotaPresetVariablesListCmd.java => QuotaValidateActivationRuleCmd.java} (60%) create mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaValidateActivationRuleResponse.java create mode 100644 plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaCreditsListCmdTest.java copy api/src/test/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmdTest.java => plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaValidateActivationRuleCmdTest.java (56%) rename plugins/{shutdown => maintenance}/pom.xml (90%) rename plugins/{shutdown/src/main/java/org/apache/cloudstack/api/command/BaseShutdownActionCmd.java => maintenance/src/main/java/org/apache/cloudstack/api/command/BaseMSMaintenanceActionCmd.java} (85%) copy plugins/{shutdown/src/main/java/org/apache/cloudstack/api/command/PrepareForShutdownCmd.java => maintenance/src/main/java/org/apache/cloudstack/api/command/CancelMaintenanceCmd.java} (73%) rename plugins/{shutdown => maintenance}/src/main/java/org/apache/cloudstack/api/command/CancelShutdownCmd.java (83%) copy plugins/{shutdown/src/main/java/org/apache/cloudstack/api/command/PrepareForShutdownCmd.java => maintenance/src/main/java/org/apache/cloudstack/api/command/PrepareForMaintenanceCmd.java} (56%) rename plugins/{shutdown => maintenance}/src/main/java/org/apache/cloudstack/api/command/PrepareForShutdownCmd.java (85%) rename plugins/{shutdown => maintenance}/src/main/java/org/apache/cloudstack/api/command/ReadyForShutdownCmd.java (66%) rename plugins/{shutdown => maintenance}/src/main/java/org/apache/cloudstack/api/command/TriggerShutdownCmd.java (85%) rename plugins/{shutdown/src/main/java/org/apache/cloudstack/api/response/ReadyForShutdownResponse.java => maintenance/src/main/java/org/apache/cloudstack/api/response/ManagementServerMaintenanceResponse.java} (52%) copy api/src/main/java/com/cloud/capacity/CapacityState.java => plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceListener.java (81%) create mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManager.java create mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImpl.java rename plugins/{shutdown/src/main/java/org/apache/cloudstack/shutdown => maintenance/src/main/java/org/apache/cloudstack/maintenance}/command/BaseShutdownManagementServerHostCommand.java (95%) copy plugins/{shutdown/src/main/java/org/apache/cloudstack/shutdown/command/CancelShutdownManagementServerHostCommand.java => maintenance/src/main/java/org/apache/cloudstack/maintenance/command/CancelMaintenanceManagementServerHostCommand.java} (78%) rename plugins/{shutdown/src/main/java/org/apache/cloudstack/shutdown => maintenance/src/main/java/org/apache/cloudstack/maintenance}/command/CancelShutdownManagementServerHostCommand.java (95%) copy api/src/main/java/com/cloud/exception/CloudTwoFactorAuthenticationException.java => plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/command/PrepareForMaintenanceManagementServerHostCommand.java (66%) rename plugins/{shutdown/src/main/java/org/apache/cloudstack/shutdown => maintenance/src/main/java/org/apache/cloudstack/maintenance}/command/PrepareForShutdownManagementServerHostCommand.java (95%) rename plugins/{shutdown/src/main/java/org/apache/cloudstack/shutdown => maintenance/src/main/java/org/apache/cloudstack/maintenance}/command/TriggerShutdownManagementServerHostCommand.java (95%) copy plugins/{integrations/cloudian/src/main/resources/META-INF/cloudstack/cloudian => maintenance/src/main/resources/META-INF/cloudstack/maintenance}/module.properties (97%) rename plugins/{shutdown/src/main/resources/META-INF/cloudstack/shutdown/spring-shutdown-context.xml => maintenance/src/main/resources/META-INF/cloudstack/maintenance/spring-maintenance-context.xml} (83%) rename plugins/{shutdown/src/test/java/org/apache/cloudstack/shutdown/ShutdownManagerImplTest.java => maintenance/src/test/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImplTest.java} (84%) delete mode 100644 plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/ShutdownManager.java delete mode 100644 plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/ShutdownManagerImpl.java delete mode 100644 plugins/shutdown/src/main/resources/META-INF/cloudstack/shutdown/module.properties copy scripts/vm/network/vnet/{modifyvxlan.sh => modifyvxlan-evpn.sh} (72%) mode change 100755 => 100644 create mode 100644 server/src/main/java/org/apache/cloudstack/jsinterpreter/JsInterpreterHelper.java create mode 100644 server/src/test/java/org/apache/cloudstack/jsinterpreter/JsInterpreterHelperTest.java create mode 100644 server/src/test/java/org/apache/cloudstack/storage/object/BucketApiServiceImplTest.java rename test/integration/smoke/{test_safe_shutdown.py => test_ms_maintenance_and_safe_shutdown.py} (58%) create mode 100644 ui/public/locales/te.json copy ui/src/views/infra/{AsyncJobsTab.vue => ConnectedAgentsTab.vue} (57%)