Add json serialization/deserialization #46
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
Add custom JSON methods for Marshal and Unmarshal so other projects can write a configuration file based on virtual machine. the key issue is the use of interfaces, for example devices, in virtual machine. When using JSON to marshal and unmarshal, we need to tag what kind of device it is so the process can tag and ultimately re-identify the proper device. Signed-off-by: Brent Baude <[email protected]>
Signed-off-by: Christophe Fergeau <[email protected]>
This field is required, and when deserializing devices/bootloader, the code assumes it's always present. Signed-off-by: Christophe Fergeau <[email protected]>
No need to add 'timesync: null' to the JSON data. Signed-off-by: Christophe Fergeau <[email protected]>
The deserialization code silently ignores json devices/bootloaders with unknown (invalid) 'kind' fields, this commit returns an error instead. Signed-off-by: Christophe Fergeau <[email protected]>
|
More |
cfergeau
force-pushed
the
json
branch
2 times, most recently
from
ca3f49e to
f8fb15a
Compare
Signed-off-by: Christophe Fergeau <[email protected]>
This removes some code from VirtualMachine.UnmarshalJSON Signed-off-by: Christophe Fergeau <[email protected]>
This removes some code from VirtualMachine.UnmarshalJSON Signed-off-by: Christophe Fergeau <[email protected]>
This removes some code from VirtualMachine.UnmarshalJSON Signed-off-by: Christophe Fergeau <[email protected]>
This will be useful in the next commits to simplify the unmarshalling code. Signed-off-by: Christophe Fergeau <[email protected]>
Unmarshalling a device from json is done in 2 steps: 1) unmarshal the device 'kind' to know the type to use 2) unmarshal the device 1) is currently done by parsing the json to a map of fields, and getting 'kind' from this map 2) is done by regenerating a json string from the previous map after removing the 'kind' entry 1) can be done more directly by parsing the json data to the jsonKind struct which was added before. 2) can also be simplified: golang json unmarshalling code will ignore unknown fields, so we don't need to remove 'kind' and can directly reuse the initial json data. Signed-off-by: Christophe Fergeau <[email protected]>
This commit is doing the same simplification as was done in the previous commit. Signed-off-by: Christophe Fergeau <[email protected]>
Signed-off-by: Christophe Fergeau <[email protected]>
It was missing from the implementation. Signed-off-by: Christophe Fergeau <[email protected]>
The goal is to return an error as soon as a parsing error occurs. The current code would sometimes ignore parsing errors and try to parse as much as it can, which would give a partial VM representation, which is not desirable. Signed-off-by: Christophe Fergeau <[email protected]>
baude
approved these changes
Jun 26, 2023
|
/approve] |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: baude The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
6 tasks
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.
This allows other projects to write a configuration file based on virtual
machine.
This is based on #43
These 2 commits could be merged in the initial one
This improves on #43 by adding some unit tests, fixing a few bugs found by the
unit tests, and tightening error handling during unmarshalling.
I've also simplified the code/refactored it a bit.