From c2cf82dfea4aa89e5aa9ba57b798bee030a9abbe Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <656602+sdwilsh@users.noreply.github.com>
Date: Mon, 20 Sep 2021 16:25:49 -0700
Subject: Add support for IPv6 `address_group` and `network_group` (#202)

Add support for IPv6 `address_group` and `network_group`

SUMMARY
This adds support for ipv6 in network and address groups by adding an afi parameter, but defaulting it to ipv4 for backwards compatibility.
Fixes #137.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
vyos_firewall_global

Reviewed-by: GomathiselviS <None>
Reviewed-by: Shawn Wilsher <None>
Reviewed-by: None <None>
---
 tests/integration/targets/vyos_firewall_global/vars/main.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'tests/integration/targets')

diff --git a/tests/integration/targets/vyos_firewall_global/vars/main.yaml b/tests/integration/targets/vyos_firewall_global/vars/main.yaml
index 4a1e7a8b..faa0ff15 100644
--- a/tests/integration/targets/vyos_firewall_global/vars/main.yaml
+++ b/tests/integration/targets/vyos_firewall_global/vars/main.yaml
@@ -35,11 +35,13 @@ merged:
             - address: 192.0.1.5
           description: This group has the Management hosts address list
           name: MGMT-HOSTS
+          afi: ipv4
       network_group:
         - members:
             - address: 192.0.1.0/24
           description: This group has the Management network addresses
           name: MGMT
+          afi: ipv4
     log_martians: true
     ping:
       all: true
@@ -88,11 +90,13 @@ populate:
           - address: 192.0.1.1
           - address: 192.0.1.3
           - address: 192.0.1.5
+        afi: ipv4
     network_group:
       - name: MGMT
         description: This group has the Management network addresses
         members:
           - address: 192.0.1.0/24
+        afi: ipv4
 replaced:
   commands:
     - delete firewall group address-group MGMT-HOSTS
@@ -116,17 +120,20 @@ replaced:
             - address: 192.0.3.2
           description: Sales office hosts address list
           name: ENG-HOSTS
+          afi: ipv4
         - members:
             - address: 192.0.2.1
             - address: 192.0.2.2
             - address: 192.0.2.3
           description: Sales office hosts address list
           name: SALES-HOSTS
+          afi: ipv4
       network_group:
         - members:
             - address: 192.0.1.0/24
           description: This group has the Management network addresses
           name: MGMT
+          afi: ipv4
     log_martians: true
     ping:
       all: true
@@ -210,8 +217,10 @@ round_trip:
             - address: 192.0.1.1
             - address: 192.0.1.3
             - address: 192.0.1.5
+          afi: ipv4
       network_group:
         - name: MGMT
           description: This group has the Management network addresses
           members:
             - address: 192.0.1.0/24
+          afi: ipv4
-- 
cgit v1.2.3