Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions plugins/modules/nsxt_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,19 +218,27 @@ def execute(self):

if self.method == "post" or self.method == "put" or self.method == "patch":
before_resp = self.operate_nsxt(method="get", ignore_errors=True)
if before_resp:
before_revision = ""

if before_resp and "_revision" in before_resp :
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion

if before_resp:
before_revision = before_resp.get('_revision', '')

This might simplify a little the logic

before_revision = before_resp["_revision"]
else:
before_revision = ""

_ = self.operate_nsxt(method=self.method)

after_resp = self.operate_nsxt(method="get")
after_revision = after_resp["_revision"]
after_revision = ""

if after_resp and "_revision" in after_resp :
after_revision = after_resp["_revision"]

if before_revision == after_revision:
self.module.exit_json(changed=False, body=after_resp)
else:
self.module.exit_json(changed=True, body=after_resp)

if before_revision == after_revision:
self.module.exit_json(changed=False, body=after_resp)
else:
self.module.warn("_revision key in dict is missing")
self.module.warn("Count change but possibly nothing change. Cause : _revision key in dict is missing.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The log statement at line 240 seems redundant.

This can probably be rephrased to something like "Defaulting to changed=True because resource %s does not have _revision attribute" % self._path

self.module.exit_json(changed=True, body=after_resp)

if self.method == "delete":
Expand All @@ -256,4 +264,4 @@ def main():


if __name__ == '__main__':
main()
main()