This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 4f4bd2ac433 ui: fix password field, and backend changes
add 4bdff06acd3 Updating pom.xml version numbers for release 4.18.1.0
add 246bb24b0fc Updating pom.xml version numbers for release
4.18.2.0-SNAPSHOT
add b8c8e17318c upgrade: fix debian/changelog
add 0bfef5d9da4 Merge commit 'b8c8e17318cc28e57d1b38f2aa2f0b456c9bac52'
add edcd0da62ed UI: update versions to 4.19.0
add f049d4d189f Increase reserve on ScaleIO disk formatting for
fragmentation (#7955)
add 45616aaf614 Merge remote-tracking branch 'origin/4.18'
add 4eb110af736 Remove unneeded duplicate words (#7850)
add d25521e96fa Fix issues in VM Scheduler (#7782)
add c428d3bb341 Add and improve logs in snapshot scheduling (#6925)
add 9c9b17885ff upgrade: fix upgrade from 4.18.1.0 to 4.18.2.0-SNAPSHOT
(#7959)
add 09ae0499b21 ldap trust map cleanup on domain delete (#7915)
add 0375714ded5 Merge release branch 4.18 to main
add 481d2bd9c3f Remove powermock from core (#7978)
add 84277e783b5 remove powermock from engine (#7975)
add e721f3b379b Remove powermock from server (#7986)
add c69e3c5f42d Remove powermock from engine/storage/configdrive (#7988)
add 9c65767f95b api: remove powermock from tests (#7645)
add 3071ad69f62 Publish event for VM.STOP when out of band stop is
detected (#7878)
add f539c4b81ad Merge release branch 4.18 to main
add eae9c4784e5 Merge branch 'main' of
https://github.com/apache/cloudstack into nsx-integration
No new revisions were added by this update.
Summary of changes:
.../java/com/cloud/server/ManagementService.java | 2 +-
.../api/command/user/vm/ListNicsCmd.java | 2 +-
.../com/cloud/agent/api/storage/OVFHelperTest.java | 2 +-
.../admin/account/CreateAccountCmdTest.java | 5 +-
.../admin/annotation/AddAnnotationCmdTest.java | 10 +-
.../admin/systemvm/PatchSystemVMCmdTest.java | 43 +-
.../api/command/admin/user/CreateUserCmdTest.java | 5 +-
.../api/command/test/ResetVMUserDataCmdTest.java | 54 +-
.../firewall/CreateEgressFirewallRuleCmdTest.java | 149 +++--
.../user/userdata/DeleteUserDataCmdTest.java | 42 +-
.../userdata/LinkUserDataToTemplateCmdTest.java | 49 +-
.../command/user/userdata/ListUserDataCmdTest.java | 19 +-
.../user/userdata/RegisterUserDataCmdTest.java | 48 +-
.../api/command/user/vpc/CreateVPCCmdTest.java | 32 +-
.../api/command/user/vpc/UpdateVPCCmdTest.java | 15 +-
.../org.mockito.plugins.MockMaker | 0
.../com/cloud/resource/ServerResourceBaseTest.java | 162 +++---
.../cloud/storage/template/OVAProcessorTest.java | 51 +-
.../cloud/storage/template/QCOW2ProcessorTest.java | 8 +-
.../cloud/storage/template/VhdProcessorTest.java | 8 +-
.../org.mockito.plugins.MockMaker | 0
.../main/java/com/cloud/event/UsageEventUtils.java | 2 +-
.../java/com/cloud/ha/HighAvailabilityManager.java | 2 +-
.../com/cloud/network/NetworkStateListener.java | 2 +-
.../main/java/com/cloud/storage/StorageUtil.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 5 +
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 4 +
.../cloud/upgrade/DatabaseVersionHierarchy.java | 9 +
.../java/com/cloud/upgrade/dao/Upgrade218to22.java | 2 +-
.../main/resources/META-INF/db/schema-21to22.sql | 2 +-
.../main/resources/META-INF/db/schema-2214to30.sql | 2 +-
.../main/resources/META-INF/db/schema-410to420.sql | 2 +-
.../as/dao/AutoScaleVmGroupDaoImplTest.java | 19 +-
.../dao/AutoScaleVmGroupStatisticsDaoImplTest.java | 31 +-
.../as/dao/AutoScaleVmGroupVmMapDaoImplTest.java | 27 +-
.../com/cloud/network/dao/NetworkDaoImplTest.java | 35 +-
.../storage/dao/StoragePoolTagsDaoImplTest.java | 4 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 23 +-
.../java/com/cloud/upgrade/GuestOsMapperTest.java | 16 +-
.../upgrade/dao/DatabaseAccessObjectTest.java | 18 +-
.../com/cloud/upgrade/dao/DbUpgradeUtilsTest.java | 14 +-
.../cloud/usage/dao/UsageStorageDaoImplTest.java | 46 +-
.../datastore/db/PrimaryDataStoreDaoImplTest.java | 15 +-
.../org.mockito.plugins.MockMaker | 0
.../storage/configdrive/ConfigDriveBuilder.java | 25 +-
.../configdrive/ConfigDriveBuilderTest.java | 601 ++++++++++-----------
.../org.mockito.plugins.MockMaker | 0
.../motion/AncientDataMotionStrategyTest.java | 12 +-
.../snapshot/SnapshotDataFactoryImplTest.java | 57 +-
.../storage/snapshot/SnapshotServiceImplTest.java | 30 +-
.../vmsnapshot/VMSnapshotStrategyKVMTest.java | 3 -
.../org.mockito.plugins.MockMaker | 0
.../java/com/cloud/utils/db/GenericDaoBase.java | 2 +-
.../ServerResource/HypervResource/WmiCallsV2.cs | 2 +-
.../kvm/storage/ScaleIOStorageAdaptor.java | 4 +-
.../kvm/storage/ScaleIOStorageAdaptorTest.java | 6 +-
.../xenserver/resource/CitrixResourceBase.java | 2 +-
.../KubernetesClusterActionWorker.java | 4 +-
.../cloud/network/resource/NetscalerResource.java | 4 +-
...vpConfigureSharedNetworkUuidCommandWrapper.java | 4 +-
.../cloudstack/api/command/LdapListUsersCmd.java | 2 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 37 +-
.../xenserver/copy_vhd_from_secondarystorage.sh | 2 +-
server/src/main/java/com/cloud/api/ApiServer.java | 2 +-
.../java/com/cloud/event/ActionEventUtils.java | 2 +-
.../main/java/com/cloud/event/AlertGenerator.java | 2 +-
.../com/cloud/network/IpAddressManagerImpl.java | 2 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 4 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 2 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 2 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 4 +-
.../network/security/SecurityGroupManagerImpl.java | 2 +-
.../com/cloud/storage/ImageStoreDetailsUtil.java | 4 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 4 +-
.../storage/listener/SnapshotStateListener.java | 2 +-
.../storage/listener/VolumeStateListener.java | 2 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 91 +++-
.../java/com/cloud/user/AccountManagerImpl.java | 42 +-
.../java/com/cloud/user/DomainManagerImpl.java | 86 +--
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
.../java/com/cloud/vm/UserVmStateListener.java | 2 +-
.../vm/schedule/VMScheduleManagerImpl.java | 2 +-
.../apache/cloudstack/vm/schedule/VMScheduler.java | 2 +-
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 31 +-
.../com/cloud/alert/AlertControlsUnitTest.java | 26 +-
.../java/com/cloud/alert/AlertManagerImplTest.java | 8 +-
.../java/com/cloud/alert/MockAlertManagerImpl.java | 5 +-
server/src/test/java/com/cloud/api/APITest.java | 10 +-
.../test/java/com/cloud/api/ApiDispatcherTest.java | 17 +-
.../java/com/cloud/api/ApiResponseHelperTest.java | 238 ++++----
.../test/java/com/cloud/api/ApiServletTest.java | 56 +-
.../src/test/java/com/cloud/api/ListPerfTest.java | 4 +-
.../src/test/java/com/cloud/api/LoginResponse.java | 4 +-
.../api/dispatch/CommandCreationWorkerTest.java | 14 +-
.../api/dispatch/DispatchChainFactoryTest.java | 1 +
.../dispatch/ParamGenericValidationWorkerTest.java | 35 +-
.../cloud/api/dispatch/ParamProcessWorkerTest.java | 28 +-
.../dispatch/SpecificCmdValidationWorkerTest.java | 10 +-
.../query/MutualExclusiveIdsManagerBaseTest.java | 17 +-
.../com/cloud/api/query/QueryManagerImplTest.java | 65 +--
.../GenericDaoBaseWithTagInformationBaseTest.java | 25 +-
.../query/dao/SecurityGroupJoinDaoImplTest.java | 26 +-
.../api/query/dao/TemplateJoinDaoImplTest.java | 22 +-
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 17 +-
.../cloud/api/query/dao/VolumeJoinDaoImplTest.java | 10 +-
.../com/cloud/capacity/CapacityManagerTest.java | 17 +-
.../ConfigurationManagerImplTest.java | 60 +-
.../configuration/ConfigurationManagerTest.java | 109 ++--
.../cloud/configuration/ValidateIpRangeTest.java | 17 +-
.../consoleproxy/ConsoleProxyManagerTest.java | 43 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 108 ++--
.../cloud/event/ActionEventInterceptorTest.java | 64 +--
.../java/com/cloud/event/ActionEventUtilsTest.java | 73 ++-
.../com/cloud/event/EventControlsUnitTest.java | 29 +-
.../com/cloud/event/dao/EventJoinDaoImplTest.java | 16 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 50 +-
.../src/test/java/com/cloud/ha/KVMFencerTest.java | 25 +-
.../java/com/cloud/hypervisor/KVMGuruTest.java | 6 +-
.../test/java/com/cloud/keystore/KeystoreTest.java | 6 +-
.../metadata/ResourceMetaDataManagerTest.java | 28 +-
.../cloud/network/CreatePrivateNetworkTest.java | 44 +-
.../cloud/network/DedicateGuestVlanRangesTest.java | 46 +-
.../ExternalLoadBalancerDeviceManagerImplTest.java | 36 +-
.../com/cloud/network/IpAddressManagerTest.java | 49 +-
.../com/cloud/network/Ipv6AddressManagerTest.java | 17 +-
.../com/cloud/network/Ipv6ServiceImplTest.java | 94 ++--
.../com/cloud/network/MockFirewallManagerImpl.java | 12 +-
.../com/cloud/network/MockNetworkModelImpl.java | 13 +-
.../com/cloud/network/NetworkModelImplTest.java | 7 +-
.../java/com/cloud/network/NetworkModelTest.java | 52 +-
.../com/cloud/network/NetworkServiceImplTest.java | 166 +++---
.../cloud/network/UpdatePhysicalNetworkTest.java | 25 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 417 +++++++-------
.../element/ConfigDriveNetworkElementTest.java | 194 ++++---
.../network/element/VirtualRouterElementTest.java | 59 +-
.../element/VpcVirtualRouterElementTest.java | 41 +-
.../network/firewall/FirewallManagerTest.java | 47 +-
.../cloud/network/guru/DirectNetworkGuruTest.java | 27 +-
.../network/guru/ExternalGuestNetworkGuruTest.java | 27 +-
.../cloud/network/lb/AssignLoadBalancerTest.java | 10 +-
.../cloud/network/lb/UpdateLoadBalancerTest.java | 33 +-
.../network/router/CommandSetupHelperTest.java | 4 +-
.../network/router/NetworkHelperImplTest.java | 29 +-
.../network/router/RouterControlHelperTest.java | 27 +-
.../VirtualNetworkApplianceManagerImplTest.java | 43 +-
.../security/SecurityGroupManagerImpl2Test.java | 27 +-
.../security/SecurityGroupManagerImplTest.java | 11 +-
.../SecurityGroupManagerTestConfiguration.java | 34 +-
.../network/security/SecurityGroupQueueTest.java | 7 +-
.../network/vpc/NetworkACLManagerImplTest.java | 7 +-
.../cloud/network/vpc/NetworkACLManagerTest.java | 67 ++-
.../network/vpc/NetworkACLServiceImplTest.java | 111 ++--
.../com/cloud/network/vpc/VpcManagerImplTest.java | 155 +++---
.../vpn/RemoteAccessVpnManagerImplTest.java | 89 +--
.../com/cloud/projects/MockProjectManagerImpl.java | 9 +-
.../com/cloud/projects/ProjectManagerImplTest.java | 7 +-
.../cloud/resource/MockResourceManagerImpl.java | 39 +-
.../cloud/resource/ResourceManagerImplTest.java | 161 +++---
.../resourceicon/ResourceIconManagerImplTest.java | 35 +-
.../resourcelimit/CheckedReservationTest.java | 25 +-
.../ResourceLimitManagerImplTest.java | 6 +-
.../cloud/server/ConfigurationServerImplTest.java | 23 +-
.../com/cloud/server/ManagementServerImplTest.java | 540 +++++++++---------
.../java/com/cloud/server/StatsCollectorTest.java | 162 +++---
.../java/com/cloud/snapshot/SnapshotDaoTest.java | 19 +-
.../snapshot/SnapshotDaoTestConfiguration.java | 22 +-
.../cloud/storage/ImageStoreDetailsUtilTest.java | 15 +-
.../com/cloud/storage/StorageManagerImplTest.java | 15 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 254 ++++-----
.../com/cloud/storage/dao/StoragePoolDaoTest.java | 9 +-
.../dao/StoragePoolDaoTestConfiguration.java | 7 +-
.../storage/listener/StoragePoolMonitorTest.java | 19 +-
.../storage/snapshot/SnapshotManagerTest.java | 232 ++++----
.../snapshot/SnapshotSchedulerImplTest.java | 218 ++++++++
.../cloud/tags/TaggedResourceManagerImplTest.java | 22 +-
.../template/HypervisorTemplateAdapterTest.java | 88 +--
.../cloud/template/TemplateManagerImplTest.java | 12 +-
.../com/cloud/user/AccountManagerImplTest.java | 52 +-
.../AccountManagerImplVolumeDeleteEventTest.java | 59 +-
.../com/cloud/user/AccountManagetImplTestBase.java | 47 +-
.../java/com/cloud/user/DomainManagerImplTest.java | 108 ++--
.../com/cloud/user/MockAccountManagerImpl.java | 41 +-
.../java/com/cloud/user/MockUsageEventDao.java | 13 +-
.../java/com/cloud/vm/FirstFitPlannerTest.java | 90 ++-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 89 ++-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 99 ++--
.../vm/dao/UserVmCloneSettingDaoImplTest.java | 11 +-
.../UserVmCloneSettingDaoTestConfiguration.java | 5 +-
.../java/com/cloud/vm/dao/UserVmDaoImplTest.java | 10 +-
.../cloud/vm/dao/UserVmDaoTestConfiguration.java | 5 +-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 63 ++-
.../cloud/vpc/MockConfigurationManagerImpl.java | 76 ++-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 54 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 15 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 16 +-
.../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java | 30 +-
.../cloud/vpc/MockSite2SiteVpnServiceProvider.java | 10 +-
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 16 +-
.../java/com/cloud/vpc/NetworkACLServiceTest.java | 49 +-
.../test/java/com/cloud/vpc/VpcApiUnitTest.java | 21 +-
.../java/com/cloud/vpc/VpcTestConfiguration.java | 32 +-
.../cloud/vpc/dao/MockConfigurationDaoImpl.java | 7 +-
.../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 9 +-
.../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java | 10 +-
.../vpc/dao/MockNetworkServiceMapDaoImpl.java | 5 +-
.../java/com/cloud/vpc/dao/MockVpcDaoImpl.java | 12 +-
.../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java | 5 +-
.../apache/cloudstack/acl/RoleManagerImplTest.java | 11 +-
.../cloudstack/affinity/AffinityApiUnitTest.java | 78 ++-
.../affinity/AffinityGroupServiceImplTest.java | 80 ++-
.../agent/lb/IndirectAgentLBServiceImplTest.java | 29 +-
.../IndirectAgentLBRoundRobinAlgorithmTest.java | 8 +-
.../IndirectAgentLBShuffleAlgorithmTest.java | 8 +-
.../IndirectAgentLBStaticAlgorithmTest.java | 8 +-
.../annotation/AnnotationManagerImplTest.java | 39 +-
.../cloudstack/backup/BackupManagerTest.java | 14 +-
.../apache/cloudstack/ca/CABackgroundTaskTest.java | 37 +-
.../apache/cloudstack/ca/CAManagerImplTest.java | 37 +-
.../DiagnosticsFilesListFactoryTest.java | 15 +-
.../diagnostics/DiagnosticsServiceImplTest.java | 24 +-
.../network/lb/ApplicationLoadBalancerTest.java | 62 +--
.../deployment/RouterDeploymentDefinitionTest.java | 53 +-
.../RouterDeploymentDefinitionTestBase.java | 27 +-
.../VpcRouterDeploymentDefinitionTest.java | 37 +-
.../cloudstack/network/ssl/CertServiceTest.java | 51 +-
.../networkoffering/ChildTestConfiguration.java | 4 +-
.../networkoffering/CreateNetworkOfferingTest.java | 47 +-
.../cloudstack/privategw/AclOnPrivateGwTest.java | 52 +-
.../cloudstack/region/RegionManagerTest.java | 12 +-
.../GlobalLoadBalancingRulesServiceImplTest.java | 55 +-
.../cloudstack/service/ServiceOfferingVOTest.java | 5 +-
.../cloudstack/snapshot/SnapshotHelperTest.java | 13 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 143 ++---
.../vm/schedule/VMSchedulerImplTest.java | 126 ++---
.../org.mockito.plugins.MockMaker | 0
.../src/main/java/rdpclient/RdpClient.java | 2 +-
setup/bindir/cloud-setup-databases.in | 2 +-
setup/db/create-schema.sql | 4 +-
systemvm/agent/noVNC/app/ui.js | 2 +-
systemvm/agent/noVNC/core/display.js | 2 +-
systemvm/agent/noVNC/core/rfb.js | 2 +-
.../component/maint/test_host_high_availability.py | 2 +-
.../component/test_acl_isolatednetwork.py | 6 +-
...est_acl_sharednetwork_deployVM-impersonation.py | 2 +-
.../component/test_base_image_updation.py | 8 +-
test/integration/component/test_configdrive.py | 12 +-
test/integration/component/test_ldap.py | 2 +-
.../integration/component/test_ldap_auto_import.py | 2 +-
.../component/test_multiple_ips_per_nic.py | 2 +-
test/integration/smoke/test_privategw_acl.py | 2 +-
test/integration/smoke/test_vm_schedule.py | 2 +-
.../testpaths/testpath_multiple_snapshot.py | 2 +-
test/integration/testpaths/testpath_restore_vm.py | 2 +-
test/integration/testpaths/testpath_usage.py | 2 +-
.../testpaths/testpath_volumelifecycle.py | 2 +-
test/scripts/deploycluster.sh | 2 +-
test/systemvm/test_update_config.py | 2 +-
tools/marvin/marvin/misc/build/CI.md | 2 +-
ui/package-lock.json | 2 +-
ui/package.json | 2 +-
261 files changed, 4725 insertions(+), 4815 deletions(-)
copy {agent =>
api}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%)
copy {agent =>
core}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%)
copy {agent =>
engine/schema}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
engine/storage/configdrive}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
engine/storage/snapshot}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
create mode 100644
server/src/test/java/com/cloud/storage/snapshot/SnapshotSchedulerImplTest.java
copy {agent =>
server}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
