Change parameter 'disabled' to 'disable' in test_vyos_firewall_rules.py (#240)

Change parameter 'disabled' to 'disable' in test_vyos_firewall_rules.py 

SUMMARY


Fixes #239
ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Nilashish Chakraborty <nilashishchakraborty8@gmail.com>
Reviewed-by: Sagar Paul <sagpaul@redhat.com>
Reviewed-by: GomathiselviS <None>
Reviewed-by: Rohit Thakur <rohitthakur2590@outlook.com>
Reviewed-by: None <None>

4 files changed, 22 insertions, 7 deletions

diff --git a/tests/integration/targets/vyos_firewall_rules/tests/cli/merged.yaml b/tests/integration/targets/vyos_firewall_rules/tests/cli/merged.yaml
index d8b7d174..48fdff7f 100644
--- a/tests/integration/targets/vyos_firewall_rules/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/tests/cli/merged.yaml
@@ -39,11 +39,13 @@
                     action: accept
                     description: Rule 101 is configured by Ansible
                     ipsec: match-ipsec
+                    disabled: true
 
                   - number: 102
                     action: reject
                     description: Rule 102 is configured by Ansible
                     ipsec: match-ipsec
+                    disable: true
 
                   - number: 103
                     action: accept
@@ -60,6 +62,9 @@
                       related: true
         state: merged
 
+    - vyos.vyos.vyos_facts:
+        gather_network_resources: firewall_rules
+
     - name: Assert that before dicts were correctly generated
       assert:
         that:
@@ -72,6 +77,12 @@
           - "{{ merged['commands'] | symmetric_difference(result['commands']) |length\
             \ == 0 }}"
 
+    - name: Assert that fact was correctly generated
+      assert:
+        that:
+          - "{{ merged['after'] | symmetric_difference(ansible_facts['network_resources']['firewall_rules']) |length\
+            \ == 0 }}"
+
     - name: Assert that after dicts was correctly generated
       assert:
         that:
diff --git a/tests/integration/targets/vyos_firewall_rules/vars/main.yaml b/tests/integration/targets/vyos_firewall_rules/vars/main.yaml
index 88323bae..3bd15129 100644
--- a/tests/integration/targets/vyos_firewall_rules/vars/main.yaml
+++ b/tests/integration/targets/vyos_firewall_rules/vars/main.yaml
@@ -17,10 +17,12 @@ merged:
     - set firewall name INBOUND default-action 'accept'
     - set firewall name INBOUND description 'IPv4 INBOUND rule set'
     - set firewall name INBOUND rule 101 action 'accept'
+    - set firewall name INBOUND rule 101 disable
     - set firewall name INBOUND rule 101
     - set firewall name INBOUND rule 101 description 'Rule 101 is configured by Ansible'
     - set firewall name INBOUND rule 101 ipsec 'match-ipsec'
     - set firewall name INBOUND rule 102 action 'reject'
+    - set firewall name INBOUND rule 102 disable
     - set firewall name INBOUND rule 102
     - set firewall name INBOUND rule 102 description 'Rule 102 is configured by Ansible'
     - set firewall name INBOUND rule 102 ipsec 'match-ipsec'
@@ -58,8 +60,10 @@ merged:
               action: accept
               description: Rule 101 is configured by Ansible
               ipsec: match-ipsec
+              disable: true
             - number: 102
               action: reject
+              disable: true
               description: Rule 102 is configured by Ansible
               ipsec: match-ipsec
             - number: 103
diff --git a/tests/unit/modules/network/vyos/fixtures/vyos_firewall_rules_config.cfg b/tests/unit/modules/network/vyos/fixtures/vyos_firewall_rules_config.cfg
index 32d42941..a3aec78f 100644
--- a/tests/unit/modules/network/vyos/fixtures/vyos_firewall_rules_config.cfg
+++ b/tests/unit/modules/network/vyos/fixtures/vyos_firewall_rules_config.cfg
@@ -6,7 +6,7 @@ set firewall name V4-INGRESS rule 101 protocol 'icmp'
 set firewall name V4-INGRESS rule 101 description 'Rule 101 is configured by Ansible'
 set firewall name V4-INGRESS rule 101 fragment 'match-frag'
 set firewall name V4-INGRESS rule 101
-set firewall name V4-INGRESS rule 101 disabled
+set firewall name V4-INGRESS rule 101 'disable'
 set firewall name V4-INGRESS rule 101 action 'accept'
 set firewall name V4-INGRESS rule 101 ipsec 'match-ipsec'
 set firewall name EGRESS default-action 'reject'
diff --git a/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py b/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py
index 4be8ec9d..4e1f3440 100644
--- a/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py
+++ b/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py
@@ -221,7 +221,7 @@ class TestVyosFirewallRulesModule(TestVyosModule):
                                         log="disable",
                                         protocol="icmp",
                                         fragment="match-frag",
-                                        disabled=True,
+                                        disable=True,
                                     )
                                 ],
                             ),
@@ -239,7 +239,7 @@ class TestVyosFirewallRulesModule(TestVyosModule):
             "set firewall name INBOUND rule 101 description 'Rule 101 is configured by Ansible'",
             "set firewall name INBOUND rule 101 fragment 'match-frag'",
             "set firewall name INBOUND rule 101",
-            "set firewall name INBOUND rule 101 disabled",
+            "set firewall name INBOUND rule 101 disable",
             "set firewall name INBOUND rule 101 action 'accept'",
             "set firewall name INBOUND rule 101 ipsec 'match-ipsec'",
             "set firewall name INBOUND rule 101 log 'disable'",
@@ -435,7 +435,7 @@ class TestVyosFirewallRulesModule(TestVyosModule):
             "set firewall ipv6-name INBOUND rule 101 protocol 'icmp'",
             "set firewall ipv6-name INBOUND rule 101 description 'Rule 101 is configured by Ansible'",
             "set firewall ipv6-name INBOUND rule 101",
-            "set firewall ipv6-name INBOUND rule 101 disabled",
+            "set firewall ipv6-name INBOUND rule 101 disable",
             "set firewall ipv6-name INBOUND rule 101 action 'accept'",
             "set firewall ipv6-name INBOUND rule 101 ipsec 'match-ipsec'",
             "set firewall ipv6-name INBOUND rule 101 icmpv6 type echo-request",
@@ -789,12 +789,12 @@ class TestVyosFirewallRulesModule(TestVyosModule):
             )
         )
         commands = [
-            "delete firewall name V4-INGRESS rule 101 disabled",
+            "delete firewall name V4-INGRESS rule 101 disable",
             "set firewall name V4-INGRESS description 'This is IPv4 INGRESS rule set'",
             "set firewall name V4-INGRESS rule 101 protocol 'tcp'",
             "set firewall name V4-INGRESS rule 101 description 'Rule 101 is configured by Ansible RM'",
             "set firewall name V4-INGRESS rule 101 action 'reject'",
-            "set firewall name V4-INGRESS rule 102 disabled",
+            "set firewall name V4-INGRESS rule 102 disable",
             "set firewall name V4-INGRESS rule 102 action 'accept'",
             "set firewall name V4-INGRESS rule 102 protocol 'icmp'",
             "set firewall name V4-INGRESS rule 102 description 'Rule 102 is configured by Ansible RM'",
@@ -1078,7 +1078,7 @@ class TestVyosFirewallRulesModule(TestVyosModule):
             "set firewall name V4-IN rule 1",
             "set firewall name V4-IN rule 1 action 'reject'",
             "set firewall name V4-IN rule 1 ipsec 'match-ipsec'",
-            "set firewall name V4-IN rule 2 disabled",
+            "set firewall name V4-IN rule 2 disable",
             "set firewall name V4-IN rule 2 action 'accept'",
             "set firewall name V4-IN rule 2 protocol 'icmp'",
             "set firewall name V4-IN rule 2 description 'Rule 102 is configured by Ansible RM'",