B&R: Show backup offerings with userDrivenBackupsAllowed=false to all users #11889

abh1sar · 2025-10-22T12:30:00Z

Description

This PR fixes #11878

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?

Set allowuserdrivenbackups=false
list backup offerings as a normal user
Verified that the offering is showing
Verified that assign offering to an instance is also working as the user
Verified that create backup is failing with the error "The assigned backup offering does not allow ad-hoc user backup"

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

codecov · 2025-10-22T12:38:31Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.56%. Comparing base (8b9f5fd) to head (b04d744).
⚠️ Report is 123 commits behind head on 4.22.

Additional details and impacted files

@@             Coverage Diff              @@
##               4.22   #11889      +/-   ##
============================================
- Coverage     17.56%   17.56%   -0.01%     
+ Complexity    15533    15531       -2     
============================================
  Files          5909     5909              
  Lines        528970   529006      +36     
  Branches      64602    64602              
============================================
- Hits          92917    92912       -5     
- Misses       425603   425646      +43     
+ Partials      10450    10448       -2

Flag	Coverage Δ
uitests	`3.58% <ø> (-0.01%)`	⬇️
unittests	`18.63% <ø> (-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.

vishesh92

clgtm

vishesh92 · 2026-01-12T06:58:22Z

@blueorangutan package

blueorangutan · 2026-01-12T07:00:05Z

@vishesh92 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 · 2026-01-12T08:29:18Z

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

blueorangutan · 2026-01-13T01:44:02Z

[SF] Trillian test result (tid-15165)
Environment: kvm-ol9 (x2), zone: Advanced Networking with Mgmt server ol9
Total time taken: 58921 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11889-t15165-kvm-ol9.zip
Smoke tests completed. 148 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`	45.32	test_kubernetes_clusters.py

vishesh92

lgtm. Tested the listing in the dashboard for a normal user for backup offerings. Before, non-user driver backup offerings were not showing up in the dropdown. After the changes, it's listing all the backup offerings.

RosiKyu · 2026-01-19T12:40:57Z

Test Case 1: Admin creates SLA backup offering (userDrivenBackupsAllowed=false)

Objective: Verify that an administrator can successfully create an SLA-type backup offering with allowuserdrivenbackups=false.

Environment:

CloudStack Management Server: ref-trl-10594-k-Mol9-rositsa-kyuchukova-mgmt1
Zone: ref-trl-10594-k-Mol9-rositsa-kyuchukova (ID: bd294515-c45a-4223-80d2-d687a3cc4818)
Backup Provider: dummy

Test Steps:

As admin, import a backup offering with allowuserdrivenbackups=false
Verify the offering is created and listed

Expected Result: SLA backup offering is created successfully with allowuserdrivenbackups=false

Evidence:

Created SLA backup offering:

(localcloud) 🐱 > import backupoffering externalid=gold-policy zoneid=bd294515-c45a-4223-80d2-d687a3cc4818 name="SLA-Gold-Backup" description="SLA managed backup - no user control" allowuserdrivenbackups=false
{
  "backupoffering": {
    "allowuserdrivenbackups": false,
    "created": "2026-01-19T12:34:14+0000",
    "description": "SLA managed backup - no user control",
    "externalid": "gold-policy",
    "id": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
    "name": "SLA-Gold-Backup",
    "provider": "dummy",
    "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
    "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
  }
}

Verified offering exists:

(localcloud) 🐱 > list backupofferings listall=true
{
  "backupoffering": [
    {
      "allowuserdrivenbackups": false,
      "created": "2026-01-19T12:34:14+0000",
      "description": "SLA managed backup - no user control",
      "externalid": "gold-policy",
      "id": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "name": "SLA-Gold-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    }
  ],
  "count": 1
}

Test Result: PASS - Admin successfully created SLA backup offering with allowuserdrivenbackups=false

Test Case 2: Admin creates ADHOC backup offering (userDrivenBackupsAllowed=true)

Objective: Verify that an administrator can successfully create an ADHOC-type backup offering with allowuserdrivenbackups=true.

Environment:

CloudStack Management Server: ref-trl-10594-k-Mol9-rositsa-kyuchukova-mgmt1
Zone: ref-trl-10594-k-Mol9-rositsa-kyuchukova (ID: bd294515-c45a-4223-80d2-d687a3cc4818)
Backup Provider: dummy

Test Steps:

As admin, import a backup offering with allowuserdrivenbackups=true
Verify both SLA and ADHOC offerings are listed

Expected Result: ADHOC backup offering is created successfully with allowuserdrivenbackups=true

Evidence:

Created ADHOC backup offering:

(localcloud) 🐱 > import backupoffering externalid=silver-policy zoneid=bd294515-c45a-4223-80d2-d687a3cc4818 name="ADHOC-Silver-Backup" description="User-controlled backup - can trigger manually" allowuserdrivenbackups=true
{
  "backupoffering": {
    "allowuserdrivenbackups": true,
    "created": "2026-01-19T12:36:52+0000",
    "description": "User-controlled backup - can trigger manually",
    "externalid": "silver-policy",
    "id": "a8cebf94-a04b-4b02-aec0-816c0f1f2439",
    "name": "ADHOC-Silver-Backup",
    "provider": "dummy",
    "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
    "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
  }
}

Verified both offerings exist:

(localcloud) 🐱 > list backupofferings listall=true
{
  "backupoffering": [
    {
      "allowuserdrivenbackups": false,
      "created": "2026-01-19T12:34:14+0000",
      "description": "SLA managed backup - no user control",
      "externalid": "gold-policy",
      "id": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "name": "SLA-Gold-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    },
    {
      "allowuserdrivenbackups": true,
      "created": "2026-01-19T12:36:52+0000",
      "description": "User-controlled backup - can trigger manually",
      "externalid": "silver-policy",
      "id": "a8cebf94-a04b-4b02-aec0-816c0f1f2439",
      "name": "ADHOC-Silver-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    }
  ],
  "count": 2
}

Test Result: PASS - Admin successfully created ADHOC backup offering with allowuserdrivenbackups=true. Both SLA and ADHOC offerings are now available.

Test Case 3: Regular user can list both SLA and ADHOC backup offerings

Objective: Verify that a non-admin user can list both SLA (allowuserdrivenbackups=false) and ADHOC (allowuserdrivenbackups=true) backup offerings after the fix.

Environment:

CloudStack Management Server: ref-trl-10594-k-Mol9-rositsa-kyuchukova-mgmt1
Zone: ref-trl-10594-k-Mol9-rositsa-kyuchukova
Backup Provider: dummy
Test User: ACSUser (accounttype=0, regular user)

Preconditions:

SLA offering SLA-Gold-Backup exists with allowuserdrivenbackups=false
ADHOC offering ADHOC-Silver-Backup exists with allowuserdrivenbackups=true

Test Steps:

Switch to regular user profile (acsuser)
List backup offerings

Expected Result: Regular user can see BOTH SLA and ADHOC backup offerings

Evidence:

(acsuser) 🐱 > list backupofferings
{
  "backupoffering": [
    {
      "allowuserdrivenbackups": false,
      "created": "2026-01-19T12:34:14+0000",
      "description": "SLA managed backup - no user control",
      "externalid": "gold-policy",
      "id": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "name": "SLA-Gold-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    },
    {
      "allowuserdrivenbackups": true,
      "created": "2026-01-19T12:36:52+0000",
      "description": "User-controlled backup - can trigger manually",
      "externalid": "silver-policy",
      "id": "a8cebf94-a04b-4b02-aec0-816c0f1f2439",
      "name": "ADHOC-Silver-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    }
  ],
  "count": 2
}

Test Result: PASS - Regular user can now list both SLA and ADHOC backup offerings. PR #11889 fixes the bug reported in #11878.

Test Case 4: Regular user can assign SLA offering to VM

Objective: Verify that a non-admin user can assign an SLA backup offering (allowuserdrivenbackups=false) to their VM.

Environment:

CloudStack Management Server: ref-trl-10594-k-Mol9-rositsa-kyuchukova-mgmt1
Zone: ref-trl-10594-k-Mol9-rositsa-kyuchukova
Backup Provider: dummy
Test User: ACSUser (accounttype=0, regular user)

Preconditions:

SLA offering SLA-Gold-Backup exists with allowuserdrivenbackups=false
VM test-vm-backup owned by ACSUser in Running state

Test Steps:

As regular user, assign SLA backup offering to VM
Verify the backup offering is assigned to the VM

Expected Result: Regular user can successfully assign SLA backup offering to their VM

Evidence:

Assigned SLA backup offering to VM:

(acsuser) 🐱 > assign virtualmachinetobackupoffering virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 backupofferingid=21daf30a-d8cf-4eb1-9d47-d0e77f21bba0 
{
  "success": true
}

Verified backup offering assignment:

(acsuser) 🐱 > list virtualmachines id=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 filter=id,name,backupofferingid,backupofferingname
{
  "count": 1,
  "virtualmachine": [
    {
      "backupofferingid": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "backupofferingname": "SLA-Gold-Backup",
      "id": "2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1",
      "name": "test-vm-backup"
    }
  ]
}

Test Result: PASS - Regular user successfully assigned SLA backup offering to their VM. This confirms PR #11889 fixes the assignment issue reported in #11878.

Test Case 5: Regular user cannot manually trigger backup on SLA offering

Objective: Verify that a non-admin user cannot manually create a backup when assigned an SLA backup offering (allowuserdrivenbackups=false). This ensures the security model is preserved after the fix.

Environment:

CloudStack Management Server: ref-trl-10594-k-Mol9-rositsa-kyuchukova-mgmt1
Zone: ref-trl-10594-k-Mol9-rositsa-kyuchukova
Backup Provider: dummy
Test User: ACSUser (accounttype=0, regular user)

Preconditions:

VM test-vm-backup has SLA offering SLA-Gold-Backup assigned (allowuserdrivenbackups=false)

Test Steps:

As regular user, attempt to manually create a backup for the VM

Expected Result: Operation should fail with error indicating ad-hoc backups are not allowed

Evidence:

(acsuser) 🐱 > create backup virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1
{
  "jobresult": {
    "errorcode": 530,
    "errortext": "The assigned backup offering does not allow ad-hoc user backup"
  },
  "jobresultcode": 530,
  "jobstatus": 2
}
🙈 Error: async API failed for job 1743191d-4ca9-4981-9318-59cba1f3d1eb

Test Result: PASS - Regular user correctly denied manual backup creation on SLA offering. Security model is preserved.

Test Case 6: Regular user cannot schedule backups on SLA offering

Objective: Verify that a non-admin user cannot create a backup schedule when assigned an SLA backup offering (allowuserdrivenbackups=false). This ensures the security model is preserved after the fix.

Preconditions:

VM test-vm-backup has SLA offering SLA-Gold-Backup assigned (allowuserdrivenbackups=false)

Test Steps:

As regular user, attempt to create a backup schedule for the VM

Expected Result: Operation should fail with error indicating user-defined schedules are not allowed

Evidence:

(acsuser) 🐱 > create backupschedule virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 intervaltype=weekly schedule=00:00 timezone=UTC
🙈 Error: (HTTP 530, error code 9999) The selected backup offering does not allow user-defined backup schedule

Test Result: PASS - Regular user correctly denied backup schedule creation on SLA offering. Security model is preserved.

Test Case 7: Regular user can trigger and schedule backups on ADHOC offering

Objective: Verify that a non-admin user can manually create backups and define schedules when assigned an ADHOC backup offering (allowuserdrivenbackups=true).

Preconditions:

VM test-vm-backup owned by ACSUser
ADHOC offering ADHOC-Silver-Backup exists with allowuserdrivenbackups=true

Test Steps:

Remove existing SLA backup offering from VM
Assign ADHOC backup offering to VM
Manually trigger a backup
Create a backup schedule

Expected Result: All operations should succeed with ADHOC offering

Evidence:

Removed SLA offering and assigned ADHOC offering:

(acsuser) 🐱 > remove virtualmachinefrombackupoffering virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 forced=true
{
  "success": true
}
(acsuser) 🐱 > assign virtualmachinetobackupoffering virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 backupofferingid=a8cebf94-a04b-4b02-aec0-816c0f1f2439
{
  "success": true
}

Successfully created manual backup:

(acsuser) 🐱 > create backup virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1
{
  "success": true
}

Successfully created backup schedule:

(acsuser) 🐱 > create backupschedule virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 intervaltype=daily schedule=00:00 timezone=UTC
{
  "backupschedule": {
    "id": "489dc37a-e034-41ca-ab0b-50e73ad0130a",
    "intervaltype": "DAILY",
    "maxbackups": 0,
    "schedule": "00:00",
    "timezone": "UTC",
    "virtualmachineid": "2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1",
    "virtualmachinename": "test-vm-backup"
  }
}

Test Result: PASS - Regular user can successfully create manual backups and schedules with ADHOC offering. This confirms the differentiation between SLA and ADHOC offerings works correctly.

Test Case 8: Domain admin behavior with both offering types

Objective: Verify that a Domain Admin can list both SLA and ADHOC backup offerings, and can assign SLA offerings to VMs within their domain.

Environment:

CloudStack Management Server: ref-trl-10594-k-Mol9-rositsa-kyuchukova-mgmt1
Zone: ref-trl-10594-k-Mol9-rositsa-kyuchukova
Backup Provider: dummy
Test User: domainadmin (accounttype=2, Domain Admin)

Preconditions:

SLA offering SLA-Gold-Backup exists with allowuserdrivenbackups=false
ADHOC offering ADHOC-Silver-Backup exists with allowuserdrivenbackups=true
VM test-vm-backup exists in the same domain

Test Steps:

As Domain Admin, list backup offerings
Verify Domain Admin can see VMs in their domain
Assign SLA backup offering to a VM

Expected Result: Domain Admin can list both offering types and assign SLA offerings to VMs

Evidence:

Domain Admin can list both offerings:

(domainadmin) 🐱 > list backupofferings
{
  "backupoffering": [
    {
      "allowuserdrivenbackups": false,
      "created": "2026-01-19T12:34:14+0000",
      "description": "SLA managed backup - no user control",
      "externalid": "gold-policy",
      "id": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "name": "SLA-Gold-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    },
    {
      "allowuserdrivenbackups": true,
      "created": "2026-01-19T12:36:52+0000",
      "description": "User-controlled backup - can trigger manually",
      "externalid": "silver-policy",
      "id": "a8cebf94-a04b-4b02-aec0-816c0f1f2439",
      "name": "ADHOC-Silver-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    }
  ],
  "count": 2
}

Domain Admin can see VMs in domain:

(domainadmin) 🐱 > list virtualmachines listall=true filter=id,name,account,backupofferingname
{
  "count": 1,
  "virtualmachine": [
    {
      "account": "ACSUser",
      "backupofferingname": "ADHOC-Silver-Backup",
      "id": "2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1",
      "name": "test-vm-backup"
    }
  ]
}

Domain Admin can assign SLA offering to VM:

(domainadmin) 🐱 > remove virtualmachinefrombackupoffering virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 forced=true
{
  "success": true
}
(domainadmin) 🐱 > assign virtualmachinetobackupoffering virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 backupofferingid=21daf30a-d8cf-4eb1-9d47-d0e77f21bba0
{
  "success": true
}

Test Result: PASS - Domain Admin can list both SLA and ADHOC offerings and assign SLA offerings to VMs within their domain.

Test Case 9: Assign/unassign SLA offering, then reassign

Objective: Verify that SLA backup offerings can be assigned, removed, and reassigned to VMs without issues.

Environment:

Test User: admin

Preconditions:

VM test-vm-backup with SLA offering SLA-Gold-Backup assigned

Test Steps:

Remove backup offering from VM
Verify offering is removed
Reassign SLA offering to VM
Verify offering is reassigned

Expected Result: Full cycle of assign/unassign/reassign works correctly

Evidence:

Initial state - SLA offering assigned:

(admin) 🐱 > list virtualmachines id=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 filter=id,name,backupofferingid,backupofferingname
{
  "count": 1,
  "virtualmachine": [
    {
      "backupofferingid": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "backupofferingname": "SLA-Gold-Backup",
      "id": "2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1",
      "name": "test-vm-backup"
    }
  ]
}

Removed offering:

(admin) 🐱 > remove virtualmachinefrombackupoffering virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 forced=true
{
  "success": true
}
(admin) 🐱 > list virtualmachines id=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 filter=id,name,backupofferingid,backupofferingname
{
  "count": 1,
  "virtualmachine": [
    {
      "id": "2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1",
      "name": "test-vm-backup"
    }
  ]
}

Reassigned SLA offering:

(admin) 🐱 > assign virtualmachinetobackupoffering virtualmachineid=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 backupofferingid=21daf30a-d8cf-4eb1-9d47-d0e77f21bba0
{
  "success": true
}
(admin) 🐱 > list virtualmachines id=2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1 filter=id,name,backupofferingid,backupofferingname
{
  "count": 1,
  "virtualmachine": [
    {
      "backupofferingid": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "backupofferingname": "SLA-Gold-Backup",
      "id": "2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1",
      "name": "test-vm-backup"
    }
  ]
}

Test Result: PASS - Full cycle of assign/unassign/reassign works correctly for SLA offerings.

Test Case 10: API filtering with `keyword` parameter

Objective: Verify that the keyword filter parameter works for listing backup offerings.

Test Steps:

List all backup offerings
Test keyword filter with various values

Expected Result: keyword filter returns matching offerings

Evidence:

Listed all offerings (3 exist: test, test1, test2):

(localcloud) 🐱 > list backupofferings 
{
  "backupoffering": [
    { "name": "test", ... },
    { "name": "test1", ... },
    { "name": "test2", ... }
  ],
  "count": 3
}

keyword filter returns empty:

(localcloud) 🐱 > list backupofferings keyword=test1
(localcloud) 🐱 >
(localcloud) 🐱 > list backupofferings keyword=test
(localcloud) 🐱 >

Test Result: OBSERVATION - The keyword filter does not return results. This is a pre-existing issue unrelated to PR #11889. The PR only removed user-type filtering and does not modify keyword search logic.

Test Case 11: Pagination of backup offerings list

Objective: Verify that pagination works correctly for listing backup offerings.

Test Steps:

List backup offerings with pagesize=1, page=1
List backup offerings with pagesize=1, page=2

Expected Result: Pagination returns correct results per page

Evidence:

Page 1:

(localcloud) 🐱 > list backupofferings pagesize=1 page=1
{
  "backupoffering": [
    {
      "allowuserdrivenbackups": true,
      "name": "test",
      ...
    }
  ],
  "count": 3
}

Page 2:

(localcloud) 🐱 > list backupofferings pagesize=1 page=2
{
  "backupoffering": [
    {
      "allowuserdrivenbackups": true,
      "name": "test1",
      ...
    }
  ],
  "count": 3
}

Test Result: PASS - Pagination works correctly. Each page returns the expected single result while count shows total of 3 offerings.

Test Case 12: Existing VMs with backup offerings unaffected

Objective: Verify that existing VMs with backup offerings assigned continue to function correctly after the fix.

Environment:

CloudStack Management Server: ref-trl-10594-k-Mol9-rositsa-kyuchukova-mgmt1
Zone: ref-trl-10594-k-Mol9-rositsa-kyuchukova
Backup Provider: dummy

Preconditions:

VM test-vm-backup has SLA offering assigned from previous tests

Test Steps:

List VMs with backup offering details
Verify backup offering assignment is intact

Expected Result: Existing VM backup offering assignments remain intact

Evidence:

(admin) 🐱 > list virtualmachines listall=true filter=id,name,account,backupofferingid,backupofferingname
{
  "count": 1,
  "virtualmachine": [
    {
      "account": "ACSUser",
      "backupofferingid": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "backupofferingname": "SLA-Gold-Backup",
      "id": "2aeb849a-2bef-47a8-8b3a-8a81d24dcfe1",
      "name": "test-vm-backup"
    }
  ]
}

Test Result: PASS - Existing VM backup offering assignment remains intact and functional.

Test Case 13: UI Verification: Regular user can see both SLA and ADHOC offerings

Objective: Verify that the UI displays both SLA and ADHOC backup offerings to regular users.

Environment:

CloudStack UI: http://10.0.35.11:8080/client
Logged in as: Test User (regular user)

Test Steps:

Login as regular user
Navigate to Compute → Instances → Assign Instance to backup offering
Check backup offering dropdown
Navigate to Service Offerings → Backup Offerings
Verify both offerings are listed

Expected Result: Both SLA and ADHOC offerings visible to regular user

Evidence:

VM Assignment dropdown shows both offerings:

SLA-Gold-Backup
ADHOC-Silver-Backup

Backup Offerings list shows both offerings:

SLA-Gold-Backup - "SLA managed backup - no user control"
ADHOC-Silver-Backup - "User-controlled backup - can trigger manually"

(admin) 🐱 > list backupofferings 
{
  "backupoffering": [
    {
      "allowuserdrivenbackups": false,
      "created": "2026-01-19T12:34:14+0000",
      "description": "SLA managed backup - no user control",
      "externalid": "gold-policy",
      "id": "21daf30a-d8cf-4eb1-9d47-d0e77f21bba0",
      "name": "SLA-Gold-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    },
    {
      "allowuserdrivenbackups": true,
      "created": "2026-01-19T12:36:52+0000",
      "description": "User-controlled backup - can trigger manually",
      "externalid": "silver-policy",
      "id": "a8cebf94-a04b-4b02-aec0-816c0f1f2439",
      "name": "ADHOC-Silver-Backup",
      "provider": "dummy",
      "zoneid": "bd294515-c45a-4223-80d2-d687a3cc4818",
      "zonename": "ref-trl-10594-k-Mol9-rositsa-kyuchukova"
    }
  ],
  "count": 2
}

Test Result: PASS - UI correctly displays both SLA and ADHOC backup offerings to regular users.

RosiKyu

LGTM

Tested PR #11889 on CloudStack 4.22 environment with dummy backup provider.

Test Summary

#	Test Case	Result
1	Admin creates SLA offering (`allowuserdrivenbackups=false`)	PASS
2	Admin creates ADHOC offering (`allowuserdrivenbackups=true`)	PASS
3	Regular user can list both SLA and ADHOC offerings	PASS
4	Regular user can assign SLA offering to VM	PASS
5	Regular user cannot manually trigger backup on SLA offering	PASS
6	Regular user cannot schedule backups on SLA offering	PASS
7	Regular user can trigger/schedule on ADHOC offering	PASS
8	Domain admin can list and assign both offering types	PASS
9	Assign/unassign/reassign SLA offering cycle	PASS
10	API filtering (`keyword` parameter)	Pre-existing bug (unrelated to PR) #12466
11	Pagination of backup offerings list	PASS
12	Existing VMs with backup offerings unaffected	PASS
13	UI: Regular user sees both offerings in dropdown	PASS

Environment

Management Server: ref-trl-10594-k-Mol9-rositsa-kyuchukova-mgmt1
Backup Provider: dummy
Tested roles: Root Admin, Domain Admin, Regular User

Conclusion

PR fixes #11878 correctly. Regular users can now list and assign SLA backup offerings while security restrictions (no manual backup/schedule on SLA) are preserved.

Note: The keyword filter in listBackupOfferings API does not work, but this is a pre-existing issue unrelated to this PR.

Detailed Test Report: #11889 (comment)

Show backup offerings with userDrivenBackupsAllowed=false to all users

b04d744

boring-cyborg bot added the component:backup label Oct 22, 2025

abh1sar added this to the 4.22.1 milestone Oct 30, 2025

abh1sar requested a review from sureshanaparti November 12, 2025 05:41

abh1sar added the status:needs-review label Nov 12, 2025

abh1sar changed the base branch from main to 4.22 January 2, 2026 09:26

rajujith added this to Apache CloudStack 4.22.1 Jan 5, 2026

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.1 Jan 7, 2026

vishesh92 approved these changes Jan 12, 2026

View reviewed changes

vishesh92 self-assigned this Jan 12, 2026

vishesh92 approved these changes Jan 13, 2026

View reviewed changes

DaanHoogland removed the status:needs-review label Jan 13, 2026

RosiKyu assigned RosiKyu and unassigned vishesh92 Jan 13, 2026

RosiKyu added the status:needs-testing label Jan 13, 2026

DaanHoogland unassigned RosiKyu Jan 16, 2026

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

RosiKyu self-assigned this Jan 19, 2026

RosiKyu approved these changes Jan 19, 2026

View reviewed changes

RosiKyu added the status:ready-for-merge label Jan 19, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

B&R: Show backup offerings with userDrivenBackupsAllowed=false to all users #11889

B&R: Show backup offerings with userDrivenBackupsAllowed=false to all users #11889

abh1sar commented Oct 22, 2025

Uh oh!

codecov bot commented Oct 22, 2025 •

edited

Loading

Uh oh!

vishesh92 left a comment

Uh oh!

vishesh92 commented Jan 12, 2026

Uh oh!

blueorangutan commented Jan 12, 2026

Uh oh!

blueorangutan commented Jan 12, 2026

Uh oh!

blueorangutan commented Jan 13, 2026

Uh oh!

vishesh92 left a comment

Uh oh!

RosiKyu commented Jan 19, 2026 •

edited

Loading

Uh oh!

RosiKyu left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

B&R: Show backup offerings with userDrivenBackupsAllowed=false to all users #11889

Are you sure you want to change the base?

B&R: Show backup offerings with userDrivenBackupsAllowed=false to all users #11889

Conversation

abh1sar commented Oct 22, 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 Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

vishesh92 left a comment

Choose a reason for hiding this comment

Uh oh!

vishesh92 commented Jan 12, 2026

Uh oh!

blueorangutan commented Jan 12, 2026

Uh oh!

blueorangutan commented Jan 12, 2026

Uh oh!

blueorangutan commented Jan 13, 2026

Uh oh!

vishesh92 left a comment

Choose a reason for hiding this comment

Uh oh!

RosiKyu commented Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Case 1: Admin creates SLA backup offering (userDrivenBackupsAllowed=false)

Test Case 2: Admin creates ADHOC backup offering (userDrivenBackupsAllowed=true)

Test Case 3: Regular user can list both SLA and ADHOC backup offerings

Test Case 4: Regular user can assign SLA offering to VM

Test Case 5: Regular user cannot manually trigger backup on SLA offering

Test Case 6: Regular user cannot schedule backups on SLA offering

Test Case 7: Regular user can trigger and schedule backups on ADHOC offering

Test Case 8: Domain admin behavior with both offering types

Test Case 9: Assign/unassign SLA offering, then reassign

Test Case 10: API filtering with keyword parameter

Test Case 11: Pagination of backup offerings list

Test Case 12: Existing VMs with backup offerings unaffected

Test Case 13: UI Verification: Regular user can see both SLA and ADHOC offerings

Uh oh!

RosiKyu left a comment

Choose a reason for hiding this comment

LGTM

Test Summary

Environment

Conclusion

Detailed Test Report: #11889 (comment)

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Oct 22, 2025 •

edited

Loading

RosiKyu commented Jan 19, 2026 •

edited

Loading

Test Case 10: API filtering with `keyword` parameter