This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch nsx-integration-fixes
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from e79d77199a4 NSX: Handle CheckHealthCommand to avoid host disconnection
and errors on APIs
add b998e7dbb63 Allow overriding root disk offering & size, and expunge
old root disk while restoring a VM (#8800)
add 44aa08c02a3 Fixup 4.19 build issue (#8905)
add 45daa1ce591 Merge remote-tracking branch 'apache/4.19'
add 31f28f6516d Limit infrastructure details revealed to the end user
after a failed migration on KVM (#8680)
add 090c1e38a6b Improve vm.allocation.algorithm global setting description
(#8823)
add ebaf5a47b94 Speedup resource count calculation (#8903)
add 63a0797b180 Introduce scheduled executor wrapper with dynamic interval
(#8916)
add 38ca11f99ac build: fix build failure after merge-forward
add 0a26f3315a1 Fix listStoragePoolsMetricsCmd (#8885)
add 6cd5c6a1d01 linstor: Do not pretend handling disconnect paths that are
non Linstor (#8897)
add a55ba96a08e Merge remote-tracking branch 'origin/4.18' into 4.19
add 075b4130412 Fix VR inheriting boot settings from user's VM (#8894)
add 7721133ea9a Fix display of properties related to backup size (#8845)
add 44b8d3af0ca ui: bump UI dependencies versions (#8923)
add 85110147071 Fix error message for checkVolume command (#8842)
add 154566f914c Updating pom.xml version numbers for release 4.18.2.0
add 8a101fbbc11 Updating pom.xml version numbers for release
4.18.3.0-SNAPSHOT
add cadbb563afa Merge remote-tracking branch 'origin/4.18' into 4.19
add 7de8a6d0826 Merge LTS branch '4.19' into main
add dfd5158d678 Allow kvm storage plugin to customize diskdef, add
geometry (#8839)
add 5f8450f28f1 Add a shutdownhook to remove jobs owned by the process
(#8896)
add d4a5459a830 UI: Fix missing locale strings for Status widget (#8792)
add 7affbb1dacf protect against null-path (#8915)
add 78e07cff62d Merge release branch 4.18 to 4.19
add 3cabe69cd50 Merge release branch 4.19 to main
add e1922da2499 merge forward error in logger name (#8949)
add 8ff2c018cc5 test: fix test failures in ActionEventInterceptorTest
(#8938)
add 49d244f2513 [Usage] Create VPC billing (#7235)
add 21182dabcd8 Update netty version for compatibility/staying current
(#8945)
add c081f60427d server: Fix null pointer exception in restore VM (#8930)
add 6502dde8c33 field enlarged and db upgrade (#8675)
add 7b57480d601 Merge remote-tracking branch 'apache/4.19' into main
add bf9fdaddbd2 Fix build errors due to log4j 2.x changes
add 582249c1f72 Fix permission to manipulate VMs and templates settings
through UI (#8778)
add 5a52ca78ae5 kvm: export sysinfo for arm64 domains for cloud-init to
work (#8940)
add 405aac38bc9 linstor: Only set allow-two-primaries if resource is
already in use (#8802)
add 0577b0ac8ef server: add logs to public ip allocation attempt (#8239)
add 0fa71f56966 Merge remote-tracking branch 'origin/4.18' into 4.19
add 93d4816ee8e Merge remote-tracking branch 'origin/4.19'
add 2ca3be41f7d Fix spelling in code comments (#8866)
add 865da730e55 log sanitation on output of jobs (#8890)
add f6802e91983 server: fix duplicated records for templates if there are
multiple zones (#8933)
add c31aebc1886 Merge release branch 4.19 to main
add 66c10bf42fd logger issues
add 6c24ff90985 pre-commit autoupdate (#8867)
add 0de469ab731 Infra25725 add codecov token to workflow (#8960)
add 65f57124f5d UI: ignore error when list public ips for CKS clusters on
Shared network (#8489)
add 80adf5ead10 Merge release branch 4.18 to 4.19
add 65eef59e0bd Merge release branch 4.19 to main
add 0b857def685 New feature: Import/Unamange DATA volume from storage pool
(#8808)
add a358c9a4102 Merge release branch 4.19 to main
add 1efce77ead1 sanatise trace logging of async jobs (#8892)
add 4fe2b66e9db add bernardodemarco to .asf.yaml collaborators (#8965)
add e330d76a72d Log4j2 refactor cloud engine orchestration module (#8742)
add a6f3560152b fix log4j to log4j2 issue (#8966)
add 96ae479000a [Usage] Create network billing (#7236)
add 6def370f4a2 test: fix unknown parameter hostid in
test_vm_life_cycle.py (#8948)
add 4ffeec6ba45 vpc: create vpc tiers with dns server of vpc instead of
zone (#8621)
add 5f6acca049e packaging: move contrail network plugin to noredist (#8932)
add 0514caedd6a Merge release branch 4.18 to 4.19
add 0af923e6181 Merge branch '4.19'
add 27124c10319 Add ability to set cpu.threadspercore similar to existing
cpu.corespersocket (#8850)
add 3b0e6ac90c0 VR: fix dnmasq misconfiguration if there are multiple IP
ranges in a shared network (#8741)
add 77df9ad4d78 codecov: fix Github action workflow
add 5745674da5f Merge remote-tracking branch 'origin/4.18' into 4.19
add 4c27574570d .github: fix codecov action configuration
add 836ef9ec709 Merge remote-tracking branch 'origin/4.19'
add 89231106ff9 Hide volumes tab in instance page when user does not have
permission to list volumes (#8713)
add cfdb33a0522 Fixup resource limit checks (#8935)
add b93a86c9da8 Clean up `.asf.yaml` collaborators (#8982)
add 380385d0451 plugin: fix nsx build failure with mvn 3.9 (#8974)
add 00ee5fd4298 Show menu section if user has access to at least one of
its pages (#8978)
add 6e823b2cd34 Order the `.gitignore` file (#8989)
add 54926c324ff sanatise log in case multiple passwordsa have been passed
(#8891)
add e409c6d870a Fixup listing of serivce offering & storagepools with tags
(#8937)
add 80a8b80a9d5 Update volume's passphrase to null if diskOffering doesn't
support encryption (#8904)
add 08132acaa2f Fix restore VM with allocated root disk (#8977)
add b23ceefc7ea utils: cleanup MacAddress and MacAddressTest (#8988)
add 0e08a126dfd systemvm: add template_zone_ref record when add a new zone
with same hypervisor type (#8395)
add cec6ade257c change live migration API used on kvm (#8952)
add eead2710f81 explanatory error message on delete attempt of default
system offering (#8883)
add 9d5d4e55648 linstor: cleanup diskless nodes on disconnect (#8790)
add 3de1f8b4baf Merge remote-tracking branch 'origin/4.18' into 4.19
add e61f3bae4da Merge branch '4.19'
add f41c934c94a Fix build error with MigrateKVMAsync
add db572f4478d Fix spelling, word case, duplicate words in code comments
only (#8987)
add f7b95cd8f06 UI: hide Cleanup/Expunge when delete a CloudManaged CKS
cluster (#8593)
add 027149487b5 Fix: Update rootdisksize detail on restore VM (#8981)
add d5241d319c3 Merge release branch 4.19 to main
add 981310c2fe7 UI: Fix the Add / Remove Vmware DC button on Zone detail
view (#8781)
add d1ca79b65b3 ui: show systemvm agent version in the list and resource
view (#9011)
add 5c9d79e3fb4 Upgrade org.json:json version (#8750)
add aad410ae6c0 Merge remote-tracking branch 'origin/4.18' into 4.19
add 433956c6ae1 Merge remote-tracking branch 'origin/4.19'
add ab8197c55e1 Add password enabled during ISO register and update (#8992)
add e520525fe73 Use parameter dcId as wrapper to prevent NPE (#8986)
add b91c3879c81 ui: add support to change Account role for admins (#9012)
add ea11128cb37 linstor: disconnect-disk also search for resource name in
Linstor (#9035)
add 92ba4765930 Merge release branch 4.18 to 4.19
add 0d8f7d40037 Merge release branch 4.19 to main
add 0d1bc7dfd0c Limit `listRoles` API visibility (#8639)
add f80d2052845 linstor: Fix volume format and make resource available on
copy target (#8811)
add 87e7c57d08c Fixup e2e test_restore_vm (#9025)
add e9ff2707bbd Merge branch '4.19'
add 21af134087a Fix exceeding of resource limits with powerflex (#9008)
add 5f73172bcbe Fix failure test with
ConfigKeyScheduledExecutionWrapperTest (#9103)
add 2a63483b4c5 framework/config: make logic in ::value() defensive (#9108)
add 6b4955affe9 Fix message publish in transaction (#8980)
add a0f87187da1 ui: fix documentation link for VM autoscaling (#9044)
add ea9a0f4adf8 ui: fix haenable in edit vm form (#9049)
add f0df8d7831a ui: fix limit format (#9060)
add 33659fdf069 server,test: fix resourceid for VOLUME.DETROY in restore
VM (#9032)
add b38f1364e6a Merge branch '4.19'
add e817e04343a Fix typo keyparis -> keypairs in
InvalidParameterValueException (#9100)
add c6762f1a41d ui: fix projectrolepermissions listing with description
(#9091)
add daf6b9d1030 api,ui: vm template format, fix vm info link (#9094)
add 2d4d370be80 ui: support isdynamicallyscalable param for iso (#9092)
add 57e67afdf0d api,server: list autoscalevmgroups with keyword (#9046)
add acce88ff392 Merge remote-tracking branch 'apache/4.19'
add 371ce12abef Normalize dates in Usage and Quota APIs (#8243)
add c563fda0819 Add two more `pre-commit` hooks (#9077)
add e159a593f12 Add `markdownlint` with `pre-commit` (#9078)
add 40c5d353773 Fix spelling in docs, logs, exception messages etc (#9076)
add 28e8e2d0096 pre-commit: add hook to trim trailing whitespace (#8205)
add ad66edf6e65 UI: Add search filters (#9068)
add 283a4853aad ui: fix create network access in deploy vm wizard (#9117)
add c07953cc93e ui: fix columns for exportacls csv (#9118)
add 8bb7bbea888 ui: add move to top/bottom for acl rules list (#9119)
add 261530c92a9 server: honor listall param for listiso api (#9064)
add c36a3b8cc33 ui: fix create menu item access (#9104)
add c970141e250 engine-schema: add removed columne for cloud.user_data,
fix delete op (#9120)
add f1c3d2c4bee Merge release branch 4.19 to main
add 5433e775e53 New feature: Implicit host tags (#8929)
add 9b3c318db6a upgrade: move 4.19.0->4.20.0 to 4.19.1->4.20.0 (#8893)
add 19f96355ac0 Update .asf.yaml
add 4e57cc93901 Merge branch 'main' of
https://github.com/apache/cloudstack into nsx-integration-fixes
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 3 +-
.github/linters/.markdown-lint.yml | 100 ++
.github/workflows/ci.yml | 4 +-
.github/workflows/codecov.yml | 5 +-
.github/workflows/ui.yml | 3 +-
.gitignore | 134 +-
.pre-commit-config.yaml | 20 +-
CHANGES.md | 16 +-
CONTRIBUTING.md | 18 +-
README.md | 2 +-
agent/bindir/cloud-setup-agent.in | 4 +-
agent/bindir/cloud-ssh.in | 4 +-
agent/conf/agent.properties | 3 +
agent/conf/environment.properties.in | 4 +-
.../cloud/agent/properties/AgentProperties.java | 7 +
.../com/cloud/deploy/DeploymentClusterPlanner.java | 11 +
api/src/main/java/com/cloud/event/EventTypes.java | 10 +
.../java/com/cloud/storage/VolumeApiService.java | 2 +
.../java/com/cloud/user/ResourceLimitService.java | 26 +-
api/src/main/java/com/cloud/vm/UserVmService.java | 6 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 13 +
.../command/admin/usage/ListUsageRecordsCmd.java | 20 +-
.../api/command/admin/volume/ImportVolumeCmd.java | 165 +++
.../admin/volume/ListVolumesForImportCmd.java | 93 ++
.../command/admin/volume/UnmanageVolumeCmd.java | 127 ++
.../api/command/user/vm/RebootVMCmd.java | 3 +-
.../api/command/user/vm/RestoreVMCmd.java | 45 +-
.../api/response/HostForMigrationResponse.java | 16 +
.../cloudstack/api/response/HostResponse.java | 24 +
.../cloudstack/api/response/HostTagResponse.java | 13 +
.../api/response/UsageRecordResponse.java | 11 +-
.../cloudstack/api/response/UserVmResponse.java | 12 +
.../api/response/VolumeForImportResponse.java | 176 +++
.../volume/VolumeImportUnmanageService.java | 46 +
.../storage/volume/VolumeOnStorageTO.java | 130 ++
.../org/apache/cloudstack/usage/UsageTypes.java | 4 +
.../command/admin/volume/ImportVolumeCmdTest.java | 83 ++
.../admin/volume/ListVolumesForImportCmdTest.java | 58 +
.../admin/volume/UnmanageVolumeCmdTest.java | 70 +
.../api/response/VolumeForImportResponseTest.java | 77 ++
.../storage/volume/VolumeOnStorageTOTest.java | 84 ++
client/bindir/cloud-update-xenserver-licenses.in | 18 +-
client/pom.xml | 14 +-
.../cloud/agent/api/GetVolumesOnStorageAnswer.java | 26 +-
.../agent/api/GetVolumesOnStorageCommand.java | 54 +-
.../com/cloud/agent/api/StartupRoutingCommand.java | 4 +
.../agent/api/GetVolumesOnStorageAnswerTest.java | 73 ++
.../agent/api/GetVolumesOnStorageCommandTest.java | 31 +-
deps/install-non-oss.sh | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 3 +-
.../service/VolumeOrchestrationService.java | 8 +-
.../subsystem/api/storage/EndPointSelector.java | 2 +-
.../api/storage/PrimaryDataStoreDriver.java | 16 +
.../cloud/configuration/ConfigurationManager.java | 3 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 80 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 227 ++--
.../cloud/agent/manager/ClusteredAgentAttache.java | 30 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 310 ++---
.../cloud/agent/manager/ConnectedAgentAttache.java | 2 +-
.../cloud/agent/manager/DirectAgentAttache.java | 58 +-
.../cloud/agent/manager/SynchronousListener.java | 9 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 592 ++++-----
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 66 +-
.../java/com/cloud/vm/VmWorkJobDispatcher.java | 22 +-
.../src/main/java/com/cloud/vm/VmWorkRestore.java | 27 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 4 +-
.../engine/orchestration/CloudOrchestrator.java | 7 +-
.../engine/orchestration/DataMigrationUtility.java | 6 +-
.../engine/orchestration/NetworkOrchestrator.java | 400 +++---
.../engine/orchestration/StorageOrchestrator.java | 14 +-
.../engine/orchestration/VolumeOrchestrator.java | 286 ++--
.../orchestration/VolumeOrchestratorTest.java | 55 +-
.../cloud/configuration/dao/ResourceCountDao.java | 7 +
.../configuration/dao/ResourceCountDaoImpl.java | 71 +-
.../src/main/java/com/cloud/host/HostTagVO.java | 10 +
.../main/java/com/cloud/host/dao/HostTagsDao.java | 8 +
.../java/com/cloud/host/dao/HostTagsDaoImpl.java | 125 ++
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 6 +-
.../upgrade/SystemVmTemplateRegistration.java | 11 +-
.../com/cloud/upgrade/dao/Upgrade41900to41910.java | 8 +-
...e41900to42000.java => Upgrade41910to42000.java} | 8 +-
.../main/java/com/cloud/usage/UsageNetworksVO.java | 143 ++
.../src/main/java/com/cloud/usage/UsageVO.java | 11 +
.../src/main/java/com/cloud/usage/UsageVpcVO.java | 130 ++
.../java/com/cloud/usage/dao/UsageNetworksDao.java | 17 +-
.../com/cloud/usage/dao/UsageNetworksDaoImpl.java | 136 ++
.../main/java/com/cloud/usage/dao/UsageVpcDao.java | 17 +-
.../java/com/cloud/usage/dao/UsageVpcDaoImpl.java | 129 ++
.../src/main/java/com/cloud/user/UserDataVO.java | 15 +
.../cloudstack/reservation/dao/ReservationDao.java | 1 +
.../reservation/dao/ReservationDaoImpl.java | 16 +
...n-daos-between-management-and-usage-context.xml | 2 +
.../spring-engine-schema-core-daos-context.xml | 3 +-
.../resources/META-INF/db/schema-41900to41910.sql | 35 +
...cleanup.sql => schema-41910to42000-cleanup.sql} | 0
...ma-41900to42000.sql => schema-41910to42000.sql} | 3 +
.../META-INF/db/views/cloud.host_view.sql | 8 +-
.../META-INF/db/views/cloud.user_vm_view.sql | 1 +
.../storage/endpoint/DefaultEndPointSelector.java | 3 +-
.../storage/volume/VolumeServiceImpl.java | 2 +-
.../cloudstack/framework/config/ConfigKey.java | 2 +-
.../config/ConfigKeyScheduledExecutionWrapper.java | 114 ++
.../ConfigKeyScheduledExecutionWrapperTest.java | 177 +++
.../java/com/cloud/utils/db/GenericDaoBase.java | 4 +
.../framework/jobs/impl/AsyncJobManagerImpl.java | 2 +-
.../presetvariables/PresetVariableHelper.java | 44 +
.../activationrule/presetvariables/Value.java | 10 +
.../cloudstack/quota/constant/QuotaTypes.java | 2 +
.../apache/cloudstack/quota/dao/NetworkDao.java | 13 +-
.../cloudstack/quota/dao/NetworkDaoImpl.java | 19 +-
.../org/apache/cloudstack/quota/dao/VpcDao.java | 13 +-
.../apache/cloudstack/quota/dao/VpcDaoImpl.java | 15 +-
.../presetvariables/PresetVariableHelperTest.java | 2 +
.../activationrule/presetvariables/ValueTest.java | 8 +
.../cloudstack/api/command/QuotaBalanceCmd.java | 6 +-
.../cloudstack/api/command/QuotaStatementCmd.java | 6 +-
.../api/command/QuotaTariffCreateCmd.java | 8 +-
.../cloudstack/api/command/QuotaTariffListCmd.java | 10 +-
.../api/command/QuotaTariffUpdateCmd.java | 4 +-
.../api/response/QuotaResponseBuilderImpl.java | 22 +-
.../api/response/QuotaTariffResponse.java | 48 +-
.../org/apache/cloudstack/quota/QuotaService.java | 2 -
.../apache/cloudstack/quota/QuotaServiceImpl.java | 62 +-
.../api/response/QuotaResponseBuilderImplTest.java | 7 +-
.../cloudstack/quota/QuotaServiceImplTest.java | 10 -
.../kvm/resource/LibvirtComputingResource.java | 58 +-
.../kvm/resource/LibvirtDomainListener.java | 5 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 5 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 56 +-
.../hypervisor/kvm/resource/MigrateKVMAsync.java | 46 +-
.../LibvirtCheckAndRepairVolumeCommandWrapper.java | 11 +-
.../LibvirtGetVolumesOnStorageCommandWrapper.java | 177 +++
.../wrapper/LibvirtMigrateCommandWrapper.java | 32 +-
.../hypervisor/kvm/storage/KVMStoragePool.java | 3 +
.../kvm/storage/KVMStorageProcessor.java | 1 +
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 7 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 36 +
.../kvm/resource/LibvirtCpuTopologyTest.java | 94 ++
.../kvm/resource/LibvirtDomainXMLParserTest.java | 7 +-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 27 +
.../kvm/resource/MigrateKVMAsyncTest.java | 83 ++
...bvirtGetVolumesOnStorageCommandWrapperTest.java | 158 +++
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 78 +-
.../main/scripts/vm/hypervisor/ovm/configureOvm.sh | 4 +-
.../hypervisor/vmware/resource/VmwareResource.java | 5 +-
plugins/network-elements/juniper-contrail/pom.xml | 6 -
.../contrail/management/MockAccountManager.java | 5 +
.../src/test/resources/mysql_db_start.sh | 2 +-
plugins/network-elements/nsx/pom.xml | 6 +
plugins/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 2 +-
.../kvm/storage/LinstorStorageAdaptor.java | 154 ++-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 54 +
.../storage/datastore/util/LinstorUtil.java | 19 +
.../driver/ScaleIOPrimaryDataStoreDriver.java | 10 +
.../driver/ScaleIOPrimaryDataStoreDriverTest.java | 33 +
plugins/storage/volume/storpool/README.md | 2 +-
.../ldap/LdapDirectoryServerConnectionTest.java | 4 +-
pom.xml | 2 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 4 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 4 +-
.../SYSCONFDIR/init.d/cloud-ipallocator.in | 4 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 4 +-
.../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 4 +-
.../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in | 6 +-
scripts/installer/createtmplt.sh | 28 +-
scripts/installer/createvolume.sh | 26 +-
scripts/installer/installcentos.sh | 10 +-
scripts/installer/installdomp.sh | 6 +-
scripts/installer/run_installer.sh | 6 +-
scripts/network/domr/router_proxy.sh | 6 +-
scripts/network/exdhcp/dnsmasq_edithosts.sh | 16 +-
scripts/network/exdhcp/prepare_dhcpd.sh | 4 +-
scripts/network/exdhcp/prepare_dnsmasq.sh | 8 +-
scripts/storage/checkchildren.sh | 4 +-
scripts/storage/installIso.sh | 14 +-
scripts/storage/qcow2/create_private_template.sh | 8 +-
scripts/storage/qcow2/createtmplt.sh | 20 +-
scripts/storage/qcow2/createvm.sh | 58 +-
scripts/storage/qcow2/createvolume.sh | 20 +-
scripts/storage/qcow2/delvm.sh | 14 +-
scripts/storage/qcow2/get_domr_kernel.sh | 12 +-
scripts/storage/qcow2/get_iqn.sh | 4 +-
scripts/storage/qcow2/importmpl.sh | 20 +-
scripts/storage/qcow2/listvmdisk.sh | 16 +-
scripts/storage/qcow2/listvmdisksize.sh | 12 +-
scripts/storage/qcow2/listvmtmplt.sh | 10 +-
scripts/storage/qcow2/listvolume.sh | 10 +-
scripts/storage/qcow2/managevolume.sh | 44 +-
.../create_privatetemplate_from_snapshot_xen.sh | 10 +-
scripts/storage/secondary/createtmplt.sh | 18 +-
scripts/storage/secondary/createvolume.sh | 20 +-
scripts/storage/secondary/installIso.sh | 14 +-
scripts/storage/secondary/listvmtmplt.sh | 8 +-
scripts/storage/secondary/listvolume.sh | 8 +-
scripts/util/prepare_linmin.sh | 4 +-
scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 22 +-
scripts/vm/hypervisor/kvm/setup_agent.sh | 38 +-
scripts/vm/hypervisor/xenserver/check_heartbeat.sh | 10 +-
.../vm/hypervisor/xenserver/cloud-clean-vlan.sh | 4 +-
.../hypervisor/xenserver/cloud-prepare-upgrade.sh | 6 +-
.../hypervisor/xenserver/cloud-propagate-vlan.sh | 4 +-
.../vm/hypervisor/xenserver/cloud-setup-bonding.sh | 12 +-
.../xenserver/copy_vhd_from_secondarystorage.sh | 12 +-
.../xenserver/copy_vhd_to_secondarystorage.sh | 12 +-
.../create_privatetemplate_from_snapshot.sh | 14 +-
.../vm/hypervisor/xenserver/kill_copy_process.sh | 10 +-
scripts/vm/hypervisor/xenserver/launch_hb.sh | 6 +-
scripts/vm/hypervisor/xenserver/make_migratable.sh | 6 +-
scripts/vm/hypervisor/xenserver/network_info.sh | 4 +-
scripts/vm/hypervisor/xenserver/ovs-get-bridge.sh | 4 +-
.../vm/hypervisor/xenserver/ovs-get-dhcp-iface.sh | 4 +-
.../hypervisor/xenserver/setup_heartbeat_file.sh | 14 +-
scripts/vm/hypervisor/xenserver/setup_iscsi.sh | 6 +-
scripts/vm/hypervisor/xenserver/setupxenserver.sh | 6 +-
.../vm/hypervisor/xenserver/upgrade_snapshot.sh | 14 +-
.../vm/hypervisor/xenserver/upgrade_vnc_config.sh | 4 +-
scripts/vm/hypervisor/xenserver/xs_cleanup.sh | 8 +-
scripts/vm/network/ovs-pvlan-cleanup.sh | 4 +-
scripts/vm/network/ovs-pvlan-dhcp-host.sh | 4 +-
scripts/vm/network/ovs-pvlan-kvm-dhcp-host.sh | 4 +-
scripts/vm/network/ovs-pvlan-vm.sh | 4 +-
scripts/vm/network/vnet/modifyvlan.sh | 30 +-
scripts/vm/pingtest.sh | 6 +-
scripts/vm/systemvm/injectkeys.sh | 4 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 8 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 4 +-
server/src/main/java/com/cloud/api/ApiServer.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 80 +-
.../com/cloud/api/query/ViewResponseHelper.java | 2 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 3 +
.../com/cloud/api/query/dao/HostTagDaoImpl.java | 122 --
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 1 +
.../java/com/cloud/api/query/vo/HostJoinVO.java | 14 +
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 8 +
.../main/java/com/cloud/configuration/Config.java | 10 -
.../configuration/ConfigurationManagerImpl.java | 19 +-
.../java/com/cloud/deploy/FirstFitPlanner.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 34 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 62 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 5 +
.../network/element/VirtualRouterElement.java | 20 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 8 +-
.../com/cloud/resource/ResourceManagerImpl.java | 19 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 392 ++++--
.../com/cloud/storage/VolumeApiServiceImpl.java | 125 +-
.../cloud/template/HypervisorTemplateAdapter.java | 8 +-
.../java/com/cloud/usage/UsageServiceImpl.java | 38 +-
.../main/java/com/cloud/user/AccountManager.java | 2 +
.../java/com/cloud/user/AccountManagerImpl.java | 7 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 291 +++--
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 103 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 516 ++++++++
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 13 +-
.../core/spring-server-core-managers-context.xml | 2 +
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 40 +-
.../cloud/event/ActionEventInterceptorTest.java | 5 +-
.../com/cloud/network/NetworkModelImplTest.java | 2 +-
.../template/HypervisorTemplateAdapterTest.java | 19 +-
.../com/cloud/user/MockAccountManagerImpl.java | 4 +
.../java/com/cloud/vm/FirstFitPlannerTest.java | 3 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 76 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 5 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 45 +
.../apache/cloudstack/acl/RoleManagerImplTest.java | 162 ++-
.../VolumeImportUnmanageManagerImplTest.java | 622 +++++++++
services/secondary-storage/server/pom.xml | 2 +-
.../resource/NfsSecondaryStorageResource.java | 9 +-
setup/bindir/cloud-migrate-databases.in | 4 +-
.../bindir/cloud-set-guest-password-configdrive.in | 4 +-
setup/bindir/cloud-setup-baremetal.in | 59 +-
setup/bindir/cloud-setup-encryption.in | 75 +-
setup/db/221to222upgrade.sh | 10 +-
setup/db/deploy-db-clouddev.sh | 4 +-
setup/db/deploy-db-dev.sh | 10 +-
setup/db/deploy-db-simulator.sh | 10 +-
systemvm/debian/etc/logrotate.d/haproxy | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 12 +-
systemvm/debian/opt/cloud/bin/vr_cfg.sh | 2 +-
.../opt/cloud/templates/conntrackd.conf.templ | 2 +-
systemvm/patch-sysvms.sh | 2 +-
test/bindirbak/cloud-run-test.in | 4 +-
.../maint/testpath_disable_enable_zone.py | 2 +-
.../component/test_acl_sharednetwork.py | 2 +-
...est_acl_sharednetwork_deployVM-impersonation.py | 2 +-
.../component/test_advancedsg_networks.py | 2 +-
.../component/test_multiple_nic_support.py | 44 +-
test/integration/component/test_project_limits.py | 2 +-
.../integration/component/test_ps_resize_volume.py | 6 +-
.../component/test_resource_limit_tags.py | 44 +
test/integration/component/test_resource_limits.py | 2 +-
.../component/test_snapshots_improvement.py | 2 +-
test/integration/plugins/linstor/README.md | 12 +-
test/integration/plugins/scaleio/README.md | 16 +-
.../smoke/test_attach_multiple_volumes.py | 2 +-
.../test_enable_account_settings_for_domain.py | 4 +-
test/integration/smoke/test_events_resource.py | 15 +-
test/integration/smoke/test_host_tags.py | 160 +++
.../smoke/test_import_unmanage_volumes.py | 167 +++
test/integration/smoke/test_restore_vm.py | 183 +++
test/integration/smoke/test_vm_life_cycle.py | 6 +-
test/integration/testpaths/testpath_usage.py | 84 +-
test/scripts/bootstrap-regression.sh | 6 +-
test/scripts/build-env.sh | 6 +-
test/scripts/certDeleteEC2.sh | 6 +-
test/scripts/certSubmitEC2.sh | 6 +-
test/scripts/checkLog.sh | 6 +-
test/scripts/checkOutOfMemory.sh | 6 +-
test/scripts/cleanparallel.sh | 6 +-
test/scripts/deploy-and-run-regression.sh | 6 +-
test/scripts/deploy.sh | 6 +-
test/scripts/deploycluster.sh | 4 +-
test/scripts/executeUserAPI.sh | 6 +-
test/scripts/invoke.sh | 6 +-
test/scripts/regression.sh | 6 +-
test/scripts/run.sh | 6 +-
test/scripts/script_lock_test/test.sh | 4 +-
test/scripts/script_lock_test/test_task.sh | 4 +-
test/scripts/sign.sh | 6 +-
test/scripts/signEC2.sh | 6 +-
test/scripts/usage/allocated.sh | 6 +-
test/scripts/usage/network.sh | 6 +-
test/scripts/usage/running.sh | 6 +-
test/scripts/usage/volume_usage.sh | 6 +-
test/scripts/xen/corrupttemplate.sh | 6 +-
test/scripts/xen/createfaketemplate.sh | 6 +-
test/scripts/xen/killvm.sh | 6 +-
test/scripts/xen/listtemplate.sh | 6 +-
test/scripts/xen/listvdi.sh | 6 +-
test/scripts/xen/listvm.sh | 6 +-
test/scripts/xen/ms.sh | 6 +-
test/scripts/xen/removetemplate.sh | 8 +-
test/scripts/xen/shutdown.sh | 6 +-
test/scripts/xen/sleep.sh | 6 +-
test/scripts/xen/ssh.sh | 6 +-
tools/apidoc/build-apidoc.sh | 6 +-
tools/build/build_asf.sh | 8 +-
tools/build/installer/debinstall_full.sh | 8 +-
tools/build/installer/rpminstall_full.sh | 10 +-
tools/build/setnextversion.sh | 4 +-
tools/devcloud4/README.md | 27 +-
tools/devcloud4/advanced/README.md | 20 +-
tools/devcloud4/basic/README.md | 14 +-
.../attributes/database_server.rb | 4 +-
.../binary-installation/attributes/default.rb | 4 +-
.../common/binary-installation/metadata.rb | 4 +-
.../binary-installation/recipes/database_server.rb | 4 +-
.../common/binary-installation/recipes/default.rb | 4 +-
.../recipes/management_server.rb | 4 +-
.../binary-installation/recipes/nfsshares.rb | 4 +-
tools/devcloud4/common/configure-network.sh | 4 +-
.../attributes/database_server.rb | 4 +-
.../development-installation/attributes/default.rb | 4 +-
.../files/default/createtmplt.sh | 20 +-
.../common/development-installation/metadata.rb | 4 +-
.../recipes/database_server.rb | 4 +-
.../development-installation/recipes/default.rb | 4 +-
.../development-installation/recipes/nfsshares.rb | 4 +-
.../recipes/system_templates.rb | 4 +-
tools/docker/README.md | 4 +-
tools/docker/systemtpl.sh | 4 +-
tools/eclipse/set-eclipse-profile.sh | 44 +-
tools/marvin/MANIFEST.in | 4 +-
tools/marvin/marvin/lib/base.py | 20 +-
tools/marvin/marvin/misc/build/CI.md | 12 +-
tools/marvin/marvin/misc/build/README.md | 2 +-
tools/marvin/marvin/misc/build/redeploy.sh | 6 +-
tools/marvin/marvin/sandbox/run-marvin.sh | 4 +-
tools/ngui/static/js/lib/angular.js | 4 +-
tools/transifex/sync-transifex-ui.sh | 10 +-
.../cloud_schema_comparision.sh | 10 +-
...test_config_between_fresh_and_upgraded_setup.sh | 12 +-
ui/README.md | 4 +-
ui/package-lock.json | 1000 ++++++--------
ui/package.json | 12 +-
ui/public/locales/en.json | 34 +-
ui/src/components/header/CreateMenu.vue | 12 +-
ui/src/components/view/DetailSettings.vue | 14 +-
ui/src/components/view/DetailsTab.vue | 9 +
ui/src/components/view/InfoCard.vue | 14 +-
ui/src/components/view/SearchView.vue | 287 +++-
ui/src/components/widgets/Status.vue | 29 +-
ui/src/config/router.js | 5 +-
ui/src/config/section/account.js | 3 +-
ui/src/config/section/compute.js | 38 +-
ui/src/config/section/config.js | 2 +
ui/src/config/section/image.js | 3 +-
ui/src/config/section/infra.js | 2 +-
ui/src/config/section/infra/clusters.js | 1 +
ui/src/config/section/infra/hosts.js | 9 +-
ui/src/config/section/infra/pods.js | 1 +
ui/src/config/section/infra/primaryStorages.js | 1 +
ui/src/config/section/infra/secondaryStorages.js | 1 +
ui/src/config/section/infra/systemVms.js | 5 +-
ui/src/config/section/infra/zones.js | 1 +
ui/src/config/section/network.js | 2 +-
ui/src/config/section/offering.js | 6 +
ui/src/config/section/role.js | 1 +
ui/src/config/section/tools.js | 9 +
ui/src/core/lazy_lib/icons_use.js | 4 +
ui/src/store/modules/permission.js | 31 +-
ui/src/views/AutogenView.vue | 6 +
ui/src/views/compute/DeployVM.vue | 2 +-
ui/src/views/compute/EditVM.vue | 3 +-
ui/src/views/compute/InstanceTab.vue | 2 +-
ui/src/views/compute/KubernetesServiceTab.vue | 24 +-
ui/src/views/compute/ReinstallVm.vue | 315 +++++
.../views/compute/wizard/NetworkConfiguration.vue | 2 +-
ui/src/views/compute/wizard/NetworkSelection.vue | 2 +-
ui/src/views/dashboard/UsageDashboard.vue | 6 +-
ui/src/views/image/RegisterOrUploadIso.vue | 66 +-
ui/src/views/image/UpdateISO.vue | 14 +-
ui/src/views/infra/HostInfo.vue | 26 +-
ui/src/views/infra/HostUpdate.vue | 183 +++
ui/src/views/network/AclListRulesTab.vue | 26 +
.../views/project/iam/ProjectRolePermissionTab.vue | 2 +-
ui/src/views/tools/ManageVolumes.vue | 1379 ++++++++++++++++++++
.../java/com/cloud/usage/UsageManagerImpl.java | 68 +
.../cloud/usage/parser/NetworksUsageParser.java | 100 ++
.../com/cloud/usage/parser/VpcUsageParser.java | 95 ++
.../main/java/com/cloud/utils/net/MacAddress.java | 231 +---
.../java/com/cloud/utils/net/MacAddressTest.java | 14 +-
424 files changed, 11897 insertions(+), 4183 deletions(-)
create mode 100644 .github/linters/.markdown-lint.yml
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ImportVolumeCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesForImportCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UnmanageVolumeCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VolumeForImportResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageService.java
create mode 100644
api/src/main/java/org/apache/cloudstack/storage/volume/VolumeOnStorageTO.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/volume/ImportVolumeCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesForImportCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/volume/UnmanageVolumeCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/response/VolumeForImportResponseTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/storage/volume/VolumeOnStorageTOTest.java
copy server/src/main/java/com/cloud/api/query/dao/HostTagDao.java =>
core/src/main/java/com/cloud/agent/api/GetVolumesOnStorageAnswer.java (55%)
rename server/src/main/java/com/cloud/api/query/vo/HostTagVO.java =>
core/src/main/java/com/cloud/agent/api/GetVolumesOnStorageCommand.java (52%)
create mode 100644
core/src/test/java/com/cloud/agent/api/GetVolumesOnStorageAnswerTest.java
copy engine/orchestration/src/main/java/com/cloud/vm/VmWorkRestore.java =>
core/src/test/java/com/cloud/agent/api/GetVolumesOnStorageCommandTest.java (50%)
rename
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41900to42000.java =>
Upgrade41910to42000.java} (91%)
create mode 100644
engine/schema/src/main/java/com/cloud/usage/UsageNetworksVO.java
create mode 100644 engine/schema/src/main/java/com/cloud/usage/UsageVpcVO.java
copy server/src/main/java/com/cloud/api/query/dao/HostTagDao.java =>
engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDao.java (69%)
create mode 100644
engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDaoImpl.java
copy server/src/main/java/com/cloud/api/query/dao/HostTagDao.java =>
engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDao.java (73%)
create mode 100644
engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDaoImpl.java
rename
engine/schema/src/main/resources/META-INF/db/{schema-41900to42000-cleanup.sql
=> schema-41910to42000-cleanup.sql} (100%)
rename engine/schema/src/main/resources/META-INF/db/{schema-41900to42000.sql
=> schema-41910to42000.sql} (96%)
create mode 100644
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapper.java
create mode 100644
framework/config/src/test/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapperTest.java
copy server/src/main/java/com/cloud/api/query/dao/HostTagDao.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/NetworkDao.java
(71%)
copy server/src/main/java/com/cloud/api/query/dao/HostTagDao.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/NetworkDaoImpl.java
(62%)
copy server/src/main/java/com/cloud/api/query/dao/HostTagDao.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VpcDao.java (71%)
rename server/src/main/java/com/cloud/api/query/dao/HostTagDao.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VpcDaoImpl.java
(68%)
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtCpuTopologyTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/MigrateKVMAsyncTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapperTest.java
delete mode 100644
server/src/main/java/com/cloud/api/query/dao/HostTagDaoImpl.java
create mode 100644
server/src/main/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageManagerImpl.java
create mode 100644
server/src/test/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageManagerImplTest.java
create mode 100644 test/integration/smoke/test_host_tags.py
create mode 100644 test/integration/smoke/test_import_unmanage_volumes.py
create mode 100644 test/integration/smoke/test_restore_vm.py
create mode 100644 ui/src/views/compute/ReinstallVm.vue
create mode 100644 ui/src/views/infra/HostUpdate.vue
create mode 100644 ui/src/views/tools/ManageVolumes.vue
create mode 100644
usage/src/main/java/com/cloud/usage/parser/NetworksUsageParser.java
create mode 100644
usage/src/main/java/com/cloud/usage/parser/VpcUsageParser.java
