This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch 4.18-dummy in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit f593980ebc8 replace pull_request_target with pull_request omit 4b82458ba5b don't merge add 523ab58d028 Fix PR 7131 bugs and vulnerabilities (#7140) add cfee78e07c1 ui: Added UEFI support flag in host details view (#7361) add 17b86316155 Add service ip to listManagementServers API response (#7374) add b5c5d196660 removed vulnerable workflow add 9e1c7a2a90d UI: fix default network is not passed to deployvm API (#7367) add 9fb20056d55 Fixed avoid set variables which is causing deployment failures (#7372) add 16694d8bec8 Merge branch '4.17' into 4.18 add 11ff2d20e8f UI: fix templates/offerings are not listed in autoscale vm profile when login as user (#7343) add fcf07f1fb41 Added upper case JPEG extension for icon upload (#7200) add f11f1956e86 fixed L2 network creation for particular account (#7382) add 330a330555e test: add smoke test for user role for userdata crud api (#7332) add 9aee625ab45 orchestration: fix error on deleted template vm start (#7327) add ce981574c33 Merge remote-tracking branch 'apache/4.17' into 4.18 add 5d5fa04c8ba saml: Add EncryptedElementType key resolver to SAML plugin (#7268) add ec3698dfbe1 Added details about account/domain to which network will be assigned during creation (#7387) add c35d7ac9356 ui: show static-nat tag for public ip (#7395) add 30998d0ab7e server: fix userdatadetails parsing (#7328) add 9e130421205 Console: upgrade noVNC from v1.2.0 to v1.4.0 (#7281) add b2f1965ccbd Fix ScaleVM to consider resize volume in any type of service offering (#7359) add a28b4398c59 Merge branch '4.17' into 4.18 add 54606dc965d server: fix 4.18/main build error after merge forward add 9df1a7bc0eb ui: Fixed the Description coloumn in the UI for Quota traffic page (#7402) add 1827219b4a8 pom.xml: bump only required dependencies (#7388) add d6b581263f4 ui: allow creating account networkdomain (#7394) add 6886fca1050 server: list vm search vm ip using keyword (#7406) add 55e35c6e0c3 ui: show vpn users tab in networks section (#7277) add d1707009f6b Merge remote-tracking branch 'apache/4.17' into 4.18 add 965d29a899f ui: show only advanced zones for vmautoscale form (#7411) add 0ad94ce58c9 ui: CreateNetwork isolated/L2 form, added accounts list under selected domain (#7393) add d8717299707 ui: allow clearing dns during zone update (#7276) add 4c9c1d2d7bf Merge remote-tracking branch 'apache/4.17' into 4.18 add b774ee5d117 vmware: Datastore cluster synchronization should check if the child datastores are in UP state or not (#7385) add 65512af779c server: Roles search by keyword (#7384) add 2dc016adde7 Fix for direct download templates with multiple bypassed references (#7400) add 3e9d7e05544 server: rephrase error message for iso vm reinstall (#7407) add 96897f07f28 Set hypervisor hostname via userdata only when the global settings are allowed (#7360) add 2a68259d0d5 Merge remote-tracking branch 'origin/4.17' into 4.18 add afccde5cfc2 server,engine-schema: fix listing service offering for vm scale (#7398) add dabefca2b69 debian/control: build packages on ubuntu 22.04 (#7269) add fcbcddbcb96 ui: Allow admin/user to filter by state for Pods, Clusters and Hosts (#7373) add 79eae89a87e ui: Add filtering by state in account, systemvms, router and storagepool (#7368) add fb51504dff0 server: dedicate vxlan range to account (#7215) add 41bbedb530e Merge remote-tracking branch 'apache/4.17' into 4.18 add a5676b0d013 ui: syntax fix for build failure add 58850458731 refactor: delete unsed serviceoffering classes in quota module (#7439) add e166f96094c ssvm: fix post request header case mismatch (#7445) add 8bbe2f7cb22 engine/schema: use junit 4 (same as the rest of the project tests) add b84744d9a5b server: validate ip address value on update config (#7415) add d147f1cc3b2 ui: fix custom offering cpuspeed during vm import (#7423) add ec0f8bddf62 Support local storage live migration for direct download templates (#7453) add cb0874f5b9e novnc: Send console text slower to avoid overloading remote keyboard buffer (#7477) add bdd53633148 Qemu migration hook: check for source length before using element 0 (#7482) add 3cb4c801fb4 server: fix null pointer on powerflex attach volume edge case (#7498) add 8604cb53281 server: Fix DirectDownload certificate check initial delay (#7494) add ad21e863423 addAnnotation: added the various entity type supported by the api call (#7478) add 897dad619b8 marvin: replace encodestring for encodebytes (#7027) add 88ff77dae10 ui: fix action notifications (#7499) add 66cbe0a0512 replace pull_request_target with pull_request add 0e4a5a1fa41 .github: restrict sonar and CI actions to only apache/cloudstack add a582b2a5a16 ui: fix sourceIP is not passed when create internal LB (#7512) add e613b90feea ui: set default cpu, memory value for k8s version (#7513) add 5e442df5a08 ssvm: continue with other secondary storages if fails to program a secondary storage (#7264) add d9e0a3e6c32 server: add config SSVM capacity scan (#7448) add 8c546bd5a68 router: do not restart conntrackd if no guest networks (issue 6702) (#7265) add a0eb0aa5f7a api,server: fix VM.CREATE events on vm deploy without start (#7421) add b6443a2b1fd increase log detail for limit checking, fix getDomainReservation() (#7506) add 44024a8a8b4 github-actions: fix ui build workflow (#7522) add 83fd75f7072 Marvin: Fix deployDataCenter's cleanup (#7521) add c47554919c4 ui: fix tags for security group rules (#7424) add 32caf9057e1 engine-storage: fix errored template becomes active (#7485) add 22871ad2da8 ui: fix infocard tempalte, iso fields (#7527) add 5e71cea2c59 Fix Tungsten Fabric errors on adding a new zone due to duplicated entries on ntwk_service_map (#7455) add 2b3e2e48a07 ui: show zones and offerings to users (#7557) add 8849e0f464c server: fix volume detach operation when no vm host (#7526) add 4138ca7c5d0 systemvmtemplate: fix Debian 11.7.0 ISO URL add c3535880d25 Create user 'cloud' in cloudstack-usage postinstall (#7559) add f6365801953 cks,ui: allow changing stopped cluster offering, improvements (#7475) add 17e765e6bc9 test: reduce PowerMock usage for code coverage (#7452) add ef9dec11e76 guestos: add Windows Server 2022 (#7508) add 7319debc87e cks: k8s cluster on vpc tier (#7479) add 0941d01e97d secondary-storage: delete backedup snapshot dir on delete (#7524) add b2e9993b0ac vmware: do not create vm datastore when attach an existing volume on solidfire (#7160) add 2d6a0698121 server: improve storage GC to skip expunging possible duplicate volumes (#7313) add ea2b5379850 fix tools/build/setnextversion.sh: do not update tools/apidoc/pom.xml (#7163) add bd5d478a3ad Refactor test and change IP range (#6512) add f298008215d Merge remote-tracking branch 'apache/4.16' into 4.17 add b030ea19a47 Merge remote-tracking branch 'apache/4.17' into 4.18 add 811b6293afb .github: Use parallel builds for github actions (#7592) add 24da2bcf78f marvin: fix test_data for parsing failure (#7602) add 20865901d1f Merge remote-tracking branch 'apache/4.16' into 4.17 add 03910c27835 Merge remote-tracking branch 'apache/4.17' into 4.18 add 0d3ac9f8d96 interpret /etc/redhet-release better (#7570) add 4ef7ebbded8 ssvm: pass all accessible secondary storage to ssvm (#7410) add fb29608f610 consider last host only for root-admin (#7597) add 1aa4f807419 accept first word from host os string for backwards compatibility (#7620) add 658daef7158 utils: fix check for mrtalink url (#7636) add 3748f32bc7f engine-orchestration,vmware: hypervisor migration during start vm migration (#7444) add 40cc10a73de Allow volume migrations in ScaleIO within and across ScaleIO storage clusters (#7408) add 9e1609dd5ae [4.18] Bump the version to 4.18.1.0-SNAPSHOT (#7664) add 0acc66f51d7 server: Add check on host's status while deleting config drive on host cache (#7584) add c8092012473 Fix: Volumes on lost local storage cannot be removed (#7594) add faaf72b1a4a Volume encryption support for StorPool plug-in (#7539) add 985f0ecb533 Tungsten: change conserve_mode of default network offering to 0 (#7511) add 973b0e28fda test: fix Super-Linter Check error in storpool tests add 83dca2bf518 ui: fix vm import for L2 n/w in Setup state (#7628) add f3ad9e6743a marvin: fix smoke test failures if mgmt server is Ubuntu (#7583) add de6ce503dce api: correct error on resize volume resource allocation failure (#7687) add 70820137e64 scaleio: Avoid race condition while handling host disconnect and connect scenarios (#282) (#7689) add 31dbdd0f5c0 engine-orchestration: fix volume size resource count mismatch (#7666) add 1275db4081a UI: Zone wizard fix (#7588) add 5e5d194d77b server: do not check zone imagestores for directdownload template delete (#7607) add 3e04779f606 console proxy: use AeadBase64Encryptor instead of AES/CBC/PKCS5Padding (#7237) add 8e171785d1b cleanup removal of physical network (#7630) add d66f83ba2fb UI: fix wrong vpcid when create network in VPC (#7707) add 0cbe77024a8 Fix foreign key constraints and the mysql procedure that is used (#7381) add acc6f4e725e NPE guard (#7691) add e6ef8a5225b use `Files.createTempDirectory()` instead of `new File()` (#7713) add c733a23c905 Fix direct download URL checks (#7693) add 939ee9e1534 server,engine-orchestration: allocate vm without transaction (#7695) add 594c70dde0e Sync precommit config from main (#7732) add 2752c49fa72 agent: get the right controll cidr (#7580) add f0cc76a3a82 vmware: fix unmanaged instance listing when different name & internal CS name (#7641) add 981d74825a8 Add L2 networks to Zones with SG (#7719) add d575cae3e3f server: allow migration of all VMs with local storage on KVM (#7656) add 73a269e3b36 guarantee MAC uniqueness (#7634) add 0aade286f5a proper storage construction (#6797) add f32a63be602 Storage and volumes statistics tasks for StorPool primary storage (#7404) add 9c5e489d828 eof added to StorPoolStatsCollector (#7754) add 56d98ea2e74 SSVM: 'allow from' private IP in other SSVMs if the public IP is in allowed internal sites cidrs (#7288) add cee7a713aa2 server: clear resource reservation and increment resource count in a transaction (#7724) add 80ca3acf157 Allow encrypted volume migration for PowerFlex volumes (#7757) add f057f4b412e ui: fix userdata base64 encoding (#7749) add 90baae3dcdf utils: fix RBD URI if credentials contains slash (#7708) add 63216425d5b Set encrypted PowerFlex disk format correctly (#7735) add 6dd2ce86b53 UI: add step to create bearer token for kubernetes dashboard (#7764) add bde80f14aac Fix NPE in management server logs due to /proc/cpuinfo output (#7765) add 4000fd09f17 UI: fix userdataid or userdata content is passed when userdata append/override is unchecked (#7758) add f9b7bcfd102 add remove tag to remove acl item method (#7750) add 3f2449f3d89 packaging: install tzdata-java on centos7/centos8 (#7768) add cdf01879ec3 ui: fix 404 error when list volumes of system vms (#7772) new a26699f8db6 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 (f593980ebc8) \ N -- N -- N refs/heads/4.18-dummy (a26699f8db6) 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. The 1 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/build.yml | 2 +- .github/workflows/ci.yml | 3 +- .github/workflows/codecov.yml | 2 +- .github/workflows/main-sonar-check.yml | 3 +- .github/workflows/sonar-check.yml | 2 +- .github/workflows/ui.yml | 1 - .pre-commit-config.yaml | 11 +- agent/bindir/libvirtqemuhook.in | 30 +- .../download/HttpsDirectTemplateDownloader.java | 131 ---- .../download/MetalinkDirectTemplateDownloader.java | 101 --- .../cloud/agent/properties/AgentProperties.java | 7 + api/src/main/java/com/cloud/agent/api/Answer.java | 2 +- .../java/com/cloud/agent/api/to/DatadiskTO.java | 2 +- .../main/java/com/cloud/agent/api/to/DpdkTO.java | 2 +- .../api/to/deployasis/OVFConfigurationTO.java | 2 +- .../agent/api/to/deployasis/OVFNetworkTO.java | 2 +- .../to/deployasis/OVFVirtualHardwareItemTO.java | 2 +- .../to/deployasis/OVFVirtualHardwareSectionTO.java | 2 +- .../cloud/configuration/ConfigurationService.java | 10 +- api/src/main/java/com/cloud/deploy/HAPlanner.java | 2 +- .../main/java/com/cloud/network/NetworkModel.java | 9 +- .../java/com/cloud/network/NetworkRuleApplier.java | 2 +- .../com/cloud/network/rules/StaticNatRule.java | 2 +- .../com/cloud/network/vpc/NetworkACLService.java | 4 +- .../java/com/cloud/offering/DiskOfferingInfo.java | 2 +- .../cloud/resource/RollingMaintenanceManager.java | 2 +- api/src/main/java/com/cloud/storage/ScopeType.java | 15 + api/src/main/java/com/cloud/storage/Storage.java | 2 +- .../java/com/cloud/storage/StoragePoolStatus.java | 15 + .../org/apache/cloudstack/acl/RoleService.java | 2 +- .../affinity/AffinityGroupProcessor.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../api/auth/PluggableAPIAuthenticator.java | 2 +- .../api/command/admin/acl/ListRolesCmd.java | 4 +- .../admin/address/AcquirePodIpCmdByAdmin.java | 2 +- .../admin/address/ReleasePodIpCmdByAdmin.java | 2 +- .../command/admin/annotation/AddAnnotationCmd.java | 2 +- ...UploadTemplateDirectDownloadCertificateCmd.java | 2 - .../command/admin/storage/ListStoragePoolsCmd.java | 9 +- .../admin/template/CopyTemplateCmdByAdmin.java | 1 - .../user/firewall/IListFirewallRulesCmd.java | 2 +- .../command/user/iso/GetUploadParamsForIsoCmd.java | 2 +- .../api/command/user/network/CreateNetworkCmd.java | 9 +- .../user/network/MoveNetworkAclItemCmd.java | 2 +- .../api/command/user/vm/DeployVMCmd.java | 49 +- .../cloudstack/api/command/user/vm/StartVMCmd.java | 3 +- .../api/command/user/volume/ResizeVolumeCmd.java | 5 +- .../api/response/AcquirePodIpCmdResponse.java | 2 +- .../cloudstack/api/response/HostTagResponse.java | 2 +- .../api/response/ImageStoreResponse.java | 2 +- .../api/response/ManagementServerResponse.java | 12 + .../api/response/RolePermissionResponse.java | 2 +- .../api/response/RollingMaintenanceResponse.java | 2 +- .../cloudstack/api/response/SnapshotResponse.java | 2 +- .../cloudstack/api/response/StatsResponse.java | 2 +- .../api/response/UnmanageVMInstanceResponse.java | 2 +- .../org/apache/cloudstack/context/CallContext.java | 5 + .../org/apache/cloudstack/context/LogContext.java | 2 +- .../cloudstack/diagnostics/DiagnosticsService.java | 2 +- .../cloudstack/diagnostics/DiagnosticsType.java | 2 +- .../direct/download/DirectDownloadCertificate.java | 2 +- .../management/ManagementServerHostPeer.java | 2 +- .../apache/cloudstack/network/tls/CertService.java | 2 +- .../apache/cloudstack/vm/UnmanageVMService.java | 2 +- .../apache/cloudstack/vm/UnmanagedVMsManager.java | 2 +- .../com/cloud/agent/api/to/LoadBalancerTOTest.java | 2 +- .../com/cloud/network/as/AutoScalePolicyTest.java | 2 +- .../com/cloud/network/as/AutoScaleVmGroupTest.java | 2 +- .../org/apache/cloudstack/acl/RoleTypeTest.java | 2 +- .../java/org/apache/cloudstack/acl/RuleTest.java | 2 +- .../FindStoragePoolsForMigrationCmdTest.java | 2 +- .../admin/vlan/UpdateVlanIpRangeCmdTest.java | 2 +- .../api/command/admin/zone/CreateZoneCmdTest.java | 2 +- .../command/user/network/CreateNetworkCmdTest.java | 74 +- .../command/user/network/UpdateNetworkCmdTest.java | 40 +- .../user/snapshot/CreateSnapshotPolicyCmdTest.java | 2 +- .../user/template/CopyTemplateCmdByAdminTest.java | 1 - .../command/user/template/CopyTemplateCmdTest.java | 1 - .../api/command/user/vpc/CreateVPCCmdTest.java | 2 +- .../api/command/user/vpc/UpdateVPCCmdTest.java | 2 +- .../cloudstack/api/response/StatsResponseTest.java | 2 +- .../apache/cloudstack/context/CallContextTest.java | 2 +- .../com/cloud/agent/api/CheckRouterAnswer.java | 2 +- .../CleanupPersistentNetworkResourceAnswer.java | 2 +- .../CleanupPersistentNetworkResourceCommand.java | 2 +- .../com/cloud/agent/api/GetGPUStatsAnswer.java | 2 +- .../agent/api/GetUnmanagedInstancesCommand.java | 4 +- .../com/cloud/agent/api/GetVmConfigAnswer.java | 2 +- .../com/cloud/agent/api/GetVolumeStatsCommand.java | 2 +- .../java/com/cloud/agent/api/MigrateCommand.java | 13 + .../agent/api/PrepareUnmanageVMInstanceAnswer.java | 2 +- .../api/PrepareUnmanageVMInstanceCommand.java | 2 +- .../cloud/agent/api/UpdateHostPasswordCommand.java | 2 +- .../java/com/cloud/agent/api/VmStatsEntryBase.java | 2 +- .../api/routing/GetAutoScaleMetricsCommand.java | 2 +- .../routing/GetRouterMonitorResultsCommand.java | 2 +- .../api/routing/SetPortForwardingRulesCommand.java | 1 - .../agent/api/routing/SiteLoadBalancerConfig.java | 2 +- .../api/storage/CreateDatadiskTemplateAnswer.java | 2 +- .../api/storage/CreateDatadiskTemplateCommand.java | 2 +- .../agent/api/storage/GetDatadisksAnswer.java | 2 +- .../agent/api/storage/GetDatadisksCommand.java | 2 +- .../agent/api/storage/MigrateVolumeAnswer.java | 2 +- .../agent/resource/virtualnetwork/VRScripts.java | 2 +- .../facade/BumpUpPriorityConfigItem.java | 2 +- .../facade/CreateIpAliasConfigItem.java | 2 +- .../facade/DeleteIpAliasConfigItem.java | 2 +- .../virtualnetwork/facade/DhcpEntryConfigItem.java | 2 +- .../virtualnetwork/facade/DnsMasqConfigItem.java | 2 +- .../facade/LoadBalancerConfigItem.java | 2 +- .../facade/RemoteAccessVpnConfigItem.java | 2 +- .../facade/SavePasswordConfigItem.java | 2 +- .../facade/SetFirewallRulesConfigItem.java | 2 +- .../facade/SetGuestNetworkConfigItem.java | 2 +- .../facade/SetIpv6FirewallRulesConfigItem.java | 2 +- .../facade/SetMonitorServiceConfigItem.java | 2 +- .../facade/SetPortForwardingRulesConfigItem.java | 2 +- .../SetPortForwardingRulesVpcConfigItem.java | 2 +- .../facade/SetSourceNatConfigItem.java | 2 +- .../facade/SetStaticNatRulesConfigItem.java | 2 +- .../facade/SetStaticRouteConfigItem.java | 2 +- .../facade/Site2SiteVpnConfigItem.java | 2 +- .../virtualnetwork/facade/VmDataConfigItem.java | 2 +- .../virtualnetwork/facade/VpnUsersConfigItem.java | 2 +- .../resource/virtualnetwork/model/AclRule.java | 2 +- .../virtualnetwork/model/FirewallRules.java | 2 +- .../virtualnetwork/model/GuestNetwork.java | 2 +- .../virtualnetwork/model/LoadBalancerRule.java | 2 +- .../virtualnetwork/model/LoadBalancerRules.java | 2 +- .../cloud/agent/transport/ArrayTypeAdaptor.java | 2 +- .../agent/transport/InterfaceTypeAdaptor.java | 2 +- core/src/main/java/com/cloud/host/HostInfo.java | 1 - .../network/resource/TrafficSentinelResource.java | 2 +- .../java/com/cloud/resource/CommandWrapper.java | 2 +- .../java/com/cloud/resource/RequestWrapper.java | 2 +- .../java/com/cloud/resource/ResourceWrapper.java | 2 +- .../java/com/cloud/storage/JavaStorageLayer.java | 9 +- .../com/cloud/storage/template/OVAProcessor.java | 2 +- .../storage/template/S3TemplateDownloader.java | 2 +- .../cloud/storage/template/TemplateConstants.java | 4 +- .../directdownload/HttpsDirectDownloadCommand.java | 2 +- .../RevokeDirectDownloadCertificateCommand.java | 2 +- .../cloudstack/agent/lb/SetupMSListAnswer.java | 2 +- .../cloudstack/agent/lb/SetupMSListCommand.java | 2 +- .../cloudstack/diagnostics/DiagnosticsAnswer.java | 2 +- .../cloudstack/diagnostics/DiagnosticsCommand.java | 2 +- .../direct/download/DirectDownloadHelper.java | 83 ++ .../direct/download/DirectTemplateDownloader.java | 28 +- .../download/DirectTemplateDownloaderImpl.java | 34 +- .../download/HttpDirectTemplateDownloader.java | 91 ++- .../download/HttpsDirectTemplateDownloader.java | 252 ++++++ .../direct/download/HttpsMultiTrustManager.java | 102 +++ .../download/MetalinkDirectTemplateDownloader.java | 177 +++++ .../download/NfsDirectTemplateDownloader.java | 33 +- .../storage/command/MoveVolumeCommand.java | 1 - .../storage/command/StorageSubSystemCommand.java | 2 +- .../cloudstack/storage/to/TemplateObjectTO.java | 1 + .../agent/api/storage/DownloadAnswerTest.java | 2 +- .../java/com/cloud/info/ConsoleProxyInfoTest.java | 2 +- .../com/cloud/storage/JavaStorageLayerTest.java | 25 +- .../cloud/storage/template/OVAProcessorTest.java | 2 +- .../cloud/storage/template/QCOW2ProcessorTest.java | 2 +- .../download/BaseDirectTemplateDownloaderTest.java | 72 ++ .../HttpsDirectTemplateDownloaderTest.java | 21 +- .../MetalinkDirectTemplateDownloaderTest.java | 21 +- debian/changelog | 6 + debian/cloudstack-usage.postinst | 7 +- debian/control | 4 +- .../java/com/cloud/vm/VirtualMachineManager.java | 2 + .../subsystem/api/storage/VolumeService.java | 2 +- .../subsystem/api/storage/type/VolumeTypeBase.java | 2 +- .../api/storage/type/VolumeTypeHelper.java | 2 +- .../api/storage/type/VolumeTypeHelperTest.java | 2 +- .../java/com/cloud/network/IpAddressManager.java | 1 - .../java/com/cloud/storage/StorageManager.java | 2 + .../java/com/cloud/agent/manager/Routable.java | 2 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 174 +++-- .../com/cloud/vm/VmWorkJobWakeupDispatcher.java | 2 +- .../datacenter/entity/api/db/dao/DcDetailsDao.java | 2 +- .../entity/api/db/dao/EngineDataCenterDao.java | 8 - .../entity/api/db/dao/EngineDataCenterDaoImpl.java | 26 - .../engine/orchestration/NetworkOrchestrator.java | 43 +- .../engine/orchestration/VolumeOrchestrator.java | 46 +- .../cloud/agent/manager/AgentManagerImplTest.java | 2 +- .../agent/manager/ConnectedAgentAttacheTest.java | 2 +- .../cloud/vm/VirtualMachineManagerImplTest.java | 119 +++ .../orchestration/VolumeOrchestratorTest.java | 103 +++ engine/schema/pom.xml | 6 - .../java/com/cloud/certificate/dao/CrlDao.java | 2 +- .../configuration/dao/ResourceCountDaoImpl.java | 2 +- .../java/com/cloud/dc/dao/ClusterVSMMapDao.java | 2 +- .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 2 +- .../main/java/com/cloud/dc/dao/DataCenterDao.java | 8 - .../java/com/cloud/dc/dao/DataCenterDaoImpl.java | 27 +- .../com/cloud/dc/dao/DataCenterDetailsDao.java | 2 +- .../com/cloud/dc/dao/DomainVlanMapDaoImpl.java | 2 +- .../main/java/com/cloud/dc/dao/VlanDetailsDao.java | 2 +- .../java/com/cloud/dc/dao/VlanDetailsDaoImpl.java | 2 +- .../java/com/cloud/event/dao/UsageEventDao.java | 2 +- .../src/main/java/com/cloud/host/dao/HostDao.java | 2 + .../main/java/com/cloud/host/dao/HostDaoImpl.java | 26 + .../cloud/network/dao/FirewallRulesDcidrsDao.java | 2 +- .../network/dao/FirewallRulesDestCidrsVO.java | 2 +- .../network/dao/MonitoringServiceDaoImpl.java | 2 +- .../java/com/cloud/network/dao/NetworkDaoImpl.java | 3 - .../com/cloud/network/dao/NetworkDetailsDao.java | 2 +- .../java/com/cloud/network/dao/PortProfileDao.java | 2 +- .../com/cloud/network/dao/PortProfileDaoImpl.java | 2 +- .../java/com/cloud/network/dao/SslCertDao.java | 2 +- .../main/java/com/cloud/network/dao/SslCertVO.java | 2 +- .../java/com/cloud/network/vpc/StaticRouteVO.java | 2 +- .../network/vpc/dao/NetworkACLItemDaoImpl.java | 2 +- .../network/vpc/dao/VpcOfferingDetailsDaoImpl.java | 2 +- .../cloud/network/vpc/dao/VpcServiceMapDao.java | 2 +- .../cloud/service/ServiceOfferingDetailsVO.java | 2 +- .../java/com/cloud/service/ServiceOfferingVO.java | 14 +- .../service/dao/ServiceOfferingDetailsDao.java | 1 - .../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 2 +- .../cloud/storage/dao/SnapshotScheduleDaoImpl.java | 2 +- .../java/com/cloud/storage/dao/UploadDaoImpl.java | 2 +- .../storage/dao/VMTemplateDetailsDaoImpl.java | 2 +- .../main/java/com/cloud/storage/dao/VolumeDao.java | 2 + .../java/com/cloud/storage/dao/VolumeDaoImpl.java | 11 + .../java/com/cloud/storage/dao/VolumeStatsDao.java | 2 +- .../cloud/upgrade/DatabaseVersionHierarchy.java | 2 +- .../cloud/upgrade/dao/DatabaseAccessObject.java | 11 + .../java/com/cloud/upgrade/dao/DbUpgradeUtils.java | 5 +- .../com/cloud/upgrade/dao/LegacyDbUpgrade.java | 2 +- .../java/com/cloud/upgrade/dao/Upgrade40to41.java | 1 - .../com/cloud/upgrade/dao/Upgrade41800to41810.java | 29 + .../java/com/cloud/vm/InstanceGroupVMMapVO.java | 2 +- .../src/main/java/com/cloud/vm/VmStatsVO.java | 2 +- .../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +- .../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 3 +- .../main/java/com/cloud/vm/dao/NicIpAliasDao.java | 2 +- .../src/main/java/com/cloud/vm/dao/VmStatsDao.java | 2 +- .../main/java/com/cloud/vm/dao/VmStatsDaoImpl.java | 2 +- .../apache/cloudstack/acl/RolePermissionVO.java | 2 +- .../acl/dao/ProjectRolePermissionsDaoImpl.java | 2 +- .../org/apache/cloudstack/acl/dao/RoleDao.java | 2 +- .../org/apache/cloudstack/acl/dao/RoleDaoImpl.java | 13 +- .../download/DirectDownloadCertificateDao.java | 2 +- .../download/DirectDownloadCertificateDaoImpl.java | 2 +- .../DirectDownloadCertificateHostMapDao.java | 2 +- .../DirectDownloadCertificateHostMapDaoImpl.java | 2 +- .../DirectDownloadCertificateHostMapVO.java | 2 +- .../download/DirectDownloadCertificateVO.java | 2 +- .../org/apache/cloudstack/ha/dao/HAConfigDao.java | 2 +- .../reservation/dao/ReservationDaoImpl.java | 2 +- .../resourcedetail/AutoScaleVmGroupDetailVO.java | 2 +- .../resourcedetail/AutoScaleVmProfileDetailVO.java | 2 +- .../resourcedetail/DiskOfferingDetailVO.java | 2 +- .../Site2SiteVpnGatewayDetailVO.java | 3 - .../cloudstack/resourcedetail/UserDetailVO.java | 2 +- .../dao/AutoScaleVmGroupDetailsDaoImpl.java | 2 +- .../dao/AutoScaleVmProfileDetailsDaoImpl.java | 2 +- .../resourcedetail/dao/DiskOfferingDetailsDao.java | 1 - .../dao/DiskOfferingDetailsDaoImpl.java | 1 - .../dao/LBHealthCheckPolicyDetailsDaoImpl.java | 2 +- .../dao/LBStickinessPolicyDetailsDaoImpl.java | 2 +- .../dao/NetworkACLItemDetailsDao.java | 2 +- .../dao/NetworkACLItemDetailsDaoImpl.java | 2 +- .../dao/NetworkACLListDetailsDao.java | 2 +- .../dao/Site2SiteCustomerGatewayDetailsDao.java | 2 +- .../dao/Site2SiteVpnGatewayDetailsDao.java | 1 - .../dao/SnapshotPolicyDetailsDaoImpl.java | 2 +- .../resourcedetail/dao/UserDetailsDao.java | 2 +- .../resourcedetail/dao/UserDetailsDaoImpl.java | 2 +- .../dao/VpcGatewayDetailsDaoImpl.java | 2 +- .../cloudstack/secret/dao/PassphraseDao.java | 2 +- .../datastore/db/PrimaryDataStoreDetailsDao.java | 2 +- .../storage/datastore/db/TemplateDataStoreVO.java | 2 +- .../resources/META-INF/db/schema-41720to41800.sql | 14 - .../resources/META-INF/db/schema-41800to41810.sql | 12 + .../cloud/network/as/AutoScaleVmProfileVOTest.java | 2 +- .../upgrade/DatabaseVersionHierarchyTest.java | 24 +- .../com/cloud/vm/dao/VMInstanceDaoImplTest.java | 2 - .../storage/configdrive/ConfigDrive.java | 2 +- .../storage/configdrive/ConfigDriveTest.java | 2 +- .../KvmNonManagedStorageDataMotionStrategy.java | 21 +- .../motion/StorageSystemDataMotionStrategy.java | 13 +- .../KvmNonManagedStorageSystemDataMotionTest.java | 15 +- .../StorageSystemDataMotionStrategyTest.java | 17 +- .../storage/image/SecondaryStorageServiceImpl.java | 2 - .../storage/image/TemplateServiceImpl.java | 21 +- .../storage/image/TemplateServiceImplTest.java | 84 ++ .../storage/snapshot/CephSnapshotStrategy.java | 2 +- .../storage/image/db/TemplateDataStoreDaoImpl.java | 23 +- .../cloudstack/storage/image/format/RAW.java | 2 +- .../image/db/TemplateDataStoreDaoImplTest.java | 77 ++ .../datastore/provider/DefaultHostListener.java | 1 + .../storage/volume/VolumeServiceImpl.java | 4 + .../agent/lb/IndirectAgentLBAlgorithm.java | 2 +- .../main/java/com/cloud/utils/db/ScriptRunner.java | 2 +- .../main/java/com/cloud/utils/db/SearchBase.java | 2 +- .../java/com/cloud/utils/db/SequenceFetcher.java | 4 +- .../crypt/EncryptionSecretKeyChangerTest.java | 2 +- .../apache/cloudstack/framework/events/Event.java | 2 +- .../context/AbstractManagedContextListener.java | 2 +- .../cloudstack/managed/context/ManagedContext.java | 2 +- .../managed/context/ManagedContextRunnable.java | 2 +- .../activationrule/presetvariables/Account.java | 2 +- .../presetvariables/PresetVariables.java | 2 +- .../activationrule/presetvariables/Storage.java | 2 +- .../cloudstack/quota/constant/QuotaConfig.java | 2 +- .../cloudstack/quota/dao/ServiceOfferingDao.java | 25 - .../quota/dao/ServiceOfferingDaoImpl.java | 83 -- .../apache/cloudstack/quota/vo/QuotaTariffVO.java | 2 +- .../cloudstack/quota/vo/ServiceOfferingVO.java | 387 ---------- .../quota/spring-framework-quota-context.xml | 1 - .../cloudstack/quota/constant/QuotaTypesTest.java | 2 +- .../spring/lifecycle/CloudStackLog4jSetup.java | 2 +- packaging/centos7/cloud.spec | 3 + packaging/centos8/cloud.spec | 3 + .../acl/DynamicRoleBasedAPIAccessCheckerTest.java | 2 +- .../acl/ProjectRoleBasedApiAccessCheckerTest.java | 2 +- .../NonStrictHostAffinityProcessorTest.java | 35 +- .../cloudstack/alert/snmp/CsSnmpConstants.java | 2 +- .../alert/snmp/SnmpEnhancedPatternLayout.java | 2 +- .../cloudstack/alert/snmp/SnmpTrapAppender.java | 2 +- .../apache/cloudstack/alert/snmp/SnmpTrapInfo.java | 2 +- .../alert/snmp/SnmpEnhancedPatternLayoutTest.java | 2 +- .../alert/snmp/SnmpTrapAppenderTest.java | 2 +- .../syslog/AlertsSyslogAppenderTest.java | 2 +- .../cloudstack/discovery/ApiDiscoveryTest.java | 2 +- .../ApiSolidFireVolumeAccessGroupIdsResponse.java | 2 +- .../solidfire/ApiSolidFireVolumeSizeResponse.java | 2 +- .../ApiVolumeSnapshotDetailsResponse.java | 2 +- .../cloudstack/backup/NetworkerBackupProvider.java | 2 +- .../backup/networker/NetworkerBackupOffering.java | 2 +- .../backup/networker/NetworkerClient.java | 2 +- .../backup/networker/NetworkerObject.java | 2 +- .../cloudstack/backup/networker/api/Action.java | 2 +- .../backup/networker/api/ActionSpecificData.java | 2 +- .../cloudstack/backup/networker/api/Attribute.java | 2 +- .../backup/networker/api/BackupSpecificData.java | 2 +- .../networker/api/CompletionNotification.java | 2 +- .../cloudstack/backup/networker/api/Expire.java | 2 +- .../cloudstack/backup/networker/api/Instance.java | 2 +- .../cloudstack/backup/networker/api/Link.java | 2 +- .../backup/networker/api/NetworkerBackup.java | 2 +- .../backup/networker/api/NetworkerBackups.java | 2 +- .../backup/networker/api/ProtectionPolicies.java | 2 +- .../backup/networker/api/ProtectionPolicy.java | 2 +- .../backup/networker/api/ResourceId.java | 2 +- .../backup/networker/api/ServerBackup.java | 2 +- .../backup/networker/api/SummaryNotification.java | 2 +- .../backup/networker/api/Traditional.java | 2 +- .../backup/networker/NetworkerClientTest.java | 2 +- .../cloudstack/backup/VeeamBackupProviderTest.java | 2 +- .../cloudstack/backup/veeam/VeeamClientTest.java | 2 +- .../ca/provider/RootCACustomTrustManagerTest.java | 2 +- .../java/com/cloud/utils/db/StaticStrategy.java | 2 +- .../api/response/QuotaCreditsResponse.java | 2 +- .../api/response/QuotaUpdateResponse.java | 2 +- .../api/command/QuotaBalanceCmdTest.java | 2 +- .../api/command/QuotaEmailTemplateListCmdTest.java | 2 +- .../cloudstack/mom/inmemory/InMemoryEventBus.java | 2 +- .../mom/inmemory/InMemoryEventBusTest.java | 2 +- .../com/cloud/deploy/SkipHeuresticsPlanner.java | 2 +- .../DotNet/ServerResource/WmiWrappers/Readme.txt | 4 - .../cloud/hypervisor/hyperv/guru/HypervGuru.java | 6 +- .../hyperv/manager/HypervManagerImpl.java | 2 +- .../hypervisor/kvm/resource/BridgeVifDriver.java | 5 +- .../hypervisor/kvm/resource/IvsVifDriver.java | 6 +- .../kvm/resource/LibvirtComputingResource.java | 2 +- .../hypervisor/kvm/resource/LibvirtConnection.java | 2 + .../hypervisor/kvm/resource/OvsVifDriver.java | 5 +- .../hypervisor/kvm/resource/VifDriverBase.java | 7 + .../wrapper/LibvirtAttachIsoCommandWrapper.java | 2 +- ...LibvirtCheckConsoleProxyLoadCommandWrapper.java | 2 +- .../wrapper/LibvirtCheckHealthCommandWrapper.java | 2 +- .../wrapper/LibvirtCheckNetworkCommandWrapper.java | 2 +- .../wrapper/LibvirtCheckOnHostCommandWrapper.java | 2 +- .../wrapper/LibvirtCheckSshCommandWrapper.java | 2 +- .../LibvirtCheckStorageAvailabilityWrapper.java | 2 +- .../resource/wrapper/LibvirtCheckUrlCommand.java | 19 +- .../LibvirtCheckVirtualMachineCommandWrapper.java | 2 +- .../LibvirtCleanupNetworkRulesCommandWrapper.java | 2 +- ...ePrivateTemplateFromSnapshotCommandWrapper.java | 2 +- .../LibvirtCreateStoragePoolCommandWrapper.java | 2 +- ...virtCreateVolumeFromSnapshotCommandWrapper.java | 2 +- .../LibvirtDeleteStoragePoolCommandWrapper.java | 2 +- .../wrapper/LibvirtDestroyCommandWrapper.java | 2 +- .../wrapper/LibvirtFenceCommandWrapper.java | 2 +- .../wrapper/LibvirtGetHostStatsCommandWrapper.java | 2 +- .../LibvirtGetStorageStatsCommandWrapper.java | 2 +- .../LibvirtGetVmIpAddressCommandWrapper.java | 2 +- .../wrapper/LibvirtGetVmStatsCommandWrapper.java | 2 +- .../wrapper/LibvirtGetVncPortCommandWrapper.java | 2 +- .../LibvirtHandleConfigDriveCommandWrapper.java | 2 +- .../wrapper/LibvirtMaintainCommandWrapper.java | 2 +- .../LibvirtManageSnapshotCommandWrapper.java | 2 +- .../wrapper/LibvirtMigrateCommandWrapper.java | 10 + .../LibvirtMigrateVolumeCommandWrapper.java | 232 +++++- .../LibvirtModifySshKeysCommandWrapper.java | 2 +- .../LibvirtModifyStoragePoolCommandWrapper.java | 2 +- .../LibvirtNetworkElementCommandWrapper.java | 2 +- .../LibvirtNetworkRulesSystemVmCommandWrapper.java | 2 +- .../wrapper/LibvirtNetworkUsageCommandWrapper.java | 2 +- .../LibvirtOvsCreateTunnelCommandWrapper.java | 2 +- .../LibvirtOvsDestroyBridgeCommandWrapper.java | 2 +- .../LibvirtOvsDestroyTunnelCommandWrapper.java | 2 +- .../LibvirtOvsFetchInterfaceCommandWrapper.java | 2 +- .../LibvirtOvsSetupBridgeCommandWrapper.java | 2 +- ...OvsVpcPhysicalTopologyConfigCommandWrapper.java | 2 +- ...irtOvsVpcRoutingPolicyConfigCommandWrapper.java | 2 +- .../LibvirtPatchSystemVmCommandWrapper.java | 1 - .../wrapper/LibvirtPingTestCommandWrapper.java | 2 +- ...ibvirtPrimaryStorageDownloadCommandWrapper.java | 2 +- .../wrapper/LibvirtPvlanSetupCommandWrapper.java | 2 +- .../wrapper/LibvirtRebootRouterCommandWrapper.java | 2 +- .../wrapper/LibvirtReplugNicCommandWrapper.java | 2 +- .../resource/wrapper/LibvirtRequestWrapper.java | 2 +- .../wrapper/LibvirtResizeVolumeCommandWrapper.java | 2 +- .../LibvirtStorageSubSystemCommandWrapper.java | 2 +- .../LibvirtUpdateHostPasswordCommandWrapper.java | 2 +- .../LibvirtUpgradeSnapshotCommandWrapper.java | 2 +- .../resource/wrapper/LibvirtUtilitiesHelper.java | 2 +- ...LibvirtWatchConsoleProxyLoadCommandWrapper.java | 2 +- .../kvm/storage/KVMStoragePoolManager.java | 3 +- .../kvm/storage/KVMStorageProcessor.java | 47 +- .../kvm/storage/LibvirtStorageAdaptor.java | 4 +- .../kvm/storage/ScaleIOStorageAdaptor.java | 1 + .../cloudstack/utils/qemu/QemuImageOptions.java | 11 +- .../cloudstack/utils/qemu/QemuImgException.java | 2 +- .../apache/cloudstack/utils/qemu/QemuImgFile.java | 2 +- .../cloud/hypervisor/kvm/dpdk/DpdkDriverTest.java | 2 +- .../kvm/resource/BridgeVifDriverTest.java | 2 +- .../kvm/resource/LibvirtSecretDefTest.java | 2 +- .../wrapper/LibvirtMigrateCommandWrapperTest.java | 45 ++ .../LibvirtMigrateVolumeCommandWrapperTest.java | 388 ++++++++++ .../kvm/storage/KVMPhysicalDiskTest.java | 2 +- .../kvm/storage/LibvirtStoragePoolTest.java | 2 +- .../kvm/storage/ScaleIOStoragePoolTest.java | 2 +- .../cloudstack/utils/linux/KVMHostInfoTest.java | 2 +- .../cloudstack/utils/qemu/QemuImgFileTest.java | 2 +- .../com/cloud/ovm/hypervisor/OvmResourceBase.java | 2 +- .../scripts/vm/hypervisor/ovm/OvmDiskModule.py | 2 +- .../scripts/vm/hypervisor/ovm/OvmHostModule.py | 2 +- .../main/scripts/vm/hypervisor/ovm/OvmVmModule.py | 2 +- .../apache/cloudstack/ha/SimulatorHAProvider.java | 2 +- .../driver/SimulatorImageStoreDriverImpl.java | 2 +- .../java/com/cloud/hypervisor/guru/VMwareGuru.java | 14 +- .../cloud/hypervisor/guru/VmwareVmImplementer.java | 8 +- .../vmware/manager/VmwareManagerImpl.java | 49 +- .../hypervisor/vmware/resource/VmwareResource.java | 25 +- .../storage/resource/VmwareStorageProcessor.java | 5 +- .../com/cloud/hypervisor/guru/VMwareGuruTest.java | 43 +- .../vmware/manager/VmwareManagerImplTest.java | 2 +- .../motion/VmwareStorageMotionStrategyTest.java | 2 +- .../xenserver/resource/XenServer56Resource.java | 2 +- .../xenserver/resource/XenServer610Resource.java | 2 +- .../resource/XenServer620SP1Resource.java | 2 +- .../resource/XenServerConnectionPool.java | 3 +- .../hypervisor/xenserver/resource/XsHost.java | 2 +- .../xenserver/resource/XsLocalNetwork.java | 2 +- ...XcpServerGetAutoScaleMetricsCommandWrapper.java | 2 +- .../xcp/XcpServerNetworkUsageCommandWrapper.java | 2 +- .../XenServer56CheckOnHostCommandWrapper.java | 2 +- .../xen56/XenServer56FenceCommandWrapper.java | 2 +- ...nServer56GetAutoScaleMetricsCommandWrapper.java | 2 +- .../XenServer56NetworkUsageCommandWrapper.java | 2 +- .../xen56p1/XenServer56FP1FenceCommandWrapper.java | 2 +- ...nServer610MigrateWithStorageCommandWrapper.java | 2 +- ...10MigrateWithStorageCompleteCommandWrapper.java | 2 +- ...610MigrateWithStorageReceiveCommandWrapper.java | 2 +- ...ver610MigrateWithStorageSendCommandWrapper.java | 2 +- .../XenServer620SP1GetGPUStatsCommandWrapper.java | 2 +- .../xenbase/CitrixAttachIsoCommandWrapper.java | 2 +- ...ixAttachOrDettachConfigDriveCommandWrapper.java | 2 +- .../CitrixCheckConsoleProxyLoadCommandWrapper.java | 2 +- .../xenbase/CitrixCheckHealthCommandWrapper.java | 2 +- .../xenbase/CitrixCheckNetworkCommandWrapper.java | 2 +- .../xenbase/CitrixCheckOnHostCommandWrapper.java | 2 +- .../xenbase/CitrixCheckSshCommandWrapper.java | 2 +- .../CitrixCheckVirtualMachineCommandWrapper.java | 2 +- .../CitrixCleanupNetworkRulesCmdWrapper.java | 2 +- .../CitrixClusterVMMetaDataSyncCommandWrapper.java | 2 +- ...itrixCoppyToSecondaryStorageCommandWrapper.java | 2 +- .../xenbase/CitrixCreateCommandWrapper.java | 2 +- .../CitrixCreateStoragePoolCommandWrapper.java | 2 +- .../CitrixCreateVMSnapshotCommandWrapper.java | 2 +- .../CitrixDeleteStoragePoolCommandWrapper.java | 2 +- .../CitrixDeleteVMSnapshotCommandWrapper.java | 2 +- .../xenbase/CitrixDestroyCommandWrapper.java | 2 +- .../xenbase/CitrixGetHostStatsCommandWrapper.java | 2 +- .../CitrixGetStorageStatsCommandWrapper.java | 2 +- .../CitrixGetVmIpAddressCommandWrapper.java | 2 +- .../CitrixGetVmNetworkStatsCommandWrapper.java | 2 +- .../xenbase/CitrixGetVmStatsCommandWrapper.java | 2 +- .../xenbase/CitrixGetVncPortCommandWrapper.java | 2 +- .../CitrixGetVolumeStatsCommandWrapper.java | 2 +- .../xenbase/CitrixMaintainCommandWrapper.java | 2 +- .../xenbase/CitrixMigrateCommandWrapper.java | 2 +- .../xenbase/CitrixModifySshKeysCommandWrapper.java | 2 +- .../CitrixModifyStoragePoolCommandWrapper.java | 2 +- .../CitrixNetworkElementCommandWrapper.java | 2 +- .../CitrixNetworkRulesSystemVmCommandWrapper.java | 2 +- ...rixNetworkRulesVmSecondaryIpCommandWrapper.java | 2 +- .../CitrixOvsCreateGreTunnelCommandWrapper.java | 2 +- .../CitrixOvsCreateTunnelCommandWrapper.java | 2 +- .../xenbase/CitrixOvsDeleteFlowCommandWrapper.java | 2 +- .../CitrixOvsDestroyBridgeCommandWrapper.java | 2 +- .../CitrixOvsDestroyTunnelCommandWrapper.java | 2 +- .../CitrixOvsFetchInterfaceCommandWrapper.java | 2 +- .../CitrixOvsSetTagAndFlowCommandWrapper.java | 2 +- .../CitrixOvsSetupBridgeCommandWrapper.java | 2 +- ...OvsVpcPhysicalTopologyConfigCommandWrapper.java | 2 +- ...rixOvsVpcRoutingPolicyConfigCommandWrapper.java | 2 +- .../CitrixPerformanceMonitorCommandWrapper.java | 2 +- .../xenbase/CitrixPingTestCommandWrapper.java | 2 +- .../xenbase/CitrixPlugNicCommandWrapper.java | 2 +- .../CitrixPrepareForMigrationCommandWrapper.java | 2 +- ...CitrixPrimaryStorageDownloadCommandWrapper.java | 2 +- .../xenbase/CitrixPvlanSetupCommandWrapper.java | 2 +- .../wrapper/xenbase/CitrixReadyCommandWrapper.java | 2 +- .../xenbase/CitrixRebootCommandWrapper.java | 2 +- .../xenbase/CitrixRebootRouterCommandWrapper.java | 2 +- .../CitrixRevertToVMSnapshotCommandWrapper.java | 2 +- .../xenbase/CitrixScaleVmCommandWrapper.java | 2 +- .../CitrixSecurityGroupRulesCommandWrapper.java | 2 +- .../wrapper/xenbase/CitrixSetupCommandWrapper.java | 2 +- .../wrapper/xenbase/CitrixStopCommandWrapper.java | 2 +- .../CitrixStorageSubSystemCommandWrapper.java | 2 +- .../xenbase/CitrixUnPlugNicCommandWrapper.java | 2 +- .../CitrixUpdateHostPasswordCommandWrapper.java | 2 +- .../CitrixUpgradeSnapshotCommandWrapper.java | 2 +- .../CitrixWatchConsoleProxyLoadCommandWrapper.java | 2 +- .../xenserver/ExtraConfigurationUtility.java | 2 +- .../xenserver/resource/CitrixHelperTest.java | 2 +- .../wrapper/xenbase/XcpServerWrapperTest.java | 2 +- .../wrapper/xenbase/XenServer56FP1WrapperTest.java | 2 +- .../wrapper/xenbase/XenServer56WrapperTest.java | 2 +- .../wrapper/xenbase/XenServer610WrapperTest.java | 2 +- .../xenbase/XenServer620SP1WrapperTest.java | 2 +- .../wrapper/xenbase/XenServer620WrapperTest.java | 2 +- .../cloudstack/cloudian/CloudianClientTest.java | 2 +- .../cluster/KubernetesClusterManagerImpl.java | 145 ++-- .../KubernetesClusterActionWorker.java | 170 ++-- .../KubernetesClusterDestroyWorker.java | 71 +- ...ernetesClusterResourceModifierActionWorker.java | 331 ++++++-- .../KubernetesClusterScaleWorker.java | 92 ++- .../KubernetesClusterStartWorker.java | 140 +--- .../src/main/resources/conf/k8s-control-node.yml | 1 - .../cluster/KubernetesClusterManagerImplTest.java | 213 ++++++ .../KubernetesClusterActionWorkerTest.java | 133 ++++ .../version/KubernetesVersionServiceTest.java | 2 +- .../cloudstack/metrics/MetricsServiceImpl.java | 4 +- .../response/VmMetricsStatsResponse.java | 2 +- .../cloud/network/brocade/BrocadeVcsApiTest.java | 2 +- .../cloud/network/cisco/CiscoAsa1000vDevice.java | 2 +- .../cloud/network/cisco/CiscoVnmcConnection.java | 2 +- .../cloud/network/cisco/CiscoVnmcController.java | 2 +- .../cloud/network/cisco/NetworkAsa1000vMap.java | 2 +- .../contrail/model/VirtualMachineModelTest.java | 2 +- .../contrail/model/VirtualNetworkModelTest.java | 2 +- .../commands/ListNetscalerControlCenterCmd.java | 2 +- .../api/commands/RegisterServicePackageCmd.java | 2 +- .../response/NetScalerServicePackageResponse.java | 2 +- .../NetscalerLoadBalancerElementService.java | 2 +- .../com/cloud/network/vm/NetScalerVMManager.java | 2 +- .../cloud/network/vm/NetScalerVMManagerImpl.java | 2 +- .../cloud/network/nicira/LogicalRouterPort.java | 2 +- .../com/cloud/network/nicira/NatRuleAdapter.java | 2 +- .../cloud/network/nicira/RoutingConfigAdapter.java | 2 +- .../network/resource/NiciraNvpRequestWrapper.java | 2 +- .../cloud/network/resource/NiciraNvpUtilities.java | 2 +- ...ConfigurePortForwardingRulesCommandWrapper.java | 2 +- .../NiciraNvpConfigurePublicIpsCommandWrapper.java | 2 +- ...raNvpConfigureStaticNatRulesCommandWrapper.java | 2 +- ...NiciraNvpCreateLogicalRouterCommandWrapper.java | 2 +- ...NiciraNvpCreateLogicalSwitchCommandWrapper.java | 2 +- ...raNvpCreateLogicalSwitchPortCommandWrapper.java | 2 +- ...NiciraNvpDeleteLogicalRouterCommandWrapper.java | 2 +- ...NiciraNvpDeleteLogicalSwitchCommandWrapper.java | 2 +- ...raNvpDeleteLogicalSwitchPortCommandWrapper.java | 2 +- ...ciraNvpFindLogicalSwitchPortCommandWrapper.java | 2 +- .../wrapper/NiciraNvpMaintainCommandWrapper.java | 2 +- .../wrapper/NiciraNvpReadyCommandWrapper.java | 2 +- ...raNvpUpdateLogicalSwitchPortCommandWrapper.java | 2 +- .../cloud/network/utils/CommandRetryUtility.java | 2 +- .../network/element/NiciraNvpElementTest.java | 2 +- .../guru/NiciraNvpGuestNetworkGuruTest.java | 2 +- .../com/cloud/network/nicira/NiciraTagTest.java | 2 +- .../resource/NiciraNvpRequestWrapperTest.java | 2 +- .../api/NeutronInvalidCredentialsException.java | 2 +- .../network/opendaylight/api/NeutronRestApi.java | 2 +- .../opendaylight/api/NeutronRestApiException.java | 2 +- .../opendaylight/api/NeutronRestFactory.java | 2 +- .../api/enums/NeutronNorthboundEnum.java | 2 +- .../opendaylight/api/model/NeutronNetwork.java | 2 +- .../api/model/NeutronNetworkWrapper.java | 2 +- .../api/model/NeutronNetworksList.java | 2 +- .../opendaylight/api/model/NeutronNode.java | 2 +- .../opendaylight/api/model/NeutronNodeWrapper.java | 2 +- .../opendaylight/api/model/NeutronNodesList.java | 2 +- .../opendaylight/api/model/NeutronPort.java | 2 +- .../opendaylight/api/model/NeutronPortWrapper.java | 2 +- .../opendaylight/api/model/NeutronPortsList.java | 2 +- .../network/opendaylight/api/resources/Action.java | 2 +- .../resources/NeutronNetworksNorthboundAction.java | 2 +- .../resources/NeutronNodesNorthboundAction.java | 2 +- .../resources/NeutronPortsNorthboundAction.java | 2 +- .../opendaylight/api/test/NeutronEnumsTest.java | 2 +- .../api/test/NeutronNetworkAdapterTest.java | 2 +- .../api/test/NeutronNodeAdapterTest.java | 2 +- .../api/test/NeutronPortAdapterTest.java | 2 +- .../opendaylight/api/test/NeutronRestApiIT.java | 2 +- .../opendaylight/api/test/NeutronRestApiTest.java | 2 +- .../api/OvsVpcPhysicalTopologyConfigCommand.java | 2 +- .../api/OvsVpcRoutingPolicyConfigCommand.java | 2 +- .../network/resource/MockablePaloAltoResource.java | 2 +- .../api/CreateTungstenVirtualMachineCommand.java | 2 +- .../api/DeleteTungstenAddressGroupCommand.java | 2 +- .../DeleteTungstenApplicationPolicySetCommand.java | 2 +- .../api/DeleteTungstenFirewallPolicyCommand.java | 2 +- .../api/DeleteTungstenFirewallRuleCommand.java | 2 +- .../agent/api/DeleteTungstenPolicyCommand.java | 2 +- .../DeleteTungstenRoutingLogicalRouterCommand.java | 2 +- .../api/DeleteTungstenServiceGroupCommand.java | 2 +- .../agent/api/DeleteTungstenTagCommand.java | 2 +- .../agent/api/DeleteTungstenTagTypeCommand.java | 2 +- .../agent/api/DeleteTungstenVmCommand.java | 2 +- .../agent/api/RemoveTungstenPolicyRuleCommand.java | 2 +- .../agent/api/RemoveTungstenTagCommand.java | 2 +- .../command/ConfigTungstenFabricServiceCmd.java | 35 +- .../command/ListTungstenFabricProvidersCmd.java | 1 - .../network/tungsten/vrouter/Gateway.java | 1 - .../network/tungsten/vrouter/Subnet.java | 1 - .../ListTungstenFabricProvidersCmdTest.java | 1 - .../driver/ipmitool/IpmitoolWrapper.java | 2 +- .../ElastistorPrimaryDataStoreProvider.java | 2 +- .../lifecycle/DateraPrimaryDataStoreLifeCycle.java | 2 +- .../datastore/client/ScaleIOGatewayClientImpl.java | 2 +- .../driver/ScaleIOPrimaryDataStoreDriver.java | 279 ++++++- .../datastore/provider/ScaleIOHostListener.java | 6 +- .../client/ScaleIOGatewayClientImplTest.java | 2 +- .../driver/ScaleIOPrimaryDataStoreDriverTest.java | 527 +++++++++++++ plugins/storage/volume/storpool/README.md | 8 + .../storage/StorPoolSetVolumeEncryptionAnswer.java | 31 +- .../StorPoolSetVolumeEncryptionCommand.java | 70 ++ .../StorPoolSetVolumeEncryptionCommandWrapper.java | 161 ++++ .../driver/StorPoolPrimaryDataStoreDriver.java | 159 +++- .../datastore/driver/StorPoolStatsCollector.java | 188 +++++ .../storage/datastore/util/StorPoolUtil.java | 12 + .../storage/motion/StorPoolDataMotionStrategy.java | 3 + .../snapshot/StorPoolConfigurationManager.java | 12 +- .../spring-storage-volume-storpool-context.xml | 3 + .../cloudstack/api/command/LdapListUsersCmd.java | 2 +- .../cloudstack/api/command/LdapUserSearchCmd.java | 2 +- .../api/response/LdapConfigurationResponse.java | 2 +- .../cloudstack/api/response/LdapUserResponse.java | 2 +- .../cloudstack/ldap/LdapConfigurationVO.java | 2 +- .../apache/cloudstack/ldap/LdapContextFactory.java | 2 +- .../org/apache/cloudstack/ldap/LdapManager.java | 2 +- .../java/org/apache/cloudstack/ldap/LdapUser.java | 2 +- .../java/org/apache/cloudstack/ldap/LdapUtils.java | 2 +- .../ldap/NoLdapUserMatchingQueryException.java | 2 +- .../cloudstack/ldap/OpenLdapUserManagerImpl.java | 2 +- .../cloudstack/ldap/dao/LdapConfigurationDao.java | 2 +- .../api/command/LdapConfigurationChanger.java | 2 +- .../api/command/LdapCreateAccountCmdTest.java | 2 +- .../api/command/LdapImportUsersCmdTest.java | 2 +- .../cloudstack/ldap/LdapAuthenticatorTest.java | 2 +- .../cloudstack/ldap/LdapConfigurationTest.java | 2 +- .../apache/cloudstack/ldap/LdapTestConfigTool.java | 2 +- .../ldap/LdapUnboundidZapdotConnectionTest.java | 2 +- .../cloudstack/ldap/LdapUnitConnectionTest.java | 2 +- .../ldap/LdapUserManagerFactoryTest.java | 2 +- .../api/command/ListSamlAuthorizationCmd.java | 2 +- .../api/command/SAML2LoginAPIAuthenticatorCmd.java | 7 +- .../java/org/apache/cloudstack/SAMLUtilsTest.java | 2 +- pom.xml | 24 +- requirements.txt | 2 +- .../storage/secondary/cloud-install-sys-tmplt.py | 2 +- scripts/vm/hypervisor/ovm3/storagehealth.py | 2 +- scripts/vm/hypervisor/versions.sh | 4 +- .../hypervisor/xenserver/cloudstack_pluginlib.py | 2 +- .../com/cloud/alert/ConsoleProxyAlertAdapter.java | 169 ++-- .../alert/SecondaryStorageVmAlertAdapter.java | 173 +++-- .../java/com/cloud/api/ApiAsyncJobDispatcher.java | 4 +- server/src/main/java/com/cloud/api/ApiServer.java | 11 +- ...ListUserTwoFactorAuthenticatorProvidersCmd.java | 2 +- .../java/com/cloud/api/query/QueryManagerImpl.java | 99 +-- .../java/com/cloud/api/query/dao/HostTagDao.java | 2 +- .../com/cloud/api/query/dao/HostTagDaoImpl.java | 2 +- .../cloud/api/query/dao/StoragePoolJoinDao.java | 6 + .../api/query/dao/StoragePoolJoinDaoImpl.java | 75 ++ .../api/query/dao/VpcOfferingJoinDaoImpl.java | 2 +- .../java/com/cloud/api/query/vo/HostTagVO.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 36 +- .../cloud/consoleproxy/ConsoleProxyService.java | 2 +- .../com/cloud/dc/dao/DedicatedResourceDao.java | 2 +- .../deploy/DeploymentPlanningManagerImpl.java | 14 +- .../deploy/dao/PlannerHostReservationDaoImpl.java | 2 +- .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 2 +- .../main/java/com/cloud/hypervisor/KVMGuru.java | 2 +- .../kvm/discoverer/LibvirtServerDiscoverer.java | 8 +- .../ExternalLoadBalancerDeviceManagerImpl.java | 8 +- .../java/com/cloud/network/NetworkModelImpl.java | 30 +- .../java/com/cloud/network/NetworkServiceImpl.java | 78 +- .../com/cloud/network/PortProfileManagerImpl.java | 2 +- .../network/element/ConfigDriveNetworkElement.java | 14 +- .../com/cloud/network/guru/ControlNetworkGuru.java | 6 +- .../cloud/network/router/CommandSetupHelper.java | 16 +- .../com/cloud/network/router/NicProfileHelper.java | 2 +- .../cloud/network/router/RouterControlHelper.java | 2 +- .../com/cloud/network/rules/AdvancedVpnRules.java | 2 +- .../com/cloud/network/rules/BasicVpnRules.java | 2 +- .../com/cloud/network/rules/DhcpEntryRules.java | 2 +- .../com/cloud/network/rules/DhcpPvlanRules.java | 2 +- .../cloud/network/rules/IpAssociationRules.java | 2 +- .../com/cloud/network/rules/NetworkAclsRules.java | 2 +- .../cloud/network/rules/PasswordToRouterRules.java | 2 +- .../cloud/network/rules/PrivateGatewayRules.java | 2 +- .../java/com/cloud/network/rules/RuleApplier.java | 2 +- .../cloud/network/rules/RuleApplierWrapper.java | 2 +- .../cloud/network/rules/SshKeyToRouterRules.java | 2 +- .../com/cloud/network/rules/StaticNatRules.java | 2 +- .../com/cloud/network/rules/StaticRoutesRules.java | 2 +- .../com/cloud/network/rules/UserdataPwdRules.java | 2 +- .../cloud/network/rules/UserdataToRouterRules.java | 2 +- .../cloud/network/rules/VpcIpAssociationRules.java | 2 +- .../cloud/network/vpc/NetworkACLManagerImpl.java | 13 +- .../cloud/network/vpc/NetworkACLServiceImpl.java | 18 +- .../java/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- .../vpc/VpcPrivateGatewayTransactionCallable.java | 2 +- .../com/cloud/resource/ResourceManagerImpl.java | 29 +- .../cloud/resourcelimit/CheckedReservation.java | 20 +- .../resourcelimit/ResourceLimitManagerImpl.java | 63 +- .../com/cloud/server/ManagementServerImpl.java | 5 +- .../main/java/com/cloud/server/StatsCollector.java | 12 +- .../ConsoleProxyPasswordBasedEncryptor.java | 71 +- .../com/cloud/servlet/ConsoleProxyServlet.java | 26 +- .../com/cloud/storage/ImageStoreUploadMonitor.java | 2 +- .../java/com/cloud/storage/StorageManagerImpl.java | 44 +- .../com/cloud/storage/VolumeApiServiceImpl.java | 208 ++--- .../cloud/storage/download/DownloadMonitor.java | 2 +- .../secondary/SecondaryStorageVmManager.java | 8 + .../com/cloud/storage/upload/UploadMonitor.java | 2 +- .../cloud/template/HypervisorTemplateAdapter.java | 9 +- .../src/main/java/com/cloud/test/TestAppender.java | 2 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 288 ++++--- .../org/apache/cloudstack/acl/RoleManagerImpl.java | 8 +- .../IndirectAgentLBRoundRobinAlgorithm.java | 2 +- .../algorithm/IndirectAgentLBShuffleAlgorithm.java | 2 +- .../algorithm/IndirectAgentLBStaticAlgorithm.java | 2 +- .../cloudstack/backup/BackupManagerImpl.java | 2 +- .../diagnostics/DiagnosticsServiceImpl.java | 2 +- .../direct/download/DirectDownloadManagerImpl.java | 2 +- .../java/org/apache/cloudstack/ha/HAManager.java | 2 +- .../network/topology/AdvancedNetworkVisitor.java | 2 +- .../network/topology/BasicNetworkTopology.java | 2 +- .../network/topology/BasicNetworkVisitor.java | 2 +- .../network/topology/NetworkTopology.java | 2 +- .../network/topology/NetworkTopologyContext.java | 2 +- .../network/topology/NetworkTopologyVisitor.java | 2 +- .../OutOfBandManagementServiceImpl.java | 3 +- .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 2 +- .../java/com/cloud/alert/AlertManagerImplTest.java | 2 +- .../test/java/com/cloud/api/ApiDispatcherTest.java | 2 +- .../com/cloud/api/query/QueryManagerImplTest.java | 2 +- .../query/dao/SecurityGroupJoinDaoImplTest.java | 2 +- .../api/query/dao/TemplateJoinDaoImplTest.java | 2 +- .../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 2 +- .../ConfigurationManagerImplTest.java | 65 +- .../cloud/event/ActionEventInterceptorTest.java | 2 +- .../com/cloud/network/IpAddressManagerTest.java | 2 +- .../com/cloud/network/NetworkModelImplTest.java | 2 +- .../com/cloud/network/as/AutoScaleManagerTest.java | 2 +- .../element/VpcVirtualRouterElementTest.java | 2 +- .../cloud/network/lb/UpdateLoadBalancerTest.java | 2 +- .../{ => network}/vpc/NetworkACLManagerTest.java | 52 +- .../network/vpc/NetworkACLServiceImplTest.java | 37 +- .../cloud/resource/ResourceManagerImplTest.java | 51 ++ .../resourceicon/ResourceIconManagerImplTest.java | 2 +- .../resourcelimit/CheckedReservationTest.java | 2 +- .../ResourceLimitManagerImplTest.java | 2 +- .../com/cloud/storage/StorageManagerImplTest.java | 72 +- .../cloud/storage/VolumeApiServiceImplTest.java | 168 ++-- .../storage/listener/StoragePoolMonitorTest.java | 2 +- .../template/HypervisorTemplateAdapterTest.java | 46 +- .../java/com/cloud/vm/FirstFitPlannerTest.java | 2 +- .../cloud/vm/dao/UserVmDaoTestConfiguration.java | 2 +- .../apache/cloudstack/acl/RoleManagerImplTest.java | 2 +- .../IndirectAgentLBRoundRobinAlgorithmTest.java | 2 +- .../IndirectAgentLBShuffleAlgorithmTest.java | 2 +- .../IndirectAgentLBStaticAlgorithmTest.java | 2 +- .../annotation/AnnotationManagerImplTest.java | 2 +- .../cloudstack/backup/BackupManagerTest.java | 2 +- .../apache/cloudstack/ca/CABackgroundTaskTest.java | 2 +- .../apache/cloudstack/ca/CAManagerImplTest.java | 2 +- .../DiagnosticsFilesListFactoryTest.java | 2 +- .../diagnostics/DiagnosticsServiceImplTest.java | 2 +- .../poll/BackgroundPollManagerImplTest.java | 2 +- .../cloudstack/privategw/AclOnPrivateGwTest.java | 2 +- .../cloudstack/service/ServiceOfferingVOTest.java | 2 +- .../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 2 +- .../main/java/rdpclient/ntlmssp/package-info.java | 1 - .../java/rdpclient/rdp/ClientSynchronizePDU.java | 1 - .../com/cloud/consoleproxy/AjaxFIFOImageCache.java | 2 +- .../consoleproxy/AuthenticationException.java | 2 +- .../ConsoleProxyPasswordBasedEncryptor.java | 78 +- .../consoleproxy/vnc/BufferedImageCanvas.java | 2 +- .../com/cloud/consoleproxy/vnc/NoVncClient.java | 2 +- .../vnc/packet/server/AbstractRect.java | 2 +- .../consoleproxy/ConsoleProxyNoVncClientTest.java | 2 +- .../SecondaryStorageManagerImpl.java | 104 ++- .../SecondaryStorageManagerImplTest.java | 89 +++ .../storage/resource/HttpUploadServerHandler.java | 85 +- .../resource/NfsSecondaryStorageResource.java | 14 +- .../storage/template/DownloadManager.java | 2 +- .../resource/HttpUploadServerHandlerTest.java | 74 ++ .../resource/NfsSecondaryStorageResourceTest.java | 17 + systemvm/agent/noVNC/app/error-handler.js | 107 +-- systemvm/agent/noVNC/app/images/icons/Makefile | 68 +- .../agent/noVNC/app/images/icons/novnc-ios-120.png | 0 .../agent/noVNC/app/images/icons/novnc-ios-152.png | 0 .../agent/noVNC/app/images/icons/novnc-ios-167.png | 0 .../agent/noVNC/app/images/icons/novnc-ios-180.png | 0 .../agent/noVNC/app/images/icons/novnc-ios-40.png | 0 .../agent/noVNC/app/images/icons/novnc-ios-58.png | 0 .../agent/noVNC/app/images/icons/novnc-ios-60.png | 0 .../agent/noVNC/app/images/icons/novnc-ios-80.png | 0 .../agent/noVNC/app/images/icons/novnc-ios-87.png | 0 .../noVNC/app/images/icons/novnc-ios-icon.svg | 183 +++++ .../agent/noVNC/app/images/icons/novnc.ico | 0 systemvm/agent/noVNC/app/locale/es.json | 22 +- systemvm/agent/noVNC/app/locale/fr.json | 78 ++ systemvm/agent/noVNC/app/locale/it.json | 72 ++ systemvm/agent/noVNC/app/locale/ja.json | 17 +- systemvm/agent/noVNC/app/locale/pt_BR.json | 72 ++ systemvm/agent/noVNC/app/locale/ru.json | 31 +- systemvm/agent/noVNC/app/locale/sv.json | 12 +- systemvm/agent/noVNC/app/localization.js | 11 +- systemvm/agent/noVNC/app/styles/base.css | 394 +++++----- systemvm/agent/noVNC/app/styles/input.css | 281 +++++++ systemvm/agent/noVNC/app/ui.js | 113 ++- systemvm/agent/noVNC/app/webutil.js | 75 +- systemvm/agent/noVNC/core/decoders/jpeg.js | 141 ++++ systemvm/agent/noVNC/core/decoders/raw.js | 2 +- systemvm/agent/noVNC/core/decoders/zrle.js | 185 +++++ systemvm/agent/noVNC/core/des.js | 2 +- systemvm/agent/noVNC/core/display.js | 29 +- systemvm/agent/noVNC/core/encodings.js | 4 + systemvm/agent/noVNC/core/input/domkeytable.js | 46 +- systemvm/agent/noVNC/core/input/keyboard.js | 149 +--- systemvm/agent/noVNC/core/input/util.js | 53 +- systemvm/agent/noVNC/core/input/vkeys.js | 1 - systemvm/agent/noVNC/core/input/xtscancodes.js | 8 +- systemvm/agent/noVNC/core/ra2.js | 567 ++++++++++++++ systemvm/agent/noVNC/core/rfb.js | 765 +++++++++++++----- systemvm/agent/noVNC/core/util/browser.js | 72 +- systemvm/agent/noVNC/core/util/cursor.js | 16 +- systemvm/agent/noVNC/core/util/events.js | 4 - systemvm/agent/noVNC/core/util/md5.js | 79 ++ systemvm/agent/noVNC/core/util/polyfill.js | 61 -- systemvm/agent/noVNC/core/websock.js | 93 ++- systemvm/agent/noVNC/docs/novnc_proxy.1 | 37 + systemvm/agent/noVNC/package.json | 72 +- systemvm/agent/noVNC/po/fr.po | 300 ++++++++ systemvm/agent/noVNC/po/it.po | 300 ++++++++ systemvm/agent/noVNC/po/pt_BR.po | 299 ++++++++ systemvm/agent/noVNC/utils/convert.js | 140 ++++ .../vendor/browser-es-module-loader/README.md | 15 - .../vendor/browser-es-module-loader/genworker.js | 13 - .../browser-es-module-loader/rollup.config.js | 15 - .../browser-es-module-loader/src/babel-worker.js | 23 - .../src/browser-es-module-loader.js | 279 ------- systemvm/agent/noVNC/vendor/promise.js | 255 ------ systemvm/agent/noVNC/vnc.html | 142 ++-- systemvm/agent/noVNC/vnc_lite.html | 24 +- systemvm/agent/scripts/ipfirewall.sh | 2 +- systemvm/agent/scripts/ssvm-check.sh | 27 +- systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 2 +- systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 16 +- systemvm/debian/opt/cloud/bin/setup/common.sh | 6 +- test/integration/component/test_configdrive.py | 2 +- .../component/test_deploy_vm_userdata_multi_nic.py | 2 +- .../component/test_deploy_vm_userdata_reg.py | 2 +- .../plugins/scaleio/test_scaleio_volumes.py | 243 ++++++ .../plugins/storpool/TestEncryptedVolumes.py | 681 +++++++++++++++++ test/integration/plugins/storpool/sp_util.py | 22 +- test/integration/smoke/test_kubernetes_clusters.py | 140 +++- test/integration/smoke/test_register_userdata.py | 66 ++ test/integration/smoke/test_vpc_vpn.py | 297 ++----- .../com/cloud/test/longrun/PerformanceWithAPI.java | 2 +- .../java/com/cloud/test/ui/AddAndDeleteAISO.java | 2 +- .../com/cloud/test/ui/AddAndDeleteATemplate.java | 2 +- tools/appliance/README.md | 1 - tools/appliance/systemvmtemplate/template.json | 4 +- tools/build/setnextversion.sh | 1 - tools/devcloud4/advanced/README.md | 2 - tools/marvin/marvin/cloudstackConnection.py | 2 +- tools/marvin/marvin/config/test_data.py | 851 ++++++++++++--------- tools/marvin/marvin/deployDataCenter.py | 2 +- tools/marvin/marvin/lib/utils.py | 2 +- tools/marvin/marvin/misc/build/README.md | 1 - tools/ngui/requester.py | 2 +- ui/.env.primate-qa | 2 +- ui/public/locales/en.json | 30 +- ui/src/components/view/InfoCard.vue | 19 +- ui/src/components/view/ListView.vue | 4 + ui/src/components/view/UploadResourceIcon.vue | 2 +- ui/src/config/router.js | 4 +- ui/src/config/section/account.js | 4 + ui/src/config/section/compute.js | 2 +- ui/src/config/section/infra/clusters.js | 4 + ui/src/config/section/infra/hosts.js | 4 + ui/src/config/section/infra/pods.js | 4 + ui/src/config/section/infra/primaryStorages.js | 4 + ui/src/config/section/infra/routers.js | 4 + ui/src/config/section/infra/systemVms.js | 4 + ui/src/config/section/network.js | 3 +- ui/src/config/section/offering.js | 37 +- ui/src/config/section/plugin/quota.js | 4 +- ui/src/config/section/zone.js | 45 ++ ui/src/core/lazy_lib/icons_use.js | 2 + ui/src/utils/plugins.js | 10 +- ui/src/views/AutogenView.vue | 50 +- ui/src/views/compute/AutoScaleUpPolicyTab.vue | 4 +- ui/src/views/compute/AutoScaleVmProfile.vue | 31 +- ui/src/views/compute/CreateAutoScaleVmGroup.vue | 15 +- ui/src/views/compute/DeployVM.vue | 18 +- ui/src/views/compute/EditVM.vue | 3 +- ui/src/views/compute/KubernetesServiceTab.vue | 5 + ui/src/views/compute/RegisterUserData.vue | 10 +- ui/src/views/compute/ResetUserData.vue | 10 +- ui/src/views/compute/ScaleKubernetesCluster.vue | 75 +- ui/src/views/compute/ScaleVM.vue | 2 + ui/src/views/compute/StartVirtualMachine.vue | 14 +- .../views/compute/wizard/MultiNetworkSelection.vue | 2 +- ui/src/views/dashboard/UsageDashboard.vue | 4 +- .../views/image/AddKubernetesSupportedVersion.vue | 5 +- ui/src/views/infra/AddPrimaryStorage.vue | 5 - ui/src/views/infra/HostInfo.vue | 9 +- ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 14 +- ui/src/views/network/CreateIsolatedNetworkForm.vue | 95 ++- ui/src/views/network/CreateL2NetworkForm.vue | 67 +- ui/src/views/network/CreateNetwork.vue | 2 +- .../views/network/IngressEgressRuleConfigure.vue | 7 +- ui/src/views/network/VpcTiersTab.vue | 1 + ui/src/views/storage/MigrateVolume.vue | 2 + ui/src/views/tools/ImportUnmanagedInstance.vue | 10 + ui/tests/unit/views/AutogenView.spec.js | 2 +- .../com/cloud/usage/parser/BackupUsageParser.java | 2 +- .../java/com/cloud/usage/UsageManagerImplTest.java | 2 +- utils/src/main/java/com/cloud/utils/Profiler.java | 2 +- .../src/main/java/com/cloud/utils/StringUtils.java | 7 + utils/src/main/java/com/cloud/utils/SwiftUtil.java | 2 +- .../main/java/com/cloud/utils/TungstenUtils.java | 2 +- utils/src/main/java/com/cloud/utils/UriUtils.java | 118 +-- utils/src/main/java/com/cloud/utils/UuidUtils.java | 2 +- .../com/cloud/utils/crypt/AeadBase64Encryptor.java | 13 +- .../main/java/com/cloud/utils/nio/NioClient.java | 2 +- utils/src/main/java/com/cloud/utils/nio/Task.java | 2 +- .../java/com/cloud/utils/storage/QCOW2Utils.java | 2 +- .../com/cloud/utils/storage/S3/ClientOptions.java | 2 +- .../utils/storage/S3/ObjectNamingStrategy.java | 2 +- .../utils/graphite/GraphiteException.java | 2 +- .../utils/imagestore/ImageStoreUtil.java | 1 - .../utils/security/SecureSSLSocketFactory.java | 2 +- .../test/java/com/cloud/utils/StringUtilsTest.java | 10 + .../test/java/com/cloud/utils/TestProfiler.java | 2 +- .../test/java/com/cloud/utils/UriUtilsTest.java | 14 +- .../crypto/EncryptionSecretKeyCheckerTest.java | 2 +- .../cloudstack/utils/security/CertUtilsTest.java | 2 +- .../utils/security/DigestHelperTest.java | 2 +- .../hypervisor/vmware/mo/PbmProfileManagerMO.java | 2 - .../hypervisor/vmware/mo/DatastoreMOTest.java | 2 +- .../hypervisor/vmware/mo/VirtualMachineMOTest.java | 2 +- .../vmware/util/VmwareContextPoolTest.java | 2 +- .../hypervisor/vmware/util/VmwareContextTest.java | 2 +- 974 files changed, 13817 insertions(+), 5778 deletions(-) delete mode 100644 agent/src/main/java/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java delete mode 100644 agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java create mode 100644 core/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadHelper.java rename {agent/src/main/java/com/cloud/agent => core/src/main/java/org/apache/cloudstack}/direct/download/DirectTemplateDownloader.java (58%) rename {agent/src/main/java/com/cloud/agent => core/src/main/java/org/apache/cloudstack}/direct/download/DirectTemplateDownloaderImpl.java (80%) rename {agent/src/main/java/com/cloud/agent => core/src/main/java/org/apache/cloudstack}/direct/download/HttpDirectTemplateDownloader.java (61%) create mode 100644 core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java create mode 100644 core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java create mode 100644 core/src/main/java/org/apache/cloudstack/direct/download/MetalinkDirectTemplateDownloader.java rename {agent/src/main/java/com/cloud/agent => core/src/main/java/org/apache/cloudstack}/direct/download/NfsDirectTemplateDownloader.java (77%) copy engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveTest.java => core/src/test/java/com/cloud/storage/JavaStorageLayerTest.java (62%) create mode 100644 core/src/test/java/org/apache/cloudstack/direct/download/BaseDirectTemplateDownloaderTest.java copy engine/schema/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadCertificateDao.java => core/src/test/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloaderTest.java (62%) copy engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveTest.java => core/src/test/java/org/apache/cloudstack/direct/download/MetalinkDirectTemplateDownloaderTest.java (62%) create mode 100644 engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestratorTest.java create mode 100644 engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/TemplateServiceImplTest.java create mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImplTest.java delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/dao/ServiceOfferingDao.java delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/dao/ServiceOfferingDaoImpl.java delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapperTest.java create mode 100644 plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImplTest.java create mode 100644 plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorkerTest.java create mode 100644 plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriverTest.java copy core/src/main/java/com/cloud/agent/api/storage/MigrateVolumeAnswer.java => plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolSetVolumeEncryptionAnswer.java (62%) create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolSetVolumeEncryptionCommand.java create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolSetVolumeEncryptionCommandWrapper.java create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolStatsCollector.java rename server/src/test/java/com/cloud/{ => network}/vpc/NetworkACLManagerTest.java (92%) create mode 100644 services/secondary-storage/controller/src/test/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImplTest.java create mode 100644 services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandlerTest.java copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-120.png (100%) copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-152.png (100%) copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-167.png (100%) copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-180.png (100%) copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-40.png (100%) copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-58.png (100%) copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-60.png (100%) copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-80.png (100%) copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc-ios-87.png (100%) create mode 100644 systemvm/agent/noVNC/app/images/icons/novnc-ios-icon.svg copy tools/devcloud4/common/binary-installation/README.md => systemvm/agent/noVNC/app/images/icons/novnc.ico (100%) create mode 100644 systemvm/agent/noVNC/app/locale/fr.json create mode 100644 systemvm/agent/noVNC/app/locale/it.json create mode 100644 systemvm/agent/noVNC/app/locale/pt_BR.json create mode 100644 systemvm/agent/noVNC/app/styles/input.css create mode 100644 systemvm/agent/noVNC/core/decoders/jpeg.js create mode 100644 systemvm/agent/noVNC/core/decoders/zrle.js create mode 100644 systemvm/agent/noVNC/core/ra2.js create mode 100644 systemvm/agent/noVNC/core/util/md5.js delete mode 100644 systemvm/agent/noVNC/core/util/polyfill.js create mode 100644 systemvm/agent/noVNC/docs/novnc_proxy.1 create mode 100644 systemvm/agent/noVNC/po/fr.po create mode 100644 systemvm/agent/noVNC/po/it.po create mode 100644 systemvm/agent/noVNC/po/pt_BR.po create mode 100755 systemvm/agent/noVNC/utils/convert.js delete mode 100644 systemvm/agent/noVNC/vendor/browser-es-module-loader/README.md delete mode 100755 systemvm/agent/noVNC/vendor/browser-es-module-loader/genworker.js delete mode 100644 systemvm/agent/noVNC/vendor/browser-es-module-loader/rollup.config.js delete mode 100644 systemvm/agent/noVNC/vendor/browser-es-module-loader/src/babel-worker.js delete mode 100644 systemvm/agent/noVNC/vendor/browser-es-module-loader/src/browser-es-module-loader.js delete mode 100644 systemvm/agent/noVNC/vendor/promise.js create mode 100644 test/integration/plugins/storpool/TestEncryptedVolumes.py create mode 100644 ui/src/config/section/zone.js