api,server: encryptformat in volume response by shwstppr · Pull Request #9106 · apache/cloudstack

shwstppr · 2024-05-22T11:31:40Z

Description

Fixes #9014

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

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?

Fixes apache#9014 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

codecov · 2024-05-22T11:41:10Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 4.30%. Comparing base (87e7c57) to head (96d8e6b).
Report is 29 commits behind head on 4.19.

Additional details and impacted files

@@             Coverage Diff              @@
##               4.19   #9106       +/-   ##
============================================
- Coverage     14.96%   4.30%   -10.67%     
============================================
  Files          5373     363     -5010     
  Lines        469005   29302   -439703     
  Branches      58953    5116    -53837     
============================================
- Hits          70198    1261    -68937     
+ Misses       391036   27898   -363138     
+ Partials       7771     143     -7628

Flag	Coverage Δ
uitests	`4.30% <ø> (-0.02%)`	⬇️
unittests	`?`

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.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

DaanHoogland

clgtm

DaanHoogland · 2024-05-22T13:23:03Z

@blueorangutan package

blueorangutan · 2024-05-22T13:24:03Z

@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.

weizhouapache

code lgtm

blueorangutan · 2024-05-22T14:28:59Z

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

DaanHoogland · 2024-05-22T17:49:51Z

@blueorangutan test

blueorangutan · 2024-05-22T17:52:04Z

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

blueorangutan · 2024-05-23T10:43:51Z

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

Test	Result	Time (s)	Test File
test_02_trigger_shutdown	`Failure`	341.85	test_safe_shutdown.py

sureshanaparti

clgtm

server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java

weizhouapache · 2024-05-29T20:25:30Z

@blueorangutan package

blueorangutan · 2024-05-29T20:26:03Z

@weizhouapache 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.

weizhouapache · 2024-05-29T20:26:49Z

engine/schema/src/main/resources/META-INF/db/views/cloud.volume_view.sql

    `volumes`.`path` AS `path`,
    `volumes`.`chain_info` AS `chain_info`,
    `volumes`.`external_uuid` AS `external_uuid`,
+    `volumes`.`passphrase_id` AS `passphrase_id`,


Suggested change

`volumes`.`passphrase_id` AS `passphrase_id`,

@JoaoJandre , are your concerns met?

@DaanHoogland no, we should apply @weizhouapache's suggestion here, no need to have this view changed for now.

sorry @JoaoJandre , I think we crossed messages (with Kiran in the mix) here. I don't see passphrase_id in the PR. so that means it is applied, right?

If not we'll need to create a new PR.

Yes, @DaanHoogland, it was applied in the last commit, before merging.

blueorangutan · 2024-05-29T21:34:40Z

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

DaanHoogland · 2024-06-03T08:06:03Z

@JoaoJandre , are your concerns met?

kiranchavala

LGTM, In the listVolumes api the response contains

"encryptformat": "luks",

(cmk) > list volumes id=68151b4c-5967-4ce8-b747-911ad7f33c73
{
  "count": 1,
  "volume": [
    {
      "account": "admin",
      "clusterid": "f9bf37c6-50a0-4cb5-ae72-5e64baa32cd2",
      "clustername": "p1-c1",
      "created": "2024-06-10T13:00:47+0000",
      "destroyed": false,
      "deviceid": 1,
      "diskioread": 0,
      "diskiowrite": 0,
      "diskkbsread": 0,
      "diskkbswrite": 0,
      "diskofferingdisplaytext": "encrypted-offering",
      "diskofferingid": "c401faa2-6ab7-479c-aa07-46b5786cbbe0",
      "diskofferingname": "encrypted-offering",
      "displayvolume": true,
      "domain": "ROOT",
      "domainid": "6917ae26-2724-11ef-9e8f-1e008b00026c",
      "encryptformat": "luks",
      "hasannotations": false,
      "hypervisor": "KVM",
      "id": "68151b4c-5967-4ce8-b747-911ad7f33c73",
      "isextractable": true,
      "name": "DATA-3",
      "path": "68151b4c-5967-4ce8-b747-911ad7f33c73",
      "physicalsize": 2359296,
      "podid": "c46f480b-210f-455d-a31b-93eb6b8da5ed",
      "podname": "Pod1",
      "provisioningtype": "thin",
      "quiescevm": false,
      "size": 10737418240,
      "state": "Ready",
      "storage": "ref-trl-6784-k-Mr8-kiran-chavala-kvm-pri1",
      "storageid": "299c9a7d-241c-3f54-b546-12a6bae2c537",
      "storagetype": "shared",
      "supportsstoragesnapshot": false,
      "tags": [],
      "type": "DATADISK",
      "utilization": "0.0%",
      "virtualmachineid": "f3ceea8a-376a-4132-a64c-57f31008eda3",
      "virtualsize": 10737418240,
      "vmdisplayname": "vm1",
      "vmname": "vm1",
      "vmstate": "Running",
      "vmtype": "User",
      "zoneid": "7f79d7fa-4ad3-4c00-87a7-2e7e58180757",
      "zonename": "ref-trl-6784-k-Mr8-kiran-chavala"
    }
  ]
}

engine/schema/src/main/resources/META-INF/db/views/cloud.volume_view.sql

shwstppr · 2024-06-11T05:33:17Z

@blueorangutan package

blueorangutan · 2024-06-11T05:34:04Z

@shwstppr 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.

This reverts commit fcca3e8.

blueorangutan · 2024-06-11T06:37:16Z

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

Fixes apache#9014 * api,server: encryptformat in volume response * Apply suggestions from code review * remove passphrase db change

api,server: encryptformat in volume response

c4c8a28

Fixes apache#9014 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr requested review from DaanHoogland and harikrishna-patnala May 22, 2024 11:31

boring-cyborg bot added the component:api label May 22, 2024

shwstppr added 2 commits May 22, 2024 17:17

fix

c0b95b3

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

fix

c6f1d4d

DaanHoogland approved these changes May 22, 2024

View reviewed changes

weizhouapache approved these changes May 22, 2024

View reviewed changes

sureshanaparti added this to the 4.19.1.0 milestone May 23, 2024

sureshanaparti approved these changes May 23, 2024

View reviewed changes

weizhouapache reviewed May 24, 2024

View reviewed changes

server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java Outdated Show resolved Hide resolved

shwstppr commented May 29, 2024

View reviewed changes

server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java Outdated Show resolved Hide resolved

shwstppr commented May 29, 2024

View reviewed changes

server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java Outdated Show resolved Hide resolved

Apply suggestions from code review

f9cf92c

weizhouapache reviewed May 29, 2024

View reviewed changes

DaanHoogland added the status:needs-testing label Jun 4, 2024

DaanHoogland linked an issue Jun 4, 2024 that may be closed by this pull request

add encryptionformat to volume reponse for admins #9014

Closed

kiranchavala approved these changes Jun 11, 2024

View reviewed changes

shwstppr commented Jun 11, 2024

View reviewed changes

engine/schema/src/main/resources/META-INF/db/views/cloud.volume_view.sql Outdated Show resolved Hide resolved

remove passphrase db change

96d8e6b

kiranchavala merged commit fcca3e8 into apache:4.19 Jun 11, 2024

kiranchavala added a commit that referenced this pull request Jun 11, 2024

Revert "api,server: encryptformat in volume response (#9106)"

2fc5521

This reverts commit fcca3e8.

DaanHoogland deleted the add-volumeresponse-encryptformat branch June 11, 2024 11:55

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

Comments

Conversation

shwstppr commented May 22, 2024

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

Uh oh!

Codecov Report

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented May 22, 2024

Uh oh!

blueorangutan commented May 22, 2024

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented May 22, 2024

Uh oh!

DaanHoogland commented May 22, 2024

Uh oh!

blueorangutan commented May 22, 2024

Uh oh!

blueorangutan commented May 23, 2024

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented May 29, 2024

Uh oh!

blueorangutan commented May 29, 2024

Uh oh!

weizhouapache May 29, 2024

Choose a reason for hiding this comment

Uh oh!

JoaoJandre Jun 10, 2024

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Jun 11, 2024

Choose a reason for hiding this comment

Uh oh!

JoaoJandre Jun 11, 2024

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented May 29, 2024

Uh oh!

DaanHoogland commented Jun 3, 2024

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shwstppr commented Jun 11, 2024

Uh oh!

blueorangutan commented Jun 11, 2024

Uh oh!

blueorangutan commented Jun 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

codecov bot commented May 22, 2024 •

edited

Loading