unlink an ldap domain by DaanHoogland · Pull Request #11962 · apache/cloudstack

DaanHoogland · Nov 3, 2025

Description

This PR

Fixes: #3685 partially as unlinking an account has no good functional definition (yet)
Fixes: #11474 by removing a long time deprecated parameter

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov · Nov 3, 2025

Codecov Report

❌ Patch coverage is 6.06061% with 31 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.48%. Comparing base (f06ac51) to head (9c68433).
⚠️ Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
...loudstack/api/command/UnlinkDomainFromLdapCmd.java	0.00%	16 Missing ⚠️
...va/org/apache/cloudstack/ldap/LdapManagerImpl.java	0.00%	13 Missing ⚠️
...he/cloudstack/api/command/LinkDomainToLdapCmd.java	33.33%	2 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #11962      +/-   ##
============================================
- Coverage     17.48%   17.48%   -0.01%     
- Complexity    15552    15554       +2     
============================================
  Files          5913     5914       +1     
  Lines        529650   529678      +28     
  Branches      64716    64718       +2     
============================================
+ Hits          92629    92633       +4     
- Misses       426576   426601      +25     
+ Partials      10445    10444       -1

Flag	Coverage Δ
uitests	`3.58% <ø> (-0.01%)`	⬇️
unittests	`18.55% <6.06%> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copilot

Pull Request Overview

This PR adds functionality to unlink a CloudStack domain from LDAP, complementing the existing linkDomainToLdap functionality. The changes also include refactoring improvements to clean up the LinkDomainToLdapCmd by removing deprecated parameters and improving logging.

Key Changes

Added new unlinkDomainFromLdap API command to remove domain-to-LDAP linkages
Removed deprecated name parameter and improved the LinkDomainToLdapCmd implementation
Applied minor code modernization (diamond operator, parametrized logging)

Reviewed Changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
UnlinkDomainFromLdapCmd.java	New API command for unlinking domains from LDAP
LdapManager.java	Added interface method for unlinking and removed trailing semicolon from enum
LdapManagerImpl.java	Implemented unlinkDomainFromLdap method and applied diamond operator refactoring
LinkDomainToLdapCmd.java	Removed deprecated `name` parameter, made `ldapDomain` required, and improved logging
pom.xml	Added explicit cloud-api dependency

Comments suppressed due to low confidence (1)

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java:308

The new UnlinkDomainFromLdapCmd class is not registered in the getCommands() list, which means it won't be available as an API command. Add cmdList.add(UnlinkDomainFromLdapCmd.class); before the return statement.

        final List<Class<?>> cmdList = new ArrayList<>();
        cmdList.add(LdapUserSearchCmd.class);
        cmdList.add(LdapListUsersCmd.class);
        cmdList.add(LdapAddConfigurationCmd.class);
        cmdList.add(LdapDeleteConfigurationCmd.class);
        cmdList.add(LdapListConfigurationCmd.class);
        cmdList.add(LdapCreateAccountCmd.class);
        cmdList.add(LdapImportUsersCmd.class);
        cmdList.add(LDAPConfigCmd.class);
        cmdList.add(LDAPRemoveCmd.class);
        cmdList.add(LinkDomainToLdapCmd.class);
        cmdList.add(LinkAccountToLdapCmd.class);
        return cmdList;

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

...enticators/ldap/src/main/java/org/apache/cloudstack/api/command/UnlinkDomainFromLdapCmd.java

plugins/user-authenticators/ldap/pom.xml

shwstppr

some comments, idea looks good. Will need testing

plugins/user-authenticators/ldap/pom.xml

...enticators/ldap/src/main/java/org/apache/cloudstack/api/command/UnlinkDomainFromLdapCmd.java

vishesh92

Code looks good to me. Just one change is required.

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java

kiranchavala

@DaanHoogland

(localcloud) 🐱 > link domaintoldap domainid=0735d7e8-5dcc-4b48-8049-81c69d8830d3 type=GROUP accounttype=2 ldapdomain=cn=qa-team,ou=Telco-Bng,dc=example,dc=in name=qa admin=admin
{
  "LinkDomainToLdap": {
    "accounttype": 2,
    "domainid": "0735d7e8-5dcc-4b48-8049-81c69d8830d3",
    "ldapdomain": "cn=qa-team,ou=Telco-Bng,dc=example,dc=in",
    "name": "cn=qa-team,ou=Telco-Bng,dc=example,dc=in",
    "type": "GROUP"
  }
}

mysql> select * from ldap_configuration;
+----+-----------+------+-----------+--------------------------------------+
| id | hostname  | port | domain_id | uuid                                 |
+----+-----------+------+-----------+--------------------------------------+
|  2 | localhost |  389 |         2 | e07853d9-73dc-4486-9acf-66937c8123a5 |
+----+-----------+------+-----------+--------------------------------------+
1 row in set (0.00 sec)

mysql> select * from ldap_trust_map;
+----+-----------+-------+------------------------------------------+--------------+------------+
| id | domain_id | type  | name                                     | account_type | account_id |
+----+-----------+-------+------------------------------------------+--------------+------------+
|  1 |         2 | GROUP | cn=qa-team,ou=Telco-Bng,dc=example,dc=in |            2 |          0 |
+----+-----------+-------+------------------------------------------+--------------+------------+
1 row in set (0.00 sec)

Getting the following response from the api , but the entry is deleted from the database

(localcloud) 🐱 > unlink domainfromldap domainid=0735d7e8-5dcc-4b48-8049-81c69d8830d3
🙈 Error: failed to decode response

mysql> select * from ldap_trust_map;
Empty set (0.00 sec)

Also the UI progress doesn't stop when a user tried to link domain to ldap

DaanHoogland · Nov 5, 2025

@kiranchavala , those issues are fixed, however there are some polish issues remaining, like the condition to enable link or unlink are not available in the UI atm and I need to decide/discuss how to address these.

rajujith · Nov 14, 2025

@DaanHoogland, there is a similar use case with accounts where there are no UI options https://cloudstack.apache.org/api/apidocs-4.20/apis/linkAccountToLdap.html. Should this also be considered in this PR?

kiranchavala · Nov 14, 2025

@DaanHoogland, there is a similar use case with accounts where there are no UI options https://cloudstack.apache.org/api/apidocs-4.20/apis/linkAccountToLdap.html. Should this also be considered in this PR?

Yes @rajujith @DaanHoogland

The improvement issue is already present

#11473

DaanHoogland · Nov 14, 2025

@DaanHoogland, there is a similar use case with accounts where there are no UI options https://cloudstack.apache.org/api/apidocs-4.20/apis/linkAccountToLdap.html. Should this also be considered in this PR?

Yes @rajujith @DaanHoogland

The improvement issue is already present

#11473

guys (@rajujith @kiranchavala), I don’t want to add and create a big beautiful PR. I’d rather implement smaller well tested changes, if you don’t mind. We need to have a backend change in DomainResponse as well to be able to decide whether to show the link or the unlink button. I am sure we will find more issues while working on this.

Pearl1594

Linking and unlinking of domain to ldap works fine, however, as an improvement to this it would be nice to selectively show and hide the link/unlink buttons based on whether the domain is linked to an LDAP or not. But that could happen on a separate PR> Also, ldapdomain requires translation

blueorangutan · Dec 10, 2025

[SF] Trillian test result (tid-14926)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 52399 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11962-t14926-kvm-ol8.zip
Smoke tests completed. 144 look OK, 6 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_secure_vm_migration	`Error`	133.98	test_vm_life_cycle.py
test_01_secure_vm_migration	`Error`	133.99	test_vm_life_cycle.py
test_08_migrate_vm	`Error`	14.84	test_vm_life_cycle.py
test_01_migrate_vm_strict_tags_success	`Error`	76.11	test_vm_strict_host_tags.py
test_01_verify_ipv6_vpc	`Error`	53.15	test_vpc_ipv6.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL	`Error`	106.98	test_vpc_redundant.py
test_02_redundant_VPC_default_routes	`Error`	63.03	test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers	`Error`	56.28	test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics	`Error`	103.70	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Error`	108.75	test_vpc_redundant.py
test_01_redundant_vpc_site2site_vpn	`Failure`	56.35	test_vpc_vpn.py
test_01_vpc_site2site_vpn_multiple_options	`Failure`	100.33	test_vpc_vpn.py
test_01_vpc_site2site_vpn	`Failure`	100.33	test_vpc_vpn.py
test_01_cancel_host_maintenance_ssh_enabled_agent_connected	`Failure`	1.15	test_host_maintenance.py
test_03_cancel_host_maintenance_ssh_disabled_agent_connected	`Failure`	1.13	test_host_maintenance.py
test_04_cancel_host_maintenance_ssh_disabled_agent_disconnected	`Failure`	0.14	test_host_maintenance.py

blueorangutan · Dec 10, 2025

[SF] Trillian Build Failed (tid-14955)

...enticators/ldap/src/main/java/org/apache/cloudstack/api/command/UnlinkDomainFromLdapCmd.java

sureshanaparti

clgtm

blueorangutan · Dec 16, 2025

[SF] Trillian test result (tid-14994)
Environment: kvm-ol9 (x2), zone: Advanced Networking with Mgmt server ol9
Total time taken: 62170 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11962-t14994-kvm-ol9.zip
Smoke tests completed. 146 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestClusterDRS>:setup	`Error`	0.00	test_cluster_drs.py
test_list_system_vms_metrics_history	`Failure`	0.19	test_metrics_api.py
test_01_deployVMInSharedNetwork	`Failure`	265.67	test_network.py
ContextSuite context=TestResetVmOnReboot>:setup	`Error`	0.00	test_reset_vm_on_reboot.py

Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

DaanHoogland · Dec 16, 2025

@blueorangutan package

blueorangutan · Dec 16, 2025

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · Dec 16, 2025

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16053

DaanHoogland · Dec 16, 2025

@blueorangutan test

blueorangutan · Dec 16, 2025

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · Dec 17, 2025

[SF] Trillian test result (tid-14999)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 53542 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11962-t14999-kvm-ol8.zip
Smoke tests completed. 149 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_03_deploy_and_scale_kubernetes_cluster	`Failure`	26.87	test_kubernetes_clusters.py

Co-authored-by: Daan Hoogland <dahn@apache.org> Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com> Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

boring-cyborg bot added component:build component:LDAP labels Nov 3, 2025

DaanHoogland requested review from Pearl1594, Copilot and kiranchavala November 3, 2025 08:10

Copilot AI reviewed Nov 3, 2025

View reviewed changes

...enticators/ldap/src/main/java/org/apache/cloudstack/api/command/UnlinkDomainFromLdapCmd.java Outdated Show resolved Hide resolved

plugins/user-authenticators/ldap/pom.xml Show resolved Hide resolved

shwstppr reviewed Nov 3, 2025

View reviewed changes

DaanHoogland added the status:needs-testing label Nov 4, 2025

DaanHoogland assigned rajujith Nov 4, 2025

vishesh92 reviewed Nov 5, 2025

View reviewed changes

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java Show resolved Hide resolved

boring-cyborg bot added the component:UI label Nov 5, 2025

kiranchavala reviewed Nov 5, 2025

View reviewed changes

apache deleted a comment from blueorangutan Nov 5, 2025

DaanHoogland force-pushed the ghi3685-unlinkLdap branch from e2bf6fd to 4c5e20c Compare November 13, 2025 15:29

Pearl1594 approved these changes Dec 2, 2025

View reviewed changes

DaanHoogland force-pushed the ghi3685-unlinkLdap branch from 20b5413 to f58fbd1 Compare December 8, 2025 16:05

DaanHoogland added this to the 4.23 milestone Dec 8, 2025

apache deleted a comment from blueorangutan Dec 8, 2025

sureshanaparti reviewed Dec 10, 2025

View reviewed changes

...enticators/ldap/src/main/java/org/apache/cloudstack/api/command/UnlinkDomainFromLdapCmd.java Outdated Show resolved Hide resolved

sureshanaparti approved these changes Dec 10, 2025

View reviewed changes

Daan Hoogland and others added 12 commits December 16, 2025 11:52

dependency added

55e82cc

removed deprecated parameter

4be82d2

unlink a domain from ldap

6ccb838

Update responce handling

71a1563

Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Update dependency version

abb2610

Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

text updates (polishing)

8397bf7

add command to manager

70e0664

unlink a domain from ldap from ui

6b633ce

set command name in resopnse

60e7c49

add message

de37190

label

98faea9

ID instead of id

9c68433

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

DaanHoogland force-pushed the ghi3685-unlinkLdap branch from 0728819 to 9c68433 Compare December 16, 2025 10:52

DaanHoogland mentioned this pull request Dec 17, 2025

kvm: use preallocation option for fat disk resize #11986

Merged

14 tasks

DaanHoogland merged commit 124fcde into apache:main Dec 17, 2025
42 of 45 checks passed

DaanHoogland deleted the ghi3685-unlinkLdap branch December 17, 2025 12:04

DaanHoogland removed the status:needs-testing label Jan 28, 2026

Search code, repositories, users, issues, pull requests...

Conversation

DaanHoogland commented Nov 3, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

codecov bot commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Key Changes

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

shwstppr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vishesh92 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Nov 5, 2025

Uh oh!

rajujith commented Nov 14, 2025

Uh oh!

kiranchavala commented Nov 14, 2025

Uh oh!

DaanHoogland commented Nov 14, 2025

Uh oh!

Pearl1594 left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Dec 10, 2025

Uh oh!

blueorangutan commented Dec 10, 2025

Uh oh!

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Dec 16, 2025

Uh oh!

DaanHoogland commented Dec 16, 2025

Uh oh!

blueorangutan commented Dec 16, 2025

Uh oh!

blueorangutan commented Dec 16, 2025

Uh oh!

DaanHoogland commented Dec 16, 2025

Uh oh!

blueorangutan commented Dec 16, 2025

Uh oh!

blueorangutan commented Dec 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov bot commented Nov 3, 2025 •

edited

Loading