server: throw new exception when rootdisksize is required but not set #7913

weizhouapache · 2023-08-25T07:47:45Z

Description

This PR fixes #7115

Steps to reproduce the issue

create a service offering with "Custom Disk", "Disk offering strictness" is also enabled.
deploy a vm with the new service offering, but not "Override root disk size"

Before this PR:

With this PR:

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

weizhouapache · 2023-08-25T08:34:56Z

@blueorangutan package

blueorangutan · 2023-08-25T08:36:03Z

@weizhouapache a [SF] 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.

harikrishna-patnala · 2023-08-25T08:43:42Z

@weizhouapache #7115 is this not a UI bug ?

blueorangutan · 2023-08-25T09:27:39Z

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

weizhouapache · 2023-08-25T09:55:36Z

@weizhouapache #7115 is this not a UI bug ?

@harikrishna-patnala
yes, we 'd better enforce user to input the rootdisksize (in the scenario) on UI
I think the new error message is more clear than before

weizhouapache · 2023-08-25T09:55:45Z

@blueorangutan test

blueorangutan · 2023-08-25T09:56:04Z

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

blueorangutan · 2023-08-25T22:00:03Z

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

Test	Result	Time (s)	Test File
test_deploy_vm_from_iso	`Error`	7.93	test_deploy_vm_iso.py
test_02_upgrade_kubernetes_cluster	`Failure`	566.47	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	720.72	test_kubernetes_clusters.py

yadvr

Didn't test but LGTM - shouldn't the UI do the mandatory check?

weizhouapache · 2023-08-26T13:01:27Z

@blueorangutan test matrix

blueorangutan · 2023-08-26T13:02:03Z

@weizhouapache a [SF] Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2023-08-27T02:16:43Z

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

Test	Result	Time (s)	Test File
test_deploy_vm_from_iso	`Error`	7.97	test_deploy_vm_iso.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL	`Failure`	366.19	test_vpc_redundant.py

weizhouapache · 2023-08-27T07:05:11Z

@blueorangutan package

codecov · 2023-08-27T07:05:19Z

Codecov Report

Merging #7913 (3c60cc2) into 4.18 (3c38ed7) will decrease coverage by 0.01%.
Report is 8 commits behind head on 4.18.
The diff coverage is 17.07%.

@@             Coverage Diff              @@
##               4.18    #7913      +/-   ##
============================================
- Coverage     13.06%   13.06%   -0.01%     
- Complexity     9088     9093       +5     
============================================
  Files          2720     2720              
  Lines        257391   257437      +46     
  Branches      40130    40143      +13     
============================================
+ Hits          33621    33622       +1     
- Misses       219548   219588      +40     
- Partials       4222     4227       +5

Files Changed	Coverage Δ
...stack/engine/orchestration/VolumeOrchestrator.java	`1.89% <0.00%> (ø)`
...visor/vmware/manager/VmwareStorageManagerImpl.java	`6.20% <0.00%> (-0.03%)`	⬇️
...oud/hypervisor/vmware/resource/VmwareResource.java	`4.48% <0.00%> (-0.01%)`	⬇️
...cloud/storage/resource/VmwareStorageProcessor.java	`0.32% <0.00%> (-0.01%)`	⬇️
...astore/driver/SolidFirePrimaryDataStoreDriver.java	`0.00% <0.00%> (ø)`
...ud/hypervisor/vmware/mo/HostDatastoreSystemMO.java	`0.00% <0.00%> (ø)`
...com/cloud/hypervisor/vmware/util/VmwareHelper.java	`8.65% <ø> (ø)`
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java	`7.52% <87.50%> (+0.04%)`	⬆️

... and 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

weizhouapache · 2023-08-27T13:09:01Z

@blueorangutan test matrix

blueorangutan · 2023-08-27T13:10:03Z

@weizhouapache a [SF] Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2023-08-28T00:11:47Z

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

Test	Result	Time (s)	Test File
test_deploy_vm_from_iso	`Error`	7.95	test_deploy_vm_iso.py

blueorangutan · 2023-08-28T01:52:53Z

[SF] Trillian test result (tid-7579)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 44333 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7913-t7579-vmware-67u3.zip
Smoke tests completed. 107 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_deploy_vm_from_iso	`Error`	9.42	test_deploy_vm_iso.py

blueorangutan · 2023-08-28T01:58:36Z

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

Test	Result	Time (s)	Test File
test_deploy_vm_from_iso	`Error`	7.86	test_deploy_vm_iso.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	943.78	test_kubernetes_clusters.py

harikrishna-patnala

code LGTM. Early check for disk size makes sense.

weizhouapache · 2023-08-28T06:05:47Z

@blueorangutan package

blueorangutan · 2023-08-28T06:06:03Z

@weizhouapache a [SF] 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 · 2023-08-28T06:57:15Z

latest smoke test looks good

# cat /marvin//MarvinLogs/test_deploy_vm_iso_9P5EZ4/results.txt 
Test Deploy Virtual Machine from ISO ... === TestName: test_deploy_vm_from_iso | Status : SUCCESS ===
ok

----------------------------------------------------------------------
Ran 1 test in 96.624s

OK

blueorangutan · 2023-08-28T06:59:17Z

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

server: throw new exception when rootdisksize is required but not set

cdebe25

boring-cyborg bot added the component:api label Aug 25, 2023

weizhouapache added this to the 4.18.1.0 milestone Aug 25, 2023

weizhouapache linked an issue Aug 25, 2023 that may be closed by this pull request

Unable to deploy VM using Template and custom disk offering #7115

Closed

DaanHoogland reviewed Aug 25, 2023

View reviewed changes

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java Show resolved Hide resolved

DaanHoogland approved these changes Aug 25, 2023

View reviewed changes

yadvr approved these changes Aug 26, 2023

View reviewed changes

PR7913: fix an issue with PR6441

3c60cc2

harikrishna-patnala approved these changes Aug 28, 2023

View reviewed changes

weizhouapache merged commit 26581b7 into apache:4.18 Aug 28, 2023

weizhouapache mentioned this pull request Aug 28, 2023

Unable to deploy VM using Template and custom disk offering #7115

Closed

DaanHoogland deleted the 4.18-fix-check-rootdisksize--1 branch August 28, 2023 07:35

server: throw new exception when rootdisksize is required but not set #7913

server: throw new exception when rootdisksize is required but not set #7913

Uh oh!

Conversation

weizhouapache commented Aug 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

Uh oh!

weizhouapache commented Aug 25, 2023

Uh oh!

blueorangutan commented Aug 25, 2023

Uh oh!

harikrishna-patnala commented Aug 25, 2023

Uh oh!

blueorangutan commented Aug 25, 2023

Uh oh!

weizhouapache commented Aug 25, 2023

Uh oh!

weizhouapache commented Aug 25, 2023

Uh oh!

blueorangutan commented Aug 25, 2023

Uh oh!

blueorangutan commented Aug 25, 2023

Uh oh!

yadvr left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Aug 26, 2023

Uh oh!

blueorangutan commented Aug 26, 2023

Uh oh!

blueorangutan commented Aug 27, 2023

Uh oh!

weizhouapache commented Aug 27, 2023

Uh oh!

codecov bot commented Aug 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Aug 27, 2023

Uh oh!

blueorangutan commented Aug 27, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

weizhouapache commented Aug 25, 2023 •

edited

Loading

codecov bot commented Aug 27, 2023 •

edited

Loading