notification interval is an int (#254)

also add another example without user groups to test idempotency issues with empty groups
telekom-mms · Apr 19, 2024 · 2e3f2a9 · 2e3f2a9
1 parent 4111837
commit 2e3f2a9
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 12 deletions.
diff --git a/examples/icinga_notification.yml b/examples/icinga_notification.yml
@@ -9,7 +9,7 @@
     assign_filter: 'host.name="foohost"'
     imports:
       - foonotificationtemplate
-    notification_interval: '0'
+    notification_interval: 0
     object_name: E-Mail_host
     states:
       - Up
@@ -25,6 +25,27 @@
     time_period: "24/7"
     times_begin: 20
     times_end: 120
+- name: Create another notification
+  telekom_mms.icinga_director.icinga_notification:
+    state: present
+    url: "{{ icinga_url }}"
+    url_username: "{{ icinga_user }}"
+    url_password: "{{ icinga_pass }}"
+    apply_to: host
+    assign_filter: 'host.name="foohost"'
+    imports:
+      - foonotificationtemplate
+    notification_interval: 0
+    object_name: E-Mail_host
+    states:
+      - Up
+      - Down
+    types:
+      - Problem
+      - Recovery
+    users:
+      - rb
+    time_period: "24/7"
 - name: Update notification
   telekom_mms.icinga_director.icinga_notification:
     state: present

diff --git a/plugins/modules/icinga_notification.py b/plugins/modules/icinga_notification.py
@@ -40,18 +40,18 @@
       - Apply feature state.
     choices: [ "present", "absent" ]
     default: present
-    type: str
+    type: "str"
   object_name:
     description:
       - Name of the notification.
     aliases: ['name']
     required: true
-    type: str
+    type: "str"
   notification_interval:
     description:
       - The notification interval (in seconds). This interval is used for active notifications.
       - Defaults to 30 minutes. If set to 0, re-notifications are disabled.
-    type: str
+    type: "int"
   types:
     description:
       - The state transition types you want to get notifications for.
@@ -72,7 +72,7 @@
     description:
       - Whether this notification should affect hosts or services.
       - Required if I(state) is C(present).
-    type: str
+    type: "str"
     choices: ["host", "service"]
   assign_filter:
     description:
@@ -127,7 +127,7 @@
       - Do not overwrite the whole object but instead append the defined properties.
       - Note - Appending to existing vars, imports or any other list/dict is not possible. You have to overwrite the complete list/dict.
       - Note - Variables that are set by default will also be applied, even if not set.
-    type: bool
+    type: "bool"
     choices: [true, false]
     version_added: '1.25.0'
 """
@@ -143,7 +143,7 @@
     assign_filter: 'host.name="foohost"'
     imports:
       - foonotificationtemplate
-    notification_interval: '0'
+    notification_interval: 0
     object_name: E-Mail_host
     states:
       - Up
@@ -160,6 +160,28 @@
     times_begin: 20
     times_end: 120
 
+- name: Create another notification
+  telekom_mms.icinga_director.icinga_notification:
+    state: present
+    url: "{{ icinga_url }}"
+    url_username: "{{ icinga_user }}"
+    url_password: "{{ icinga_pass }}"
+    apply_to: host
+    assign_filter: 'host.name="foohost"'
+    imports:
+      - foonotificationtemplate
+    notification_interval: 0
+    object_name: E-Mail_host
+    states:
+      - Up
+      - Down
+    types:
+      - Problem
+      - Recovery
+    users:
+      - rb
+    time_period: "24/7"
+
 - name: Update notification
   telekom_mms.icinga_director.icinga_notification:
     state: present
@@ -200,7 +222,7 @@ def main():
         disabled=dict(
             type="bool", required=False, default=False, choices=[True, False]
         ),
-        notification_interval=dict(required=False),
+        notification_interval=dict(type="int", required=False),
         states=dict(type="list", elements="str", required=False),
         users=dict(type="list", elements="str", required=False),
         user_groups=dict(type="list", elements="str", required=False),

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/absent_icinga_notification.yml b/tests/integration/targets/icinga/roles/icinga/tasks/absent_icinga_notification.yml
@@ -7,7 +7,7 @@
     url_password: "{{ icinga_pass }}"
     apply_to: host
     assign_filter: 'host.name="foohost"'
-    notification_interval: '0'
+    notification_interval: 0
     object_name: E-Mail_host
     states:
       - Up
@@ -23,6 +23,25 @@
     time_period: "24/7"
     times_begin: 20
     times_end: 120
+- name: Create another notification
+  telekom_mms.icinga_director.icinga_notification:
+    state: absent
+    url: "{{ icinga_url }}"
+    url_username: "{{ icinga_user }}"
+    url_password: "{{ icinga_pass }}"
+    apply_to: host
+    assign_filter: 'host.name="foohost"'
+    notification_interval: 0
+    object_name: E-Mail_host
+    states:
+      - Up
+      - Down
+    types:
+      - Problem
+      - Recovery
+    users:
+      - rb
+    time_period: "24/7"
 - name: Update notification
   telekom_mms.icinga_director.icinga_notification:
     state: absent

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/icinga_notification.yml b/tests/integration/targets/icinga/roles/icinga/tasks/icinga_notification.yml
@@ -9,7 +9,7 @@
     assign_filter: 'host.name="foohost"'
     imports:
       - foonotificationtemplate
-    notification_interval: '0'
+    notification_interval: 0
     object_name: E-Mail_host
     states:
       - Up
@@ -25,6 +25,27 @@
     time_period: "24/7"
     times_begin: 20
     times_end: 120
+- name: Create another notification
+  telekom_mms.icinga_director.icinga_notification:
+    state: present
+    url: "{{ icinga_url }}"
+    url_username: "{{ icinga_user }}"
+    url_password: "{{ icinga_pass }}"
+    apply_to: host
+    assign_filter: 'host.name="foohost"'
+    imports:
+      - foonotificationtemplate
+    notification_interval: 0
+    object_name: E-Mail_host
+    states:
+      - Up
+      - Down
+    types:
+      - Problem
+      - Recovery
+    users:
+      - rb
+    time_period: "24/7"
 - name: Update notification
   telekom_mms.icinga_director.icinga_notification:
     state: present

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/wrong_host_icinga_notification.yml b/tests/integration/targets/icinga/roles/icinga/tasks/wrong_host_icinga_notification.yml
@@ -9,7 +9,7 @@
     assign_filter: 'host.name="foohost"'
     imports:
       - foonotificationtemplate
-    notification_interval: '0'
+    notification_interval: 0
     object_name: E-Mail_host
     states:
       - Up
@@ -32,6 +32,34 @@
       - result.failed
       # yamllint disable-line rule:line-length
       - 'result.msg in [ "bad return code while creating: 401. Error message: HTTP Error 401: Unauthorized", "bad return code while creating: -1. Error message: Request failed: <urlopen error [Errno -3] Temporary failure in name resolution>", "bad return code while creating: -1. Error message: Request failed: <urlopen error [Errno -2] Name or service not known>", "bad return code while querying: 401. Error message: HTTP Error 401: Unauthorized", ]'
+- name: Create another notification
+  telekom_mms.icinga_director.icinga_notification:
+    state: present
+    url: http://nonexistent
+    url_username: "{{ icinga_user }}"
+    url_password: "{{ icinga_pass }}"
+    apply_to: host
+    assign_filter: 'host.name="foohost"'
+    imports:
+      - foonotificationtemplate
+    notification_interval: 0
+    object_name: E-Mail_host
+    states:
+      - Up
+      - Down
+    types:
+      - Problem
+      - Recovery
+    users:
+      - rb
+    time_period: "24/7"
+  ignore_errors: true
+  register: result
+- assert:
+    that:
+      - result.failed
+      # yamllint disable-line rule:line-length
+      - 'result.msg in [ "bad return code while creating: 401. Error message: HTTP Error 401: Unauthorized", "bad return code while creating: -1. Error message: Request failed: <urlopen error [Errno -3] Temporary failure in name resolution>", "bad return code while creating: -1. Error message: Request failed: <urlopen error [Errno -2] Name or service not known>", "bad return code while querying: 401. Error message: HTTP Error 401: Unauthorized", ]'
 - name: Update notification
   telekom_mms.icinga_director.icinga_notification:
     state: present

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/wrong_pass_icinga_notification.yml b/tests/integration/targets/icinga/roles/icinga/tasks/wrong_pass_icinga_notification.yml
@@ -9,7 +9,7 @@
     assign_filter: 'host.name="foohost"'
     imports:
       - foonotificationtemplate
-    notification_interval: '0'
+    notification_interval: 0
     object_name: E-Mail_host
     states:
       - Up
@@ -32,6 +32,34 @@
       - result.failed
       # yamllint disable-line rule:line-length
       - 'result.msg in [ "bad return code while creating: 401. Error message: HTTP Error 401: Unauthorized", "bad return code while creating: -1. Error message: Request failed: <urlopen error [Errno -3] Temporary failure in name resolution>", "bad return code while creating: -1. Error message: Request failed: <urlopen error [Errno -2] Name or service not known>", "bad return code while querying: 401. Error message: HTTP Error 401: Unauthorized", ]'
+- name: Create another notification
+  telekom_mms.icinga_director.icinga_notification:
+    state: present
+    url: "{{ icinga_url }}"
+    url_username: "{{ icinga_user }}"
+    url_password: iamwrong
+    apply_to: host
+    assign_filter: 'host.name="foohost"'
+    imports:
+      - foonotificationtemplate
+    notification_interval: 0
+    object_name: E-Mail_host
+    states:
+      - Up
+      - Down
+    types:
+      - Problem
+      - Recovery
+    users:
+      - rb
+    time_period: "24/7"
+  ignore_errors: true
+  register: result
+- assert:
+    that:
+      - result.failed
+      # yamllint disable-line rule:line-length
+      - 'result.msg in [ "bad return code while creating: 401. Error message: HTTP Error 401: Unauthorized", "bad return code while creating: -1. Error message: Request failed: <urlopen error [Errno -3] Temporary failure in name resolution>", "bad return code while creating: -1. Error message: Request failed: <urlopen error [Errno -2] Name or service not known>", "bad return code while querying: 401. Error message: HTTP Error 401: Unauthorized", ]'
 - name: Update notification
   telekom_mms.icinga_director.icinga_notification:
     state: present