finish migration

library/mt_interfaces.py

@@ -30,6 +30,7 @@ options:
     options:
       - ethernet
       - vlan
+      - ovpn-client
   settings:
     description:
       - All Mikrotik compatible parameters for this particular endpoint.

library/mt_system_scheduler.py

@@ -22,35 +22,21 @@ options:
     description:
       - password used for authentication to mikrotik router
     required: True
+  parameter:
+    description:
+      - sub endpoint for mikrotik system
+    required: True
+    options:
+      - scheduler
+  settings:
+    description:
+      - All Mikrotik compatible parameters for this particular endpoint.
+        Any yes/no values must be enclosed in double quotes
+    required: True
   state:
     description:
-      - scheduler task present or absent
+      - absent or present
     required: True
-    choices:
-      - present
-      - absent
-  comment:
-    description:
-      - task comment
-  interval:
-    description:
-      - interval between two script executions, if time interval is set to zero, the script is only executed at its start time, otherwise it is executed repeatedly at the time interval is specified
-  name:
-    description:
-      -  name of the task
-    required: True
-  on_event:
-    description:
-      - name of the script to execute.
-  start_date:
-    description:
-      - date of the first script execution
-  start_time:
-    description:
-      - time of the first script execution
-  policy:
-    description:
-      - policy
 '''
 
 EXAMPLES = '''
@@ -59,9 +45,10 @@ EXAMPLES = '''
     username:      "{{ mt_user }}"
     password:      "{{ mt_pass }}"
     state:         present
-    name:          test_by_ansible
+    parameter:     scheduler
-    comment:       ansible_test
+      name:          test_by_ansible
-    on_event:      put "hello"
+      comment:       ansible_test
+      on_event:      put "hello"
 '''
 
 from ansible.module_utils.mt_common import clean_params, MikrotikIdempotent
@@ -81,7 +68,7 @@ def main():
           type      = 'str'
       ),
       state   = dict(
-          required  = False,
+          required  = True,
           choices   = ['present', 'absent'],
           type      = 'str'
       )

tests/integration/tasks/test-scheduler.yml

@@ -18,19 +18,22 @@
     username: "{{ mt_user }}"
     password: "{{ mt_pass }}"
     state:    present
-    name:     ansible_test
+    parameter: scheduler
-    on_event: 'put "test"'
+    settings:
-    interval: 5s
+      name:     ansible_test
-    policy:
+      on_event: 'put "test"'
-      - password
+      interval: 5s
-      - sniff
+      policy:
-      - write
+        - password
+        - sniff
+        - write
   register: scheduler_mod
   failed_when: (
       not ansible_check_mode
     ) and (
       not ( scheduler_mod | changed )
     )
+  tags: test1
 
 - name: NEVER_CHANGES add duplicate scheduler
   mt_system_scheduler:
@@ -38,19 +41,22 @@
     username: "{{ mt_user }}"
     password: "{{ mt_pass }}"
     state:    present
-    name:     ansible_test
+    parameter: scheduler
-    on_event: 'put "test"'
+    settings:
-    interval: 5s
+      name:     ansible_test
-    policy:
+      on_event: 'put "test"'
-      - password
+      interval: 5s
-      - sniff
+      policy:
-      - write
+        - password
+        - sniff
+        - write
   register: scheduler_dup
   failed_when: (
       not ansible_check_mode
     ) and (
       ( scheduler_dup | changed )
     )
+  tags: test1
 
 - name: ALWAYS_CHANGES remove duplicate scheduler
   mt_system_scheduler:
@@ -58,10 +64,13 @@
     username: "{{ mt_user }}"
     password: "{{ mt_pass }}"
     state:    absent
-    name:     ansible_test
+    parameter: scheduler
+    settings:
+      name:     ansible_test
   register: scheduler_rem
   failed_when: (
       not ansible_check_mode
     ) and (
       not ( scheduler_rem | changed )
     )
+  tags: test1