dcnm_image_policy: fix for issue #347 #348
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Manually tested this to verify. Still need to update integration and unit tests.
Update integration test for overridden state.
1. playbooks/roles/dcnm_image_policy/dcnm_tests.yaml
- Add vars
- install_package_1
- uninstall_package_1
2. test/integration/targets/dcnm_image_policy/tests/dcnm_image_policy_overridden.yaml
- Add packages.install and packages.uninstall configuration
- Verify that merged state adds these packages to the controller config
- Verify that overridden state removes packages.install and packages.uninstall
- Verify that overridden state metadata.action is "replace" instead of "update"
allenrobel
added
ready for review
mikewiebe
approved these changes
Dec 2, 2024
allenrobel
added a commit
that referenced
this pull request
Dec 3, 2024
* Fix for issue 347
Manually tested this to verify.
Still need to update integration and unit tests.
* dcnm_image_policy: Update integration test
Update integration test for overridden state.
1. playbooks/roles/dcnm_image_policy/dcnm_tests.yaml
- Add vars
- install_package_1
- uninstall_package_1
2. test/integration/targets/dcnm_image_policy/tests/dcnm_image_policy_overridden.yaml
- Add packages.install and packages.uninstall configuration
- Verify that merged state adds these packages to the controller config
- Verify that overridden state removes packages.install and packages.uninstall
- Verify that overridden state metadata.action is "replace" instead of "update"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The
dcnm_image_policymodule was not handlingoverriddenstate correctly.It was correctly deleting image policies that were not in the playbook, but it was merging image policy configurations from the playbook with the image policy configurations on the controller. It should have been REPLACING these configurations.
Fix
This PR addresses this by modifying the
Overridden()class withindcnm_image_policy.pyto callReplaced().commit()rather thanMerged().commit().No changes are required for unit tests since the individual support modules are all doing what they are supposed to do. The only issue here was that
dcnm_image_policy.py(main module) was instantiating, and callingcommit()on, the wrong class.Other changes
dcnm_image_policyintegration test.a. For
overriddenstate, added apackagesdictionary to the created image policy's configuration (this addspackageNameandrpmimagesto the image policy).b. Added verifications that the task for
overriddenstate removespackageNameandrpmimagesfrom the image policy.c. Updated asserts for
metadatato verify thatmetadata.actionis "replace" rather than "update"Closes
Closes issue #347