CA-285605: Make PIF.set_disallow_unplug idempotent #3503
Merged
Conversation
This file contains hidden or 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
added 2 commits
March 12, 2018 09:50
Signed-off-by: Akanksha Mathur <akanksha.mathur@citrix.com>
Signed-off-by: Akanksha Mathur <akanksha.mathur@citrix.com>
edwintorok
approved these changes
Mar 12, 2018
ocaml/xapi/xapi_pif.ml
Outdated
| let set_disallow_unplug ~__context ~self ~value = | ||
| let network = Db.PIF.get_network ~__context ~self in | ||
| if pif_has_clustering_enabled ~__context self network | ||
| if ((Db.PIF.get_disallow_unplug ~__context ~self) <> value)&& pif_has_clustering_enabled ~__context self network |
There was a problem hiding this comment.
Could you add a space before the &&?
edwintorok
reviewed
Mar 12, 2018
ocaml/xapi/xapi_pif.ml
Outdated
| if pif_has_clustering_enabled ~__context self network | ||
| if ((Db.PIF.get_disallow_unplug ~__context ~self) <> value)&& pif_has_clustering_enabled ~__context self network | ||
| then raise Api_errors.(Server_error(clustering_enabled_on_network, [Ref.string_of network])) | ||
| else Db.PIF.set_disallow_unplug ~__context ~self ~value |
There was a problem hiding this comment.
You could skip this if you found it to be equal, but its fine either way.
There was a problem hiding this comment.
Yeah, that's a better way to do it.
Signed-off-by: Akanksha Mathur <akanksha.mathur@citrix.com>
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.
Previously,
PIF.set_disallow_unplugraisedclustering_enabled_on_networkeven when trying to set to the same value, if cluster objects were found, causing tests to fail unnecessarily. This PR makesPIF.set_disallow_unplugidempotent and updates the relevant tests to check this new behaviour.