Add prettier and isort to pre-commit. (#270)

* Add prettier and isort to pre-commit.

* Bump line-length to 100

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

13 files changed, 27 insertions, 50 deletions

diff --git a/tests/integration/targets/vyos_firewall_rules/defaults/main.yaml b/tests/integration/targets/vyos_firewall_rules/defaults/main.yaml
index 852a6bee..164afead 100644
--- a/tests/integration/targets/vyos_firewall_rules/defaults/main.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-testcase: '[^_].*'
+testcase: "[^_].*"
 test_items: []
diff --git a/tests/integration/targets/vyos_firewall_rules/tasks/cli.yaml b/tests/integration/targets/vyos_firewall_rules/tasks/cli.yaml
index 93eb2fe4..83496e0e 100644
--- a/tests/integration/targets/vyos_firewall_rules/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tasks/cli.yaml
@@ -1,8 +1,8 @@
 ---
 - name: Collect all cli test cases
   find:
-    paths: '{{ role_path }}/tests/cli'
-    patterns: '{{ testcase }}.yaml'
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
     use_regex: true
   register: test_cases
   delegate_to: localhost
@@ -11,9 +11,9 @@
   set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  include: '{{ test_case_to_run }}'
+  include: "{{ test_case_to_run }}"
   vars:
     ansible_connection: ansible.netcommon.network_cli
-  with_items: '{{ test_items }}'
+  with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/_populate.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/_populate.yaml
index 551736e4..12adf4f2 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/_populate.yaml
@@ -1,7 +1,8 @@
 ---
 - name: Setup
   vars:
-    lines: "set firewall group address-group 'inbound'\nset firewall ipv6-name UPLINK\
+    lines:
+      "set firewall group address-group 'inbound'\nset firewall ipv6-name UPLINK\
       \ default-action 'accept'\nset firewall ipv6-name UPLINK description 'This\
       \ is ipv6 specific rule-set'\nset firewall ipv6-name UPLINK rule 1 action\
       \ 'accept'\nset firewall ipv6-name UPLINK rule 1 description 'Fwipv6-Rule\
@@ -24,4 +25,4 @@
       \ firewall name INBOUND rule 103 state new 'disable'\nset firewall name INBOUND\
       \ rule 103 state related 'enable'\n"
   ansible.netcommon.cli_config:
-    config: '{{ lines }}'
+    config: "{{ lines }}"
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/_remove_config.yaml
index acb08034..b4fc7965 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/_remove_config.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/_remove_config.yaml
@@ -3,4 +3,4 @@
   vars:
     lines: "delete firewall ipv6-name\ndelete firewall name\n"
   ansible.netcommon.cli_config:
-    config: '{{ lines }}'
+    config: "{{ lines }}"
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted.yaml
index 67bfd3c1..6a830f9d 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted.yaml
@@ -1,12 +1,12 @@
 ---
 - debug:
-    msg: Start vyos_firewall_rules deleted integration tests ansible_connection={{
+    msg:
+      Start vyos_firewall_rules deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
-
     - name: Delete firewall rule set.
       register: result
       vyos.vyos.vyos_firewall_rules: &id001
@@ -52,5 +52,4 @@
           - "{{ deleted_rs['after'] | symmetric_difference(result['before']) |length\
             \ == 0 }}"
   always:
-
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted_afi.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted_afi.yaml
index e20670de..e1041715 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted_afi.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted_afi.yaml
@@ -1,17 +1,16 @@
 ---
 - debug:
-    msg: Start vyos_firewall_rules deleted integration tests ansible_connection={{
+    msg:
+      Start vyos_firewall_rules deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
-
     - name: Delete firewall rule.
       register: result
       vyos.vyos.vyos_firewall_rules: &id001
         config:
-
           - afi: ipv6
 
           - afi: ipv4
@@ -50,5 +49,4 @@
           - "{{ deleted_afi_all['after'] | symmetric_difference(result['before'])\
             \ |length == 0 }}"
   always:
-
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted_all.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted_all.yaml
index 16e563c2..9df51272 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted_all.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/deleted_all.yaml
@@ -1,12 +1,12 @@
 ---
 - debug:
-    msg: Start vyos_firewall_rules deleted integration tests ansible_connection={{
+    msg:
+      Start vyos_firewall_rules deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
-
     - name: Delete all the firewall rules.
       register: result
       vyos.vyos.vyos_firewall_rules: &id001
@@ -46,5 +46,4 @@
           - "{{ deleted_afi_all['after'] | symmetric_difference(result['before'])\
             \ |length == 0 }}"
   always:
-
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/empty_config.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/empty_config.yaml
index c30cf03e..ba71e710 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/empty_config.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/empty_config.yaml
@@ -1,6 +1,7 @@
 ---
 - debug:
-    msg: START vyos_firewall_rules empty_config integration tests on connection={{
+    msg:
+      START vyos_firewall_rules empty_config integration tests on connection={{
       ansible_connection }}
 
 - name: Merged with empty config should give appropriate error message
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/overridden.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/overridden.yaml
index 6acc9518..aac79e58 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/overridden.yaml
@@ -8,20 +8,16 @@
 - include_tasks: _populate.yaml
 
 - block:
-
     - name: Overrides all device configuration with provided configuration
       register: result
       vyos.vyos.vyos_firewall_rules: &id001
         config:
-
           - afi: ipv4
             rule_sets:
-
               - name: Downlink
                 description: IPv4 INBOUND rule set
                 default_action: accept
                 rules:
-
                   - number: 501
                     action: accept
                     description: Rule 501 is configured by Ansible
@@ -65,5 +61,4 @@
           - "{{ overridden['after'] | symmetric_difference(result['before']) |length\
             \ == 0 }}"
   always:
-
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/parsed.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/parsed.yaml
index bc955249..3e4c9723 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/parsed.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/parsed.yaml
@@ -1,6 +1,7 @@
 ---
 - debug:
-    msg: START vyos_firewall_rules parsed integration tests on connection={{ ansible_connection
+    msg:
+      START vyos_firewall_rules parsed integration tests on connection={{ ansible_connection
       }}
 
 - name: Parse externally provided Firewall rules config to agnostic model
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/rendered.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/rendered.yaml
index 6670fd7b..d3767441 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/rendered.yaml
@@ -1,32 +1,28 @@
 ---
 - debug:
-    msg: START vyos_firewall_rules rendered integration tests on connection={{ ansible_connection
+    msg:
+      START vyos_firewall_rules rendered integration tests on connection={{ ansible_connection
       }}
 
 - include_tasks: _remove_config.yaml
 
 - block:
-
     - name: Structure provided configuration into device specific commands
       register: result
       vyos.vyos.vyos_firewall_rules:
         config:
-
           - afi: ipv6
             rule_sets:
-
               - name: UPLINK
                 description: This is ipv6 specific rule-set
                 default_action: accept
 
           - afi: ipv4
             rule_sets:
-
               - name: INBOUND
                 description: IPv4 INBOUND rule set
                 default_action: accept
                 rules:
-
                   - number: 101
                     action: accept
                     description: Rule 101 is configured by Ansible
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/replaced.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/replaced.yaml
index eba16892..850aa603 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/replaced.yaml
@@ -1,6 +1,7 @@
 ---
 - debug:
-    msg: START vyos_firewall_rules replaced integration tests on connection={{ ansible_connection
+    msg:
+      START vyos_firewall_rules replaced integration tests on connection={{ ansible_connection
       }}
 
 - include_tasks: _remove_config.yaml
@@ -8,28 +9,23 @@
 - include_tasks: _populate.yaml
 
 - block:
-
     - name: Replace device configurations of listed firewall rules with provided
         configurations
       register: result
       vyos.vyos.vyos_firewall_rules: &id001
         config:
-
           - afi: ipv6
             rule_sets:
-
               - name: UPLINK
                 description: This is ipv6 specific rule-set
                 default_action: accept
 
           - afi: ipv4
             rule_sets:
-
               - name: INBOUND
                 description: IPv4 INBOUND rule set
                 default_action: accept
                 rules:
-
                   - number: 101
                     action: accept
                     description: Rule 101 is configured by Ansible
@@ -74,5 +70,4 @@
           - "{{ replaced['after'] | symmetric_difference(result['before']) |length\
             \ == 0 }}"
   always:
-
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/rtt.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/rtt.yaml
index 762086f4..f3f42525 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/rtt.yaml
@@ -6,20 +6,16 @@
 - include_tasks: _remove_config.yaml
 
 - block:
-
     - name: Apply the provided configuration (base config)
       register: base_config
       vyos.vyos.vyos_firewall_rules:
         config:
-
           - afi: ipv6
             rule_sets:
-
               - name: UPLINK
                 description: This is ipv6 specific rule-set
                 default_action: accept
                 rules:
-
                   - number: 1
                     action: accept
                     description: Fwipv6-Rule 1 is configured by Ansible
@@ -32,12 +28,10 @@
 
           - afi: ipv4
             rule_sets:
-
               - name: INBOUND
                 description: IPv4 INBOUND rule set
                 default_action: accept
                 rules:
-
                   - number: 101
                     action: accept
                     description: Rule 101 is configured by Ansible
@@ -60,15 +54,12 @@
       register: result
       vyos.vyos.vyos_firewall_rules:
         config:
-
           - afi: ipv4
             rule_sets:
-
               - name: INBOUND
                 description: IPv4 INBOUND rule set
                 default_action: accept
                 rules:
-
                   - number: 103
                     action: accept
                     description: Rule 103 is configured by Ansible
@@ -83,7 +74,8 @@
 
     - name: Assert that changes were applied
       assert:
-        that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length\
+        that:
+          "{{ round_trip['after'] | symmetric_difference(result['after']) |length\
           \ == 0 }}"
 
     - name: Revert back to base config using facts round trip
@@ -94,8 +86,8 @@
 
     - name: Assert that config was reverted
       assert:
-        that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length\
+        that:
+          "{{ base_config['after'] | symmetric_difference(revert['after']) |length\
           \ == 0 }}"
   always:
-
     - include_tasks: _remove_config.yaml