This is an automated email from the ASF dual-hosted git repository.
DaanHoogland pushed a change to branch ghi3687-domain-admin-ldap-access
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit a6bc5f1c84d Merge branch 'main' into ghi3687-domain-admin-ldap-access
omit a096613ed26 update upgrade path
omit 65baf667082 stricter check on LDAP configuration accessability
omit 95a42ff2c21 allow domain admins to add ldap users
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 c1426e2b9a5 allow domain admins to add ldap users
add 1e677448037 stricter check on LDAP configuration accessability
add 30d3e94f355 update upgrade path
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 (a6bc5f1c84d)
\
N -- N -- N refs/heads/ghi3687-domain-admin-ldap-access
(30d3e94f355)
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:
.github/workflows/sbom.yml | 36 +-
.../main/java/com/cloud/agent/api/to/NicTO.java | 20 +
api/src/main/java/com/cloud/event/EventTypes.java | 8 +
api/src/main/java/com/cloud/host/Host.java | 3 +
.../main/java/com/cloud/network/NetworkModel.java | 8 +
.../java/com/cloud/network/NetworkService.java | 36 +
.../java/com/cloud/server/ManagementService.java | 14 +
api/src/main/java/com/cloud/vm/Nic.java | 2 +
.../org/apache/cloudstack/api/ApiConstants.java | 5 +
.../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 +++
.../api/command/admin/vm/AssignVMCmd.java | 36 +
.../api/command/user/vm/BaseDeployVMCmd.java | 198 ++++
.../api/command/user/vm/ListNicsCmd.java | 2 +-
.../api/response/HostForMigrationResponse.java | 16 +
.../cloudstack/api/response/HostResponse.java | 24 +
.../api/response/NicNetworkMapResponse.java | 137 +++
.../cloudstack/api/response/NicResponse.java | 24 +
.../cloudstack/api/response/VolumeResponse.java | 16 +
.../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 +
.../virtualnetwork/facade/DhcpEntryConfigItem.java | 2 +-
.../virtualnetwork/model/VmDhcpConfig.java | 16 +-
.../agent/api/VlanTrunkMigrationHelperTest.java | 424 +++++++
.../java/com/cloud/vm/VirtualMachineManager.java | 9 +
.../service/NetworkOrchestrationService.java | 11 +
.../cloud/deploy/DeploymentPlanningManager.java | 2 +
.../main/java/com/cloud/event/UsageEventUtils.java | 60 +
.../java/com/cloud/event/UsageEventUtilsTest.java | 212 ++++
.../com/cloud/agent/manager/AgentManagerImpl.java | 13 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 68 +-
.../engine/orchestration/NetworkOrchestrator.java | 184 ++-
.../cloud/vm/VirtualMachineManagerImplTest.java | 172 +++
.../orchestration/NetworkOrchestratorTest.java | 207 ++++
.../main/java/com/cloud/event/UsageEventVO.java | 2 +-
.../java/com/cloud/host/dao/HostDetailsDao.java | 4 +
.../com/cloud/host/dao/HostDetailsDaoImpl.java | 11 +
.../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 +--
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-42300to2400.sql | 30 +-
.../motion/StorageSystemDataMotionStrategy.java | 13 +
packaging/suse15/cloud.spec | 4 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 247 +++-
.../kvm/resource/LibvirtComputingResource.java | 75 ++
.../kvm/resource/LibvirtDomainXMLParser.java | 29 +
.../hypervisor/kvm/resource/LibvirtVMDef.java | 34 +-
.../cloud/hypervisor/kvm/resource/VifDriver.java | 10 +
.../wrapper/LibvirtCheckNetworkCommandWrapper.java | 7 +
.../wrapper/LibvirtMigrateCommandWrapper.java | 167 +++
.../wrapper/LibvirtPlugNicCommandWrapper.java | 11 +
.../LibvirtPostMigrationCommandWrapper.java | 20 +
.../LibvirtPrepareForMigrationCommandWrapper.java | 16 +-
.../wrapper/LibvirtReadyCommandWrapper.java | 4 +
.../wrapper/LibvirtStartCommandWrapper.java | 18 +
...virtUpdateNicVlanMembershipCommandWrapper.java} | 36 +-
.../kvm/resource/BridgeVifDriverTest.java | 391 +++++++
.../kvm/resource/LibvirtComputingResourceTest.java | 34 +
.../kvm/resource/LibvirtDomainXMLParserTest.java | 37 +
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 62 ++
.../LibvirtCheckNetworkCommandWrapperTest.java | 98 ++
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 158 +++
.../LibvirtPostMigrationCommandWrapperTest.java | 47 +
...bvirtPrepareForMigrationCommandWrapperTest.java | 17 +-
...tUpdateNicVlanMembershipCommandWrapperTest.java | 127 +++
.../storage/motion/LinstorDataMotionStrategy.java | 11 +
.../motion/LinstorDataMotionStrategyTest.java | 6 +
.../storage/motion/StorPoolDataMotionStrategy.java | 17 +-
.../api/command/LinkAccountToLdapCmd.java | 4 +-
.../api/command/LinkAccountToLdapCmdTest.java | 8 +
pom.xml | 77 +-
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 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 22 +
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +
.../consoleproxy/ConsoleProxyManagerImpl.java | 1 +
.../deploy/DeploymentPlanningManagerImpl.java | 42 +
.../com/cloud/hypervisor/HypervisorGuruBase.java | 33 +
.../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/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/user/AccountManagerImpl.java | 34 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 306 ++++-
.../java/com/cloud/vm/UserVmStateListener.java | 6 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 11 +
.../storage/template/VnfTemplateManagerImpl.java | 27 +
.../cloudstack/vm/ImportVmTasksManagerImpl.java | 43 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 5 +-
.../auth/DefaultLoginAPIAuthenticatorCmdTest.java | 105 ++
.../com/cloud/api/query/QueryManagerImplTest.java | 53 +
.../cloud/api/query/dao/VolumeJoinDaoImplTest.java | 173 ++-
.../deploy/DeploymentPlanningManagerImplTest.java | 118 ++
.../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 +
.../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 +
.../template/VnfTemplateManagerImplTest.java | 20 +
.../SecondaryStorageManagerImpl.java | 1 +
systemvm/debian/opt/cloud/bin/cs_dhcp.py | 20 +-
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 | 3 +
ui/public/locales/en.json | 32 +
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 | 3 +
ui/public/locales/ru_RU.json | 3 +
ui/public/locales/te.json | 3 +
ui/public/locales/zh_CN.json | 3 +
ui/src/components/view/ListView.vue | 13 +-
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/CloneNetworkOffering.vue | 11 +-
ui/src/views/offering/CloneVpcOffering.vue | 68 +-
ui/src/views/storage/ResizeVolume.vue | 31 +-
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 ++
186 files changed, 11404 insertions(+), 568 deletions(-)
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%)
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
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
