Skip to content

avoid hard coded guest OS IDs#7279

Merged
DaanHoogland merged 3 commits into
apache:mainfrom
shapeblue:cleanerAddMapping
Feb 23, 2023
Merged

avoid hard coded guest OS IDs#7279
DaanHoogland merged 3 commits into
apache:mainfrom
shapeblue:cleanerAddMapping

Conversation

@DaanHoogland

Copy link
Copy Markdown
Contributor

Description

This PR tries to avoid problems with guest os hypervisor mapping that we see in some DBs. If site specific entries were added the mapping may break on this.

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@weizhouapache

Copy link
Copy Markdown
Member

makes sense

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5630

@codecov

codecov Bot commented Feb 22, 2023

Copy link
Copy Markdown

Codecov Report

Merging #7279 (6ab852f) into main (a367049) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

❗ Current head 6ab852f differs from pull request most recent head 0a13424. Consider uploading reports for the commit 0a13424 to get more accurate results

@@             Coverage Diff              @@
##               main    #7279      +/-   ##
============================================
- Coverage     12.69%   12.69%   -0.01%     
  Complexity     8655     8655              
============================================
  Files          2716     2716              
  Lines        256112   256117       +5     
  Branches      39926    39927       +1     
============================================
  Hits          32503    32503              
- Misses       219477   219482       +5     
  Partials       4132     4132              
Impacted Files Coverage Δ
...src/main/java/com/cloud/upgrade/GuestOsMapper.java 5.10% <0.00%> (-0.28%) ⬇️
...ava/com/cloud/upgrade/dao/Upgrade41720to41800.java 0.85% <0.00%> (ø)

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

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@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

Copy link
Copy Markdown

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5631

Comment thread engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java Outdated
@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@sonarqubecloud

Copy link
Copy Markdown

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
28.6% 28.6% Duplication

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5634

@borisstoyanov

Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@borisstoyanov borisstoyanov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, manually tested the changes

@weizhouapache weizhouapache left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code lgtm

makes perfect sense to remove hard-coded guest os id.

The last time we use hard-coded guest os id is in the upgrade to 4.13.0. If an environment was created after 4.13.0, it will be upgraded to latest 4.18 successfully, no mater if there are custom guest oses or mappings.

@DaanHoogland DaanHoogland marked this pull request as ready for review February 23, 2023 14:19
@DaanHoogland DaanHoogland merged commit aa881f6 into apache:main Feb 23, 2023
@DaanHoogland DaanHoogland deleted the cleanerAddMapping branch February 23, 2023 14:19
@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-6220)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40951 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7279-t6220-kvm-centos7.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_03_ping_in_ssvm_success Error 1.09 test_diagnostics.py
test_04_ping_in_ssvm_failure Error 1.10 test_diagnostics.py
test_05_ping_in_cpvm_success Error 1.10 test_diagnostics.py
test_06_ping_in_cpvm_failure Error 1.08 test_diagnostics.py
test_08_arping_in_ssvm Error 1.09 test_diagnostics.py
test_09_arping_in_cpvm Error 1.09 test_diagnostics.py
test_11_traceroute_in_ssvm Error 1.08 test_diagnostics.py
test_12_traceroute_in_cpvm Error 1.09 test_diagnostics.py
test_15_retrieve_ssvm_default_files Error 1.09 test_diagnostics.py
test_16_retrieve_ssvm_single_file Error 1.09 test_diagnostics.py
test_17_retrieve_cpvm_default_files Error 1.09 test_diagnostics.py
test_18_retrieve_cpvm_single_file Error 1.10 test_diagnostics.py

@DaanHoogland DaanHoogland added this to the 4.18.0.0 milestone Sep 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants