update IpamDiffParser to use new diff #4870
Merged
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.
IFC-878
update
IpamDiffParser
to use the new diffalso update some of the Ipam integration tests b/c some of them were actually doing something illegal and allowing a rebase when conflicts should have prevented it
I saw one of the ipam integration tests fail 2 times over ~50 runs, but was unable to reproduce it reliably. I suspect that something is going wrong in Ipam reconciliation depending on the order in which the reconciliation tasks for each updated IP-related node are run, but I am not certain