diff --git a/ansible/templates/minigraph_dpg.j2 b/ansible/templates/minigraph_dpg.j2 index 801abcfef42..3ccf2709932 100644 --- a/ansible/templates/minigraph_dpg.j2 +++ b/ansible/templates/minigraph_dpg.j2 @@ -102,6 +102,15 @@ {{ vlan_param['prefix'] }} {% endfor %} +{% for vlan, vlan_param in vlan_configs.items() %} +{% if 'prefix_v6' in vlan_param %} + + + {{ vlan }} + {{ vlan_param['prefix_v6'] }} + +{% endif %} +{% endfor %} {% endif %} diff --git a/ansible/vars/topo_t0-116.yml b/ansible/vars/topo_t0-116.yml index ff0f7aaa289..60d6e0abf33 100644 --- a/ansible/vars/topo_t0-116.yml +++ b/ansible/vars/topo_t0-116.yml @@ -141,17 +141,20 @@ topology: id: 1000 intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119] prefix: 192.168.0.1/21 + prefix_v6: fc02:1000::1/64 tag: 1000 two_vlan_a: Vlan100: id: 100 intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63] prefix: 192.168.100.1/21 + prefix_v6: fc02:100::1/64 tag: 100 Vlan200: id: 200 intfs: [64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119] prefix: 192.168.200.1/21 + prefix_v6: fc02:200::1/64 tag: 200 configuration_properties: diff --git a/ansible/vars/topo_t0-16.yml b/ansible/vars/topo_t0-16.yml index ea71d34d35d..c267b29a14e 100644 --- a/ansible/vars/topo_t0-16.yml +++ b/ansible/vars/topo_t0-16.yml @@ -114,17 +114,20 @@ topology: id: 1000 intfs: [32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47] prefix: 192.168.0.1/21 + prefix_v6: fc02:1000::1/64 tag: 1000 two_vlan_a: Vlan100: id: 100 intfs: [32, 33, 34, 35, 36, 37, 38, 39] prefix: 192.168.100.1/21 + prefix_v6: fc02:100::1/64 tag: 100 Vlan200: id: 200 intfs: [40, 41, 42, 43, 44, 45, 46, 47] prefix: 192.168.200.1/21 + prefix_v6: fc02:200::1/64 tag: 200 configuration_properties: diff --git a/ansible/vars/topo_t0-52.yml b/ansible/vars/topo_t0-52.yml index a214905db0c..623b4376618 100644 --- a/ansible/vars/topo_t0-52.yml +++ b/ansible/vars/topo_t0-52.yml @@ -73,17 +73,20 @@ topology: id: 1000 intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47] prefix: 192.168.0.1/21 + prefix_v6: fc02:1000::1/64 tag: 1000 two_vlan_a: Vlan100: id: 100 intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23] prefix: 192.168.100.1/21 + prefix_v6: fc02:100::1/64 tag: 100 Vlan200: id: 200 intfs: [24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47] prefix: 192.168.200.1/21 + prefix_v6: fc02:200::1/64 tag: 200 configuration_properties: diff --git a/ansible/vars/topo_t0-56.yml b/ansible/vars/topo_t0-56.yml index 24b0ca38d13..2db3902baaf 100644 --- a/ansible/vars/topo_t0-56.yml +++ b/ansible/vars/topo_t0-56.yml @@ -114,17 +114,20 @@ topology: id: 1000 intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55] prefix: 192.168.0.1/21 + prefix_v6: fc02:1000::1/64 tag: 1000 two_vlan_a: Vlan100: id: 100 intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26] prefix: 192.168.100.1/21 + prefix_v6: fc02:100::1/64 tag: 100 Vlan200: id: 200 intfs: [27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55] prefix: 192.168.200.1/21 + prefix_v6: fc02:200::1/64 tag: 200 configuration_properties: diff --git a/ansible/vars/topo_t0-64-32.yml b/ansible/vars/topo_t0-64-32.yml index 5ca9cf51bca..6b42438c53b 100644 --- a/ansible/vars/topo_t0-64-32.yml +++ b/ansible/vars/topo_t0-64-32.yml @@ -53,17 +53,20 @@ topology: id: 1000 intfs: [2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31] prefix: 192.168.0.1/21 + prefix_v6: fc02:1000::1/64 tag: 1000 two_vlan_a: Vlan100: id: 100 intfs: [2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] prefix: 192.168.100.1/21 + prefix_v6: fc02:100::1/64 tag: 100 Vlan200: id: 200 intfs: [18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31] prefix: 192.168.200.1/21 + prefix_v6: fc02:200::1/64 tag: 200 configuration_properties: diff --git a/ansible/vars/topo_t0-64.yml b/ansible/vars/topo_t0-64.yml index 99c9aa53fbe..b130fa27b11 100644 --- a/ansible/vars/topo_t0-64.yml +++ b/ansible/vars/topo_t0-64.yml @@ -106,17 +106,20 @@ topology: id: 1000 intfs: [6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 36, 37, 38, 39, 40, 41, 42, 48, 52, 53, 54, 55, 56, 57, 58] prefix: 192.168.0.1/21 + prefix_v6: fc02:1000::1/64 tag: 1000 two_vlan_a: Vlan100: id: 100 intfs: [6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 22, 23, 24, 25, 26, 27, 28, 29] prefix: 192.168.100.1/21 + prefix_v6: fc02:100::1/64 tag: 100 Vlan200: id: 200 intfs: [30, 31, 32, 36, 37, 38, 39, 40, 41, 42, 48, 52, 53, 54, 55, 56, 57, 58] prefix: 192.168.200.1/21 + prefix_v6: fc02:200::1/64 tag: 200 configuration_properties: diff --git a/ansible/vars/topo_t0.yml b/ansible/vars/topo_t0.yml index 441b1d7e59c..3f5a1d74cea 100644 --- a/ansible/vars/topo_t0.yml +++ b/ansible/vars/topo_t0.yml @@ -58,17 +58,20 @@ topology: id: 1000 intfs: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] prefix: 192.168.0.1/21 + prefix_v6: fc02:1000::1/64 tag: 1000 two_vlan_a: Vlan100: id: 100 intfs: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] prefix: 192.168.100.1/21 + prefix_v6: fc02:100::1/64 tag: 100 Vlan200: id: 200 intfs: [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] prefix: 192.168.200.1/21 + prefix_v6: fc02:200::1/64 tag: 200 configuration_properties: