Fix smartos_imgadm doesn't handle orphan images #55137
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
ghost
requested a review
from 
|
I'm not sure how to fix the ci/py3 failures? |
|
@Ch3LL aside from a rebase, anything blocking this? CI seems to always fail for a bunch of distros but it are just unit tests which is weird as they work fine locally and on some targets? |
|
@Ch3LL bump |
dwoz
approved these changes
Dec 9, 2019
|
Thanks for merging! |
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.
What does this PR do?
Update
_parse_image_metaso that it handles orphan images.Additionally we also pull in the changes from #51563 to master as those are also needed.
What issues does this PR fix or reference?
#55136
Previous Behavior
_parse_image_metawould not handle orphan image data e.g.{ "manifest": { "uuid": "07f360fd-12d5-e624-a279-eb8a15b630f6" }, "zpool": "zones", "cloneNames": [], "clones": 0 }New Behavior
_parse_image_metawill now check if the 'name' field is present.Tests written?
Yes, there were no tests for smartos_imgadm yet. Tests for
_parse_image_metawere added that feed is various kinds of image data. Currently those are 'orphan', 'native', 'lx', and 'zvol'.Those cover the currently available image types available in SmartOS
Commits signed with GPG?
No