Skip to content

vmware: fix unmanaged instance listing when different name & internal CS name - #7641

Merged
yadvr merged 1 commit into
apache:4.18from
shapeblue:fix-listunmanagedvm-namediff
Jul 7, 2023
Merged

yadvr merged 1 commit into
apache:4.18from
shapeblue:fix-listunmanagedvm-namediff

Conversation

@shwstppr

@shwstppr shwstppr commented Jun 16, 2023

Copy link
Copy Markdown
Contributor

Description

Currently, ACS can continue to show an imported instance/VM as an unmanaged instance if the name and internalCSName (custom attribute, cloud.vm.internal.name) is different for the instance/VM on vCenter. This PR while filtering managed instances from the instance list received from ESXi host also checks if the internal name for the instance is not in the managed instance names list.

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?

… CS name

Currently, ACS can continue to show an imported instance/VM as an unmanaged instance if the name and internalCSName (custom attribute, cloud.vm.internal.name) is different for the instance/VM on vCenter. This PR while filtering managed instances from the instance list received from ESXi host also checks if the internal name for the instance is not in the managed instance names list.

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

codecov Bot commented Jun 16, 2023

Copy link
Copy Markdown

Codecov Report

Merging #7641 (0edac19) into 4.18 (1aa4f80) will increase coverage by 0.00%.
The diff coverage is 0.00%.

@@            Coverage Diff            @@
##               4.18    #7641   +/-   ##
=========================================
  Coverage     12.98%   12.99%           
- Complexity     8989     8991    +2     
=========================================
  Files          2716     2716           
  Lines        256343   256346    +3     
  Branches      39981    39984    +3     
=========================================
+ Hits          33291    33301   +10     
+ Misses       218886   218878    -8     
- Partials       4166     4167    +1     
Impacted Files Coverage Δ
...oud/hypervisor/vmware/resource/VmwareResource.java 4.50% <0.00%> (-0.01%) ⬇️

... and 3 files with indirect coverage changes

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

@DaanHoogland DaanHoogland added this to the 4.18.1.0 milestone Jun 22, 2023
@shwstppr

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@shwstppr

Copy link
Copy Markdown
Contributor Author

@blueorangutan test rocky8 vmware-67u3

@blueorangutan

Copy link
Copy Markdown

@shwstppr a [SF] Trillian-Jenkins test job (rocky8 mgmt + vmware-67u3) has been kicked to run smoke tests

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

clgtm, wonder if it makes sense to devise an integration test for this.

@blueorangutan

Copy link
Copy Markdown

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

Test Result Time (s) Test File

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

Changes LGTM

@yadvr

yadvr commented Jun 27, 2023

Copy link
Copy Markdown
Member

Does this need manual QA or we can merge this @shwstppr ?

@yadvr
yadvr merged commit f0cc76a into apache:4.18 Jul 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants