Merge branch 'main' of github.com:netscaler/ansible-collection-netscaleradc into bgp

Author: shivashankar-vaddepally

plugins/module_utils/client.py

@@ -41,7 +41,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

@@ -91,14 +91,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",
@@ -144,7 +146,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"),
@@ -220,7 +222,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)
@@ -250,7 +252,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)
@@ -1019,11 +1021,16 @@ def act_on_resource(self, action):
             action=action,
         )
         if ok:
+            # For rename operations, always treat HTTP_RESOURCE_ALREADY_EXISTS as failure
+            # This prevents false positives where we think a rename succeeded when it actually
+            # failed due to a name conflict with a different existing resource
             if (
                 "status_code" in err
                 and err["status_code"] == HTTP_RESOURCE_ALREADY_EXISTS
             ):
                 self.module_result["changed"] = False
+                if action == "rename":
+                    self.return_failure(err)
         else:
             self.return_failure(err)
 

tests/integration/targets/gslbservice/tasks/main.yaml

@@ -113,27 +113,6 @@
     that:
       - "result.failed==false"
       - "result.changed==true"
-- name: GSLBSERVICE | RENAME | idempotent
-  delegate_to: localhost
-  register: result
-  check_mode: false
-  tags: test
-  netscaler.adc.gslbservice:
-    state: renamed
-    nsip: "{{ nsip }}"
-    nitro_user: "{{ nitro_user }}"
-    nitro_pass: "{{ nitro_pass }}"
-    nitro_protocol: "{{ nitro_protocol }}"
-    validate_certs: "{{ validate_certs }}"
-    save_config: "{{ save_config }}"
-    servicename: test-gslb-service
-    newname: test-gslb-service-renamed
-- name: Assert | GSLBSERVICE | RENAME | idempotent
-  tags: test
-  ansible.builtin.assert:
-    that:
-      - "result.failed==false"
-      - "result.changed==false"
 - name: GSLBSERVICE | DELETE | --check
   delegate_to: localhost
   register: result

tests/integration/targets/lbvserver/tasks/main.yaml

@@ -381,27 +381,6 @@
     that:
       - "result.failed==false"
       - "result.changed==true"
-- name: LBVSERVER | RENAME | idempotent
-  delegate_to: localhost
-  register: result
-  check_mode: false
-  tags: test
-  netscaler.adc.lbvserver:
-    nsip: "{{ nsip }}"
-    nitro_user: "{{ nitro_user }}"
-    nitro_pass: "{{ nitro_pass }}"
-    nitro_protocol: "{{ nitro_protocol }}"
-    validate_certs: "{{ validate_certs }}"
-    save_config: "{{ save_config }}"
-    state: renamed
-    name: lb1
-    newname: lb2
-- name: Assert | LBVSERVER | RENAME | idempotent
-  tags: test
-  ansible.builtin.assert:
-    that:
-      - "result.failed==false"
-      - "result.changed==false"
 - name: LBVSERVER | DELETE | --check
   delegate_to: localhost
   register: result

tests/integration/targets/service/tasks/main.yaml

@@ -108,27 +108,6 @@
     that:
       - "result.failed==false"
       - "result.changed==true"
-- name: SERVICE | RENAME | idempotent
-  delegate_to: localhost
-  register: result
-  check_mode: false
-  tags: test
-  netscaler.adc.service:
-    nsip: "{{ nsip }}"
-    nitro_user: "{{ nitro_user }}"
-    nitro_pass: "{{ nitro_pass }}"
-    nitro_protocol: "{{ nitro_protocol }}"
-    validate_certs: "{{ validate_certs }}"
-    save_config: "{{ save_config }}"
-    state: renamed
-    name: test-service
-    newname: test-service-renamed
-- name: Assert | SERVICE | RENAME | idempotent
-  tags: test
-  ansible.builtin.assert:
-    that:
-      - "result.failed==false"
-      - "result.changed==false"
 - name: SERVICE | DELETE | --check
   delegate_to: localhost
   register: result

tests/integration/targets/servicegroup/tasks/main.yaml

@@ -334,26 +334,6 @@
     that:
       - "result.failed==false"
       - "result.changed==true"
-- name: SERVICEGROUP | RENAME | idempotent
-  delegate_to: localhost
-  register: result
-  check_mode: false
-  tags: test
-  netscaler.adc.servicegroup:
-    nsip: "{{ nsip }}"
-    nitro_user: "{{ nitro_user }}"
-    nitro_pass: "{{ nitro_pass }}"
-    nitro_protocol: "{{ nitro_protocol }}"
-    validate_certs: "{{ validate_certs }}"
-    state: renamed
-    servicegroupname: "{{ servicegroup_name }}_renamed"
-    newname: "{{ servicegroup_name }}_renamed"
-- name: Assert | SERVICEGROUP | RENAME | idempotent
-  tags: test
-  ansible.builtin.assert:
-    that:
-      - "result.failed==false"
-      - "result.changed==false"
 - name: SERVICEGROUP | DELETE | --check
   delegate_to: localhost
   register: result