address-list to use common class

library/mt_ip.py

@@ -44,6 +44,8 @@ EXAMPLES = '''
     hostname:      "{{ inventory_hostname }}"
     username:      "{{ mt_user }}"
     password:      "{{ mt_pass }}"
+    parameter:     service
+    settings:
       disabled:      no
       name:          ftp
       address:       192.168.52.3
@@ -62,7 +64,7 @@ def main():
       settings  = dict(required=False, type='dict'),
       parameter = dict(
         required  = True,
-        choices   = ['service', 'pool'],
+        choices   = ['service', 'pool', 'address-list'],
         type      = 'str'
       ),
       state   = dict(
@@ -75,6 +77,10 @@ def main():
   )
 
   params = module.params
+  if params['parameter'] == 'address-list':
+    params['parameter'] = 'firewall/address-list'
+    idempotent_parameter = 'address'
+  else:
     idempotent_parameter = 'name'
 
   mt_obj = MikrotikIdempotent(

tests/integration/tasks/test-address-list.yml

@@ -1,39 +1,34 @@
 ---
-- name: ALWAYS_CHANGES Test adding a firewall address-list
-  mt_ip_firewall_addresslist:
+- name: Test adding a firewall address-list
+  mt_ip:
     hostname:   "{{ mt_hostname }}"
     username:   "{{ mt_user }}"
     password:   "{{ mt_pass }}"
     state:      "present"
-    list_name: test_list
-    address_list:
+    parameter: address-list
+    settings: "{{ item }}"
+  with_items:
     - address: 192.168.1.2
       comment: dns1
+      list:    test_list
     - address: 192.168.1.3
       comment: dns2
+      list:    test_list
     - address: 192.168.1.6
       comment: test_comment3
-  register: address_list_add_1
-  failed_when: (
-      not ansible_check_mode
-    ) and (
-      not ( address_list_add_1 | changed )
-    )
+      list:    test_list
 
 - name: ALWAYS_CHANGES Test editing a firewall address-list
-  mt_ip_firewall_addresslist:
+  mt_ip:
     hostname:   "{{ mt_hostname }}"
     username:   "{{ mt_user }}"
     password:   "{{ mt_pass }}"
     state:      "present"
-    list_name: test_list
-    address_list:
-      - address: 192.168.1.2
+    parameter: address-list
+    settings:
+        address: 192.168.1.2
         comment: dns1
-      - address: 192.168.1.3
-        comment: dns2
-      - address: 192.168.1.19
-        comment: test_comment3
+        list: test_list2
   register: address_list_edit_1
   failed_when: (
       not ansible_check_mode
@@ -42,19 +37,16 @@
     )
 
 - name: Test adding a duplicate address-list
-  mt_ip_firewall_addresslist:
+  mt_ip:
     hostname:   "{{ mt_hostname }}"
     username:   "{{ mt_user }}"
     password:   "{{ mt_pass }}"
     state:      "present"
-    list_name: test_list
-    address_list:
-      - address: 192.168.1.2
-        comment: dns1
-      - address: 192.168.1.3
+    parameter: address-list
+    settings:
+        address: 192.168.1.3
         comment: dns2
-      - address: 192.168.1.19
-        comment: test_comment3
+        list: test_list
   register: add_address_list_add_dup_1
   failed_when: (
       not ansible_check_mode
@@ -63,12 +55,16 @@
     )
 
 - name: ALWAYS_CHANGES Test removing a firewall address-list
-  mt_ip_firewall_addresslist:
+  mt_ip:
     hostname:   "{{ mt_hostname }}"
     username:   "{{ mt_user }}"
     password:   "{{ mt_pass }}"
     state:      "absent"
-    list_name: test_list
+    parameter: address-list
+    settings:
+        address: 192.168.1.2
+        comment: dns1
+        list: test_list
   register: address_list_rem_1
   failed_when: (
       not ansible_check_mode