Merge pull request #535 from netscaler/nitro_token

Resolving error of early logout when token login is used

Author: shivashankar-vaddepally

plugins/module_utils/client.py

@@ -38,7 +38,6 @@ def __init__(self, module, resource_name):
             self._module.params.get("nitro_user"),
             self._module.params.get("nitro_pass"),
         )
-
         # Prioritize token over user/pass
         if have_token:
             self._headers["Cookie"] = (

plugins/module_utils/module_executor.py

@@ -90,14 +90,16 @@ def __init__(self, resource_name, supports_check_mode=True):
             argument_spec=argument_spec,
             supports_check_mode=supports_check_mode,
             mutually_exclusive=[
+                (
+                    "nitro_pass", "nitro_auth_token"
+                ),
                 (
                     "managed_netscaler_instance_name",
                     "managed_netscaler_instance_ip",
                     "managed_netscaler_instance_id",
                 ),
             ],
             required_together=[
-                ("nitro_user", "nitro_pass"),
                 (
                     "managed_netscaler_instance_username",
                     "managed_netscaler_instance_password",
@@ -143,7 +145,7 @@ def __init__(self, resource_name, supports_check_mode=True):
             "logout",
         }:
             self.module.params["api_path"] = "nitro/v2/config"
-
+        self.have_token = self.module.params.get("nitro_auth_token", None)
         self.client = NitroAPIClient(self.module, self.resource_name)
         have_userpass = all([
             self.module.params.get("nitro_user"),
@@ -219,7 +221,7 @@ def return_success(self):
             # }
         if self.resource_name == "login":
             self.module_result["sessionid"] = self.sessionid
-        if self.client._headers.get("Cookie", None) not in (None, "") and not self.module.check_mode:
+        if self.client._headers.get("Cookie", None) not in (None, "") and not self.module.check_mode and not self.have_token:
             ok, response = adc_logout(self.client)
             if not ok:
                 log("ERROR: Logout failed: %s" % response)
@@ -249,7 +251,7 @@ def update_diff_list(self, existing=None, desired=None, delete=False, **kwargs):
 
     @trace
     def return_failure(self, msg):
-        if self.client._headers["Cookie"] != "" and not self.module.check_mode:
+        if self.client._headers.get("Cookie", None) not in (None, "") and not self.module.check_mode and not self.have_token:
             ok, response = adc_logout(self.client)
             if not ok:
                 log("ERROR: Logout failed: %s" % response)