This is an automated email from the ASF dual-hosted git repository.

DaanHoogland pushed a change to branch ghi10752-config-core-1
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 3664fd48be6 use the renamed NetworkLBHaproxyStatsVisibility key
 discard 0caa968db29 read usage alert settings from the DB, not 
ConfigKey.value()
 discard 7958e471a59 remove a null check that can never be true
 discard b1e495ea4e7 use ConfigKeys for alert, storage, guest network and 
hidden settings
 discard 1a6e967834d fix config descriptions and the 
NetworkLBHaproxyStatsVisibility name
 discard 5abbd02930a declare and register ConfigKeys for all remaining Config 
enum entries
     add ac65e3ddab0 server,kvm: Avoid device id conflicts between data 
volumes, CD-ROMs and the config drive ISO (#14407)
     add b9b5436d6f2 Enhancing storagepool operations and snapshot related 
fixes in NetApp ONTAP storage plugin (#13897)
     add 454bba0f3e5 server: report distinct read/write volume throttle rates 
(#14048)
     add 56306ab52cc Merge remote-tracking branch 'apache/4.20' into 4.22
     add fe8976babc9 Merge remote-tracking branch 'apache/4.22'
     add 92e44bb8c33 Fix daily issue triage job (#14526)
     add d6390bd5c30 Validate Storage Capacity Before Volume Create (#14314)
     add 4d2e712ecda sbom (#12570)
     add 2ebcaf626cb Do not shut down networks that are being implemented in 
the orphaned-network cleanup (#14527)
     add d02adcde900 Merge branch '4.20' into 4.22
     add d63c21bcb12 Merge branch '4.22'
     add 41e30627cec Extend NetApp ONTAP codeowners (#14569)
     add 3370d9fcd51 remove recurring exception from MS logs (#14441)
     add dafb4a014e5 Driver is called when nothing is changed in volume resize 
wizard (#14259)
     add f00e0c75121 ui: fix SourceNat error when adding a network offering 
(#14576)
     add 2d886b61918 cloudutils: Do not configure selinux/apparmor and 
security_driver when setup cloudstack agent (#13281)
     add 2a4d7d9036c Fix Prometheus exporter not recognizing ::1 as IPv6 
loopback (#13245)
     add fb605640105 core: fix instance snapshot failure (#14543)
     add f3cb957463e Major update for el_GR to comply with latest translation 
requirements… (#14507)
     add a95eb5970c0 systemvm: fix subprocess deadlock in router health check 
scripts (#13737)
     add 988bbaa1f18   Disk ERROR policy for KVM hypervisors (#14499)
     add aa823483186 CSTACKEX-309: enabling resize volume Api validation 
notification to s… (#103) (#14220)
     add 50055b4cf34 CKS: support headlamp.yaml in upgrade-kubernetes.sh 
(#14245)
     add bc5522e86e0 Clarify VMware import conversion storage option (#13165)
     add 98b8f752a34 Performance improvements of AgentPropertiesFileHandler 
(#13852)
     add f8f3848321a sbom: allow-listed generators and an sbom Maven profile 
(#14570)
     add a7be64af7ad Resize Volume form does not show current size and Custom 
IOPS (#14262)
     add 492682697a7 UI: fix clone offering forms silently reverting user edits 
on services (#14062)
     add c1c815b21bb packaging: use rng-tools service name on SUSE 15 (#14311)
     add 1881dc6654e KVM: Support multi vlan trunk NICs (#14166)
     add 70860301eb1 small refactors on account manager (#11784)
     add 6358dc3bd08 ui: link account to LDAP - #13950 (#13950)
     add 6019b89c0b3 ui: make "Add Tenant Account" vs "Add User" distinction 
clear (#13981)
     add 6982fac34a6 Fix NPE on first LDAP login (#14098)
     add 1b2095125a2 allow EC private keys when uploading a custom certificate 
(#14317)
     add cd39b9e4892 clean up the first try when a system vm retries with 
another template (#14376)
     add a8200cfc26a improved errorlog message by adding null check (#13263)
     add 7ccc48ca6d6 OAuthProvider: add param enabled in register API (#13889)
     add 6caa33e4ddb Add 'balancedweighted' VM allocation algorithm (#14109)
     add 53a6c0c0529 Identify Guest Agent connection error by the code enum 
instead of message (KBOSS) (#13789)
     add cc30155defc KVM: make storage heartbeat fence action configurable 
(graceful-reboot / restart-agent / log-only) (#13090)
     add 815a30f8729 (KBOSS) Add synchronous backup compression flag (#13901)
     add 2f34b0cd248 Allow multiple simultaneous console viewers for KVM user 
VMs (#13870)
     add 48ed24c48b3 declare and register ConfigKeys for all remaining Config 
enum entries
     add f121d65387e fix config descriptions and the 
NetworkLBHaproxyStatsVisibility name
     add a7194f9d995 fix typos in config descriptions
     add 1b9069267be use ConfigKeys for alert, storage, guest network and 
hidden settings
     add edcc7af6a62 remove a null check that can never be true
     add bf5cbe6608b read usage alert settings from the DB, not 
ConfigKey.value()
     add ab4c4c8c542 use the renamed NetworkLBHaproxyStatsVisibility key

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   (3664fd48be6)
            \
             N -- N -- N   refs/heads/ghi10752-config-core-1 (ab4c4c8c542)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .gitattributes                                     |    2 +-
 .github/CODEOWNERS                                 |    2 +-
 .github/aw/actions-lock.json                       |   45 +-
 .github/scripts/post-compile.sh                    |   14 +-
 .github/workflows/daily-issue-triage.lock.yml      | 1656 +++++--
 .github/workflows/daily-issue-triage.md            |   31 +-
 .github/workflows/sbom.yml                         |  118 +
 PendingReleaseNotes                                |   33 +
 agent/conf/agent.properties                        |   74 +
 .../cloud/agent/dao/impl/PropertiesStorage.java    |    3 +
 .../cloud/agent/properties/AgentProperties.java    |   90 +
 .../properties/AgentPropertiesFileHandler.java     |   75 +-
 .../java/com/cloud/agent/KvmHaFenceScriptTest.java |  486 ++
 .../properties/AgentPropertiesFileHandlerTest.java |   37 +
 .../main/java/com/cloud/agent/api/to/NicTO.java    |   20 +
 .../main/java/com/cloud/agent/api/to/VolumeTO.java |    9 +
 .../com/cloud/deploy/DeploymentClusterPlanner.java |    7 +-
 .../java/com/cloud/deploy/DeploymentPlanner.java   |    2 +-
 api/src/main/java/com/cloud/event/EventTypes.java  |    8 +
 api/src/main/java/com/cloud/host/Host.java         |    3 +
 .../java/com/cloud/host/HostScoringWeights.java    |   57 +
 .../main/java/com/cloud/network/NetworkModel.java  |    8 +
 .../java/com/cloud/network/NetworkService.java     |   36 +
 .../main/java/com/cloud/offering/DiskOffering.java |   19 +
 .../java/com/cloud/server/ManagementService.java   |   14 +
 .../java/com/cloud/storage/VolumeApiService.java   |   18 +
 api/src/main/java/com/cloud/vm/DiskProfile.java    |    9 +
 api/src/main/java/com/cloud/vm/Nic.java            |    2 +
 .../org/apache/cloudstack/api/ApiConstants.java    |    7 +
 .../apache/cloudstack/api/ResponseGenerator.java   |    2 +
 .../admin/host/FindHostsForMigrationCmd.java       |    8 +
 .../admin/network/AssociateNetworkToNicCmd.java    |  169 +
 .../admin/network/ChangeNicPrimaryNetworkCmd.java  |  127 +
 .../network/DisassociateNetworkFromNicCmd.java     |  126 +
 .../admin/offering/CreateDiskOfferingCmd.java      |   10 +
 .../admin/offering/CreateServiceOfferingCmd.java   |   10 +
 .../admin/offering/UpdateDiskOfferingCmd.java      |    7 +
 .../api/command/admin/vm/AssignVMCmd.java          |   36 +
 .../user/backup/CreateBackupOfferingCmd.java       |   10 +-
 .../api/command/user/vm/BaseDeployVMCmd.java       |  198 +
 .../api/command/user/vm/ListNicsCmd.java           |    2 +-
 .../api/response/DiskOfferingResponse.java         |   12 +
 .../api/response/HostForMigrationResponse.java     |   16 +
 .../cloudstack/api/response/HostResponse.java      |   24 +
 .../api/response/NicNetworkMapResponse.java        |  137 +
 .../cloudstack/api/response/NicResponse.java       |   24 +
 .../api/response/ServiceOfferingResponse.java      |    8 +
 .../cloudstack/api/response/VolumeResponse.java    |   16 +
 .../consoleproxy/ConsoleAccessManager.java         |    7 +
 .../storage/template/VnfTemplateManager.java       |   15 +
 .../network/AssociateNetworkToNicCmdTest.java      |  176 +
 .../network/ChangeNicPrimaryNetworkCmdTest.java    |  116 +
 .../network/DisassociateNetworkFromNicCmdTest.java |  116 +
 .../network/NicNetworkMapCmdTestFixtures.java      |   57 +
 .../api/command/admin/vm/AssignVMCmdTest.java      |  132 +
 .../api/command/user/vm/DeployVMCmdTest.java       |  155 +
 .../java/com/cloud/agent/api/MigrateCommand.java   |   29 +
 .../cloud/agent/api/PrepareForMigrationAnswer.java |   11 +
 .../agent/api/UpdateNicVlanMembershipAnswer.java   |   14 +-
 ...nd.java => UpdateNicVlanMembershipCommand.java} |   39 +-
 .../cloud/agent/api/VlanTrunkMigrationHelper.java  |  162 +
 .../cloud/agent/api/routing/DhcpEntryCommand.java  |   12 +
 .../storage/CreateDiskOnlyVmSnapshotCommand.java   |    4 +-
 .../virtualnetwork/facade/DhcpEntryConfigItem.java |    2 +-
 .../virtualnetwork/model/VmDhcpConfig.java         |   16 +-
 .../cloudstack/backup/TakeKbossBackupCommand.java  |   43 +-
 .../cloudstack/storage/to/VolumeObjectTO.java      |   11 +
 .../agent/api/VlanTrunkMigrationHelperTest.java    |  424 ++
 .../java/com/cloud/vm/VirtualMachineManager.java   |    9 +
 .../service/NetworkOrchestrationService.java       |   11 +
 .../engine/subsystem/api/storage/VolumeInfo.java   |    3 +
 .../cloud/deploy/DeploymentPlanningManager.java    |    2 +
 .../main/java/com/cloud/event/UsageEventUtils.java |   60 +
 .../java/com/cloud/storage/StorageManager.java     |    4 +-
 .../java/com/cloud/template/TemplateManager.java   |   20 +
 .../java/com/cloud/event/UsageEventUtilsTest.java  |  212 +
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   13 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   68 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  186 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java    |  172 +
 .../orchestration/NetworkOrchestratorTest.java     |  207 +
 .../main/java/com/cloud/event/UsageEventVO.java    |    2 +-
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |   10 +-
 .../java/com/cloud/host/dao/HostDetailsDao.java    |    4 +
 .../com/cloud/host/dao/HostDetailsDaoImpl.java     |   11 +
 .../java/com/cloud/storage/DiskOfferingVO.java     |   14 +
 .../com/cloud/usage/UsageNetworkOfferingVO.java    |   17 +
 .../cloud/usage/dao/UsageNetworkOfferingDao.java   |    6 +
 .../usage/dao/UsageNetworkOfferingDaoImpl.java     |   46 +-
 .../schema/src/main/java/com/cloud/vm/NicVO.java   |   14 +-
 .../{VmIsoMapDao.java => NicNetworkMapDao.java}    |   16 +-
 .../com/cloud/vm/dao/NicNetworkMapDaoImpl.java     |   94 +
 .../cloud/vm/dao/NicNetworkMapVO.java}             |  127 +-
 .../main/java/com/cloud/vm/dao/VMInstanceDao.java  |   13 +
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |   56 +
 .../spring-engine-schema-core-daos-context.xml     |    1 +
 .../resources/META-INF/db/schema-42300to2400.sql   |   29 +
 .../META-INF/db/views/cloud.disk_offering_view.sql |    1 +
 .../db/views/cloud.service_offering_view.sql       |    1 +
 .../META-INF/db/views/cloud.volume_view.sql        |    1 +
 .../java/com/cloud/host/dao/HostDaoImplTest.java   |   27 +
 .../motion/StorageSystemDataMotionStrategy.java    |   13 +
 .../cloudstack/storage/volume/VolumeObject.java    |    7 +
 .../storage/volume/VolumeServiceImpl.java          |    6 +-
 .../main/java/com/cloud/utils/db/Merovingian2.java |   10 +
 .../cloud/utils/db/Merovingian2AcquireTest.java    |   82 +
 .../framework/jobs/impl/AsyncJobManagerImpl.java   |   66 +-
 .../jobs/impl/AsyncJobManagerImplTest.java         |  125 +
 packaging/suse15/cloud.spec                        |    4 +-
 .../cloudstack/backup/KbossBackupProvider.java     |   30 +-
 .../cloudstack/backup/KbossBackupProviderTest.java |   16 +-
 .../cloud/baremetal/manager/BaremetalManager.java  |    2 +-
 .../hypervisor/kvm/resource/BridgeVifDriver.java   |  247 +-
 .../hypervisor/kvm/resource/KVMHAMonitor.java      |    6 +
 .../kvm/resource/LibvirtComputingResource.java     |   90 +-
 .../kvm/resource/LibvirtDomainXMLParser.java       |   38 +
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   64 +-
 .../cloud/hypervisor/kvm/resource/VifDriver.java   |   10 +
 .../wrapper/LibvirtCheckNetworkCommandWrapper.java |    7 +
 .../LibvirtCompressBackupCommandWrapper.java       |   29 +-
 .../wrapper/LibvirtCreateCommandWrapper.java       |    1 +
 .../wrapper/LibvirtMigrateCommandWrapper.java      |  167 +
 .../wrapper/LibvirtPlugNicCommandWrapper.java      |   11 +
 .../LibvirtPostMigrationCommandWrapper.java        |   20 +
 .../LibvirtPrepareForMigrationCommandWrapper.java  |   16 +-
 .../wrapper/LibvirtReadyCommandWrapper.java        |    4 +
 .../wrapper/LibvirtStartCommandWrapper.java        |   18 +
 .../LibvirtTakeKbossBackupCommandWrapper.java      |   19 +-
 ...virtUpdateNicVlanMembershipCommandWrapper.java} |   36 +-
 .../LibvirtValidateKbossVmCommandWrapper.java      |    2 +-
 .../kvm/storage/IscsiAdmStorageAdaptor.java        |  138 +-
 .../kvm/storage/KVMStoragePoolManager.java         |   11 +-
 .../kvm/storage/KVMStorageProcessor.java           |   16 +-
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |   30 +
 .../kvm/resource/BridgeVifDriverTest.java          |  391 ++
 .../kvm/resource/LibvirtComputingResourceTest.java |   34 +
 .../kvm/resource/LibvirtDomainXMLParserTest.java   |   37 +
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |  129 +
 .../LibvirTakeKbossBackupCommandWrapperTest.java   |   16 +-
 .../LibvirtCheckNetworkCommandWrapperTest.java     |   98 +
 ...ibvirtDiskOnlyVMSnapshotCommandWrapperTest.java |    9 +-
 .../wrapper/LibvirtMigrateCommandWrapperTest.java  |  158 +
 .../LibvirtPostMigrationCommandWrapperTest.java    |   47 +
 ...bvirtPrepareForMigrationCommandWrapperTest.java |   17 +-
 ...tUpdateNicVlanMembershipCommandWrapperTest.java |  127 +
 .../main/resources/script/upgrade-kubernetes.sh    |    8 +-
 .../metrics/PrometheusExporterServerImpl.java      |   50 +-
 .../metrics/PrometheusExporterServerImplTest.java  |   53 +
 .../storage/motion/LinstorDataMotionStrategy.java  |   11 +
 .../motion/LinstorDataMotionStrategyTest.java      |    6 +
 plugins/storage/volume/ontap/README.md             |    4 +-
 .../driver/OntapPrimaryDatastoreDriver.java        |  186 +-
 .../storage/feign/client/AggregateFeignClient.java |    7 +-
 .../storage/feign/client/SnapshotFeignClient.java  |   94 +
 .../cloudstack/storage/feign/model/Aggregate.java  |   56 +-
 .../{VolumeConcise.java => ConsistencyGroup.java}  |   53 +-
 ...Snapshot.java => ConsistencyGroupSnapshot.java} |   73 +-
 ...umeConcise.java => ConsistencyGroupVolume.java} |   21 +-
 ...ConsistencyGroupVolumeProvisioningOptions.java} |   28 +-
 .../cloudstack/storage/feign/model/ExportRule.java |   12 +-
 .../storage/feign/model/IpInterface.java           |   88 +-
 .../lifecycle/OntapPrimaryDatastoreLifecycle.java  |  106 +-
 .../storage/listener/OntapHostListener.java        |  183 +-
 .../storage/service/StorageStrategy.java           |  410 +-
 .../storage/service/UnifiedNASStrategy.java        |  179 +-
 .../storage/service/model/AccessGroup.java         |   19 +-
 .../storage/utils/OntapStorageConstants.java       |   23 +
 .../storage/utils/OntapStorageUtils.java           |  129 +-
 .../vmsnapshot/OntapVMSnapshotStrategy.java        |  617 ++-
 .../driver/OntapPrimaryDatastoreDriverTest.java    |   72 +-
 .../OntapPrimaryDatastoreLifecycleTest.java        |  315 +-
 .../storage/service/StorageStrategyTest.java       |  537 ++-
 .../storage/service/UnifiedNASStrategyTest.java    |  372 ++
 .../storage/utils/OntapStorageUtilsTest.java       |   14 +
 .../vmsnapshot/OntapVMSnapshotStrategyTest.java    |  436 +-
 .../storage/motion/StorPoolDataMotionStrategy.java |   17 +-
 .../api/command/LinkAccountToLdapCmd.java          |    4 +-
 .../api/command/LinkAccountToLdapCmdTest.java      |    8 +
 .../cloudstack/oauth2/OAuth2AuthManagerImpl.java   |    8 +-
 .../api/command/RegisterOAuthProviderCmd.java      |   29 +
 .../oauth2/OAuth2AuthManagerImplTest.java          |   24 +
 .../api/command/RegisterOAuthProviderCmdTest.java  |   32 +-
 pom.xml                                            |   50 +
 python/lib/cloudutils/serviceConfig.py             |   72 -
 python/lib/cloudutils/syscfg.py                    |    6 -
 scripts/vm/hypervisor/kvm/kvmha-fence.sh           |  375 ++
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh          |   17 +-
 scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh       |   21 +-
 scripts/vm/hypervisor/kvm/kvmspheartbeat.sh        |   17 +-
 scripts/vm/hypervisor/kvm/setup_agent.sh           |  228 -
 .../manager/allocator/impl/FirstFitAllocator.java  |    5 +
 .../agent/manager/allocator/impl/HostLoad.java     |   60 +
 .../manager/allocator/impl/HostLoadTracker.java    |  260 ++
 .../manager/allocator/impl/WeightedHostScorer.java |  513 +++
 server/src/main/java/com/cloud/api/ApiDBUtils.java |   61 +
 .../main/java/com/cloud/api/ApiResponseHelper.java |   15 +
 .../api/auth/DefaultLoginAPIAuthenticatorCmd.java  |    4 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |   37 +-
 .../api/query/dao/DiskOfferingJoinDaoImpl.java     |    1 +
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |    2 +
 .../api/query/dao/ServiceOfferingJoinDaoImpl.java  |    1 +
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |   22 +
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |   18 +-
 .../com/cloud/api/query/vo/DiskOfferingJoinVO.java |   11 +
 .../cloud/api/query/vo/ServiceOfferingJoinVO.java  |    7 +
 .../java/com/cloud/api/query/vo/VolumeJoinVO.java  |    7 +
 .../configuration/ConfigurationManagerImpl.java    |   76 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    1 +
 .../deploy/DeploymentPlanningManagerImpl.java      |   42 +
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |   33 +
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |   31 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |    2 -
 .../com/cloud/network/Ipv6AddressManagerImpl.java  |   16 +-
 .../cloud/network/NetworkMigrationManagerImpl.java |   22 +
 .../java/com/cloud/network/NetworkModelImpl.java   |   27 +
 .../java/com/cloud/network/NetworkServiceImpl.java |  884 +++-
 .../network/element/ConfigDriveNetworkElement.java |    2 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   64 +-
 .../cloud/network/router/CommandSetupHelper.java   |  108 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |   52 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |    5 +
 .../com/cloud/server/ManagementServerImpl.java     |   31 +
 .../java/com/cloud/storage/StorageManagerImpl.java |   45 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   64 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   53 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   94 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |   36 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  306 +-
 .../java/com/cloud/vm/UserVmStateListener.java     |    6 +-
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |   11 +
 .../cloudstack/backup/BackupManagerImpl.java       |    1 +
 .../consoleproxy/ConsoleAccessManagerImpl.java     |   14 +-
 .../storage/template/VnfTemplateManagerImpl.java   |   27 +
 .../cloudstack/vm/ImportVmTasksManagerImpl.java    |   43 +-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |   30 +-
 .../spring-server-allocator-context.xml            |    6 +
 .../allocator/impl/HostLoadTrackerTest.java        |  182 +
 .../allocator/impl/WeightedHostScorerRankTest.java |  339 ++
 .../allocator/impl/WeightedHostScorerTest.java     |  175 +
 .../impl/WeightedPlacementDistributionTest.java    |  319 ++
 .../auth/DefaultLoginAPIAuthenticatorCmdTest.java  |  105 +
 .../com/cloud/api/query/QueryManagerImplTest.java  |   53 +
 .../cloud/api/query/dao/VolumeJoinDaoImplTest.java |  192 +-
 .../ConfigurationManagerCloneIntegrationTest.java  |   20 +-
 .../configuration/ConfigurationManagerTest.java    |   32 +-
 .../deploy/DeploymentPlanningManagerImplTest.java  |  118 +
 .../java/com/cloud/hypervisor/KVMGuruTest.java     |   87 +-
 .../com/cloud/network/Ipv6AddressManagerTest.java  |   34 +
 .../com/cloud/network/MockNetworkModelImpl.java    |    6 +
 .../network/NetworkMigrationManagerImplTest.java   |   73 +
 .../com/cloud/network/NetworkModelImplTest.java    |   55 +
 .../com/cloud/network/NetworkServiceImplTest.java  | 1174 +++++
 .../cloud/network/lb/AssignLoadBalancerTest.java   |   10 +
 .../lb/LoadBalancingRulesManagerImplTest.java      |   18 +-
 .../network/router/CommandSetupHelperTest.java     |  136 +
 .../com/cloud/server/ManagementServerImplTest.java |   13 +
 .../cloud/storage/VolumeApiServiceImplTest.java    |  184 +
 .../cloud/template/TemplateManagerImplTest.java    |  175 +
 .../com/cloud/user/AccountManagerImplTest.java     |   75 +
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  414 ++
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |   41 +
 .../java/com/cloud/vpc/MockNetworkModelImpl.java   |    6 +
 .../consoleproxy/ConsoleAccessManagerImplTest.java |   74 +
 .../template/VnfTemplateManagerImplTest.java       |   20 +
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |   24 +
 .../SecondaryStorageManagerImpl.java               |    1 +
 systemvm/debian/opt/cloud/bin/cs_dhcp.py           |   20 +-
 .../debian/root/health_checks/cpu_usage_check.py   |    5 +-
 .../debian/root/health_checks/gateways_check.py    |    3 +-
 .../debian/root/health_checks/iptables_check.py    |    5 +-
 .../root/health_checks/memory_usage_check.py       |    5 +-
 test/integration/smoke/test_disk_offerings.py      |   72 +
 test/integration/smoke/test_service_offerings.py   |  103 +
 ui/package-lock.json                               |  170 +-
 ui/public/locales/ar.json                          |    3 +
 ui/public/locales/ca.json                          |    3 +
 ui/public/locales/de_DE.json                       |    3 +
 ui/public/locales/el_GR.json                       | 4862 ++++++++++++++------
 ui/public/locales/en.json                          |   41 +-
 ui/public/locales/es.json                          |    3 +
 ui/public/locales/fr_FR.json                       |    3 +
 ui/public/locales/hi.json                          |    2 +
 ui/public/locales/hu.json                          |    3 +
 ui/public/locales/it_IT.json                       |    3 +
 ui/public/locales/ja_JP.json                       |    3 +
 ui/public/locales/ko_KR.json                       |    3 +
 ui/public/locales/nb_NO.json                       |    3 +
 ui/public/locales/nl_NL.json                       |    3 +
 ui/public/locales/pl.json                          |    3 +
 ui/public/locales/pt_BR.json                       |    4 +
 ui/public/locales/ru_RU.json                       |    3 +
 ui/public/locales/te.json                          |    3 +
 ui/public/locales/zh_CN.json                       |    3 +
 ui/src/components/CheckBoxSelectPair.vue           |   12 +
 ui/src/components/offering/ComputeOfferingForm.vue |   14 +
 ui/src/components/offering/DiskOfferingForm.vue    |   26 +
 ui/src/components/view/ListView.vue                |   13 +-
 ui/src/composables/useServiceCapabilityParams.js   |    2 +-
 ui/src/config/section/account.js                   |   41 +-
 ui/src/config/section/domain.js                    |    5 +-
 ui/src/config/section/infra/hosts.js               |    2 +-
 ui/src/utils/multiNetworkNic.js                    |  100 +
 ui/src/views/AutogenView.vue                       |    7 +-
 ui/src/views/compute/DeployVM.vue                  |   86 +-
 ui/src/views/compute/DeployVnfAppliance.vue        |   47 +-
 ui/src/views/compute/MigrateWizard.vue             |   17 +-
 .../views/compute/wizard/NetworkConfiguration.vue  |  228 +-
 ui/src/views/compute/wizard/NetworkSelection.vue   |    4 +
 ui/src/views/compute/wizard/VnfNicsSelection.vue   |  173 +-
 ui/src/views/iam/AddAccount.vue                    |    7 +
 ui/src/views/iam/AddUser.vue                       |   27 +-
 ui/src/views/iam/DomainActionForm.vue              |   10 +-
 ui/src/views/infra/Resources.vue                   |   47 +-
 ui/src/views/network/EnableStaticNat.vue           |   54 +-
 ui/src/views/network/InternalLBAssignVmForm.vue    |   37 +-
 ui/src/views/network/LoadBalancing.vue             |   41 +-
 ui/src/views/network/NicsTab.vue                   |  194 +-
 ui/src/views/network/NicsTable.vue                 |   62 +-
 ui/src/views/network/PortForwarding.vue            |   46 +-
 ui/src/views/offering/AddComputeOffering.vue       |    3 +
 ui/src/views/offering/AddDiskOffering.vue          |    1 +
 ui/src/views/offering/CloneComputeOffering.vue     |    7 +
 ui/src/views/offering/CloneDiskOffering.vue        |    6 +
 ui/src/views/offering/CloneNetworkOffering.vue     |   11 +-
 ui/src/views/offering/CloneVpcOffering.vue         |   68 +-
 ui/src/views/offering/CreateBackupOffering.vue     |    4 +
 ui/src/views/storage/ResizeVolume.vue              |   37 +-
 ui/src/views/tools/ImportUnmanagedInstance.vue     |    1 +
 ui/tests/unit/views/AutogenView.spec.js            |   45 +
 .../java/com/cloud/usage/UsageManagerImpl.java     |   79 +-
 .../java/com/cloud/usage/UsageManagerImplTest.java |  150 +
 .../cloud/utils/security/CertificateHelper.java    |   13 +-
 .../utils/security/CertificateHelperTest.java      |   79 +
 333 files changed, 25002 insertions(+), 3751 deletions(-)
 create mode 100644 .github/workflows/sbom.yml
 create mode 100644 
agent/src/test/java/com/cloud/agent/KvmHaFenceScriptTest.java
 create mode 100644 api/src/main/java/com/cloud/host/HostScoringWeights.java
 create mode 100644 
api/src/main/java/org/apache/cloudstack/api/command/admin/network/AssociateNetworkToNicCmd.java
 create mode 100644 
api/src/main/java/org/apache/cloudstack/api/command/admin/network/ChangeNicPrimaryNetworkCmd.java
 create mode 100644 
api/src/main/java/org/apache/cloudstack/api/command/admin/network/DisassociateNetworkFromNicCmd.java
 create mode 100644 
api/src/main/java/org/apache/cloudstack/api/response/NicNetworkMapResponse.java
 create mode 100644 
api/src/test/java/org/apache/cloudstack/api/command/admin/network/AssociateNetworkToNicCmdTest.java
 create mode 100644 
api/src/test/java/org/apache/cloudstack/api/command/admin/network/ChangeNicPrimaryNetworkCmdTest.java
 create mode 100644 
api/src/test/java/org/apache/cloudstack/api/command/admin/network/DisassociateNetworkFromNicCmdTest.java
 create mode 100644 
api/src/test/java/org/apache/cloudstack/api/command/admin/network/NicNetworkMapCmdTestFixtures.java
 copy 
plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DeleteNetworkAnswer.java
 => core/src/main/java/com/cloud/agent/api/UpdateNicVlanMembershipAnswer.java 
(79%)
 copy core/src/main/java/com/cloud/agent/api/{UnPlugNicCommand.java => 
UpdateNicVlanMembershipCommand.java} (69%)
 create mode 100644 
core/src/main/java/com/cloud/agent/api/VlanTrunkMigrationHelper.java
 create mode 100644 
core/src/test/java/com/cloud/agent/api/VlanTrunkMigrationHelperTest.java
 create mode 100644 
engine/components-api/src/test/java/com/cloud/event/UsageEventUtilsTest.java
 copy engine/schema/src/main/java/com/cloud/vm/dao/{VmIsoMapDao.java => 
NicNetworkMapDao.java} (66%)
 create mode 100644 
engine/schema/src/main/java/com/cloud/vm/dao/NicNetworkMapDaoImpl.java
 copy engine/schema/src/main/java/{org/apache/cloudstack/network/BgpPeerVO.java 
=> com/cloud/vm/dao/NicNetworkMapVO.java} (57%)
 create mode 100644 
framework/db/src/test/java/com/cloud/utils/db/Merovingian2AcquireTest.java
 copy 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtUpdateVmNicCommandWrapper.java
 => LibvirtUpdateNicVlanMembershipCommandWrapper.java} (57%)
 create mode 100644 
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckNetworkCommandWrapperTest.java
 create mode 100644 
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpdateNicVlanMembershipCommandWrapperTest.java
 create mode 100644 
plugins/integrations/prometheus/src/test/java/org/apache/cloudstack/metrics/PrometheusExporterServerImplTest.java
 copy 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/{VolumeConcise.java
 => ConsistencyGroup.java} (55%)
 copy 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/{FlexVolSnapshot.java
 => ConsistencyGroupSnapshot.java} (58%)
 copy 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/{VolumeConcise.java
 => ConsistencyGroupVolume.java} (72%)
 copy 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/{VolumeSpaceLogicalSpace.java
 => ConsistencyGroupVolumeProvisioningOptions.java} (70%)
 create mode 100755 scripts/vm/hypervisor/kvm/kvmha-fence.sh
 delete mode 100755 scripts/vm/hypervisor/kvm/setup_agent.sh
 create mode 100644 
server/src/main/java/com/cloud/agent/manager/allocator/impl/HostLoad.java
 create mode 100644 
server/src/main/java/com/cloud/agent/manager/allocator/impl/HostLoadTracker.java
 create mode 100644 
server/src/main/java/com/cloud/agent/manager/allocator/impl/WeightedHostScorer.java
 create mode 100644 
server/src/test/java/com/cloud/agent/manager/allocator/impl/HostLoadTrackerTest.java
 create mode 100644 
server/src/test/java/com/cloud/agent/manager/allocator/impl/WeightedHostScorerRankTest.java
 create mode 100644 
server/src/test/java/com/cloud/agent/manager/allocator/impl/WeightedHostScorerTest.java
 create mode 100644 
server/src/test/java/com/cloud/agent/manager/allocator/impl/WeightedPlacementDistributionTest.java
 create mode 100644 
server/src/test/java/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmdTest.java
 create mode 100644 
server/src/test/java/com/cloud/network/NetworkMigrationManagerImplTest.java
 create mode 100644 ui/src/utils/multiNetworkNic.js
 create mode 100644 
utils/src/test/java/com/cloud/utils/security/CertificateHelperTest.java

Reply via email to