change-diskoffer: iops settings from new disk-offer should always used

[rp-]

Description

If you had an disk-offer which would compute-only == false, it wouldn't apply the iop settings of the new disk-offer and instead use null for the settings.

Types of changes

• [ ] Breaking change (fix or feature that would cause existing functionality to change)
• [ ] New feature (non-breaking change which adds functionality)
• [x] 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
• [x] Minor

Bug Severity

• [ ] BLOCKER
• [ ] Critical
• [ ] Major
• [x] Minor
• [ ] Trivial

Screenshots (if appropriate):

How Has This Been Tested?

Manually switching between the default 5GB disk offer and a self created IOP limiting disk offer.

[codecov[bot]]

Codecov Report

Merging #6681 (7704947) into main (9f7e0cc) will increase coverage by 4.54%. The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               main    #6681      +/-   ##
============================================
+ Coverage      5.87%   10.42%   +4.54%     
- Complexity     3936     6696    +2760     
============================================
  Files          2454     2455       +1     
  Lines        242683   243143     +460     
  Branches      37978    38061      +83     
============================================
+ Hits          14265    25339   +11074     
+ Misses       226839   214635   -12204     
- Partials       1579     3169    +1590     

Impacted Files	Coverage Δ
...n/java/com/cloud/storage/VolumeApiServiceImpl.java	10.79% <0.00%> (+10.79%)	:arrow_up:
...dstack/storage/datastore/PrimaryDataStoreImpl.java	2.25% <0.00%> (-0.09%)	:arrow_down:
...visor/vmware/manager/VmwareStorageManagerImpl.java	1.06% <0.00%> (-0.03%)	:arrow_down:
...ain/java/com/cloud/consoleproxy/AgentHookBase.java	0.00% <0.00%> (ø)
...n/java/com/cloud/resource/ResourceManagerImpl.java	0.00% <0.00%> (ø)
...ava/com/cloud/servlet/ConsoleProxyClientParam.java	0.00% <0.00%> (ø)
...va/com/cloud/consoleproxy/ConsoleProxyManager.java	0.00% <0.00%> (ø)
...ud/consoleproxy/AgentBasedConsoleProxyManager.java	0.00% <0.00%> (ø)
...oud/hypervisor/vmware/resource/VmwareResource.java	0.00% <0.00%> (ø)
...tack/engine/orchestration/NetworkOrchestrator.java	0.00% <0.00%> (ø)
... and 480 more

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

[DaanHoogland]

Kudos, SonarCloud Quality Gate passed!

0 Bugs 0 Vulnerabilities 0 Security Hotspots 1 Code Smell

0.0% Coverage 0.0% Duplication

the code smell is 200 lines away from the nearest change in this PR and warants its own PR #notetomyself.

https://sonarcloud.io/code?id=apache_cloudstack&pullRequest=6681&selected=apache_cloudstack%3Aserver%2Fsrc%2Fmain%2Fjava%2Fcom%2Fcloud%2Fstorage%2FVolumeApiServiceImpl.java&line=1762

https://sonarcloud.io/project/issues?pullRequest=6681&issues=AYLp8K4mOogROu0RKBAQ&open=AYLp8K4mOogROu0RKBAQ&id=apache_cloudstack

[acs-robot]

Found UI changes, kicking a new UI QA build @blueorangutan ui

[blueorangutan]

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

[blueorangutan]

UI build: :heavy_check_mark: Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6681 (SL-JID-2355)

[sonarqubecloud[bot]]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
1 Code Smell

0.0% Coverage
0.0% Duplication

[rp-]

is this good enough now?

[DaanHoogland]

@blueorangutan package

[blueorangutan]

@DaanHoogland a 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]

Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 4236

[DaanHoogland]

@blueorangutan test matrix

[blueorangutan]

@DaanHoogland a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

[blueorangutan]

Trillian test result (tid-4954) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 42104 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6681-t4954-kvm-centos7.zip Smoke tests completed. 98 look OK, 5 have errors, 0 did not run Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_add_primary_storage_disabled_host	Error	0.62	test_primary_storage.py
test_01_primary_storage_nfs	Error	0.11	test_primary_storage.py
ContextSuite context=TestStorageTags>:setup	Error	0.20	test_primary_storage.py
test_01_secure_vm_migration	Error	157.18	test_vm_life_cycle.py
test_02_unsecure_vm_migration	Error	274.33	test_vm_life_cycle.py
test_03_secured_to_nonsecured_vm_migration	Error	140.85	test_vm_life_cycle.py
test_08_migrate_vm	Error	44.98	test_vm_life_cycle.py
test_03_deploy_and_scale_kubernetes_cluster	Failure	34.29	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	Failure	64.22	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	Failure	41.36	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	Failure	40.20	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	Error	129.01	test_kubernetes_clusters.py
test_02_list_snapshots_with_removed_data_store	Error	8.51	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	Error	8.51	test_snapshots.py
test_hostha_enable_ha_when_host_in_maintenance	Error	304.92	test_hostha_kvm.py

[blueorangutan]

Trillian test result (tid-4955) Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7 Total time taken: 48301 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6681-t4955-vmware-65u2.zip Smoke tests completed. 103 look OK, 0 have errors, 0 did not run Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	Failure	577.75	test_kubernetes_clusters.py

[DaanHoogland]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	Failure	633.55	test_kubernetes_clusters.py
test_01_verify_ipv6_vpc	Failure	763.95	test_vpc_ipv6.py