diff --git a/ansible/config_sonic_basedon_testbed.yml b/ansible/config_sonic_basedon_testbed.yml index aba35820f9e..d356a64e3fa 100644 --- a/ansible/config_sonic_basedon_testbed.yml +++ b/ansible/config_sonic_basedon_testbed.yml @@ -77,11 +77,16 @@ with_items: "{{ host_if_indexes }}" when: ("'host_interfaces' in vm_topo_config") and ("'tor' in vm_topo_config['dut_type'] | lower") - - name: find all interface indexes connecting to VM + - name: find all interface indexes mapping connecting to VM set_fact: interface_to_vms: "{{ interface_to_vms|default({}) | combine({ item.key: item.value['interface_indexes'] }) }}" with_dict: vm_topo_config['vm'] + - name: find all interface indexes connecting to VM + set_fact: + ifindex_to_vms: "{{ ifindex_to_vms|default([]) }} + {{ item.value['interface_indexes']}}" + with_dict: vm_topo_config['vm'] + - name: find all interface names set_fact: intf_names: "{{ intf_names | default({}) | combine({item.key: port_alias[item.value[0]|int:item.value[-1]|int+1] }) }}" diff --git a/ansible/minigraph/lab-a7260-01.t0-116.xml b/ansible/minigraph/lab-a7260-01.t0-116.xml index bc62e42b3b3..7fe8abc044d 100644 --- a/ansible/minigraph/lab-a7260-01.t0-116.xml +++ b/ansible/minigraph/lab-a7260-01.t0-116.xml @@ -198,29 +198,29 @@ PortChannel0001 - Ethernet13/1;Ethernet13/3 + Ethernet13/1;Ethernet14/1 PortChannel0002 - Ethernet14/1;Ethernet14/3 + Ethernet15/1;Ethernet16/1 PortChannel0003 - Ethernet15/1;Ethernet15/3 + Ethernet17/1;Ethernet18/1 PortChannel0004 - Ethernet16/1;Ethernet16/3 + Ethernet19/1;Ethernet20/1 Vlan1000 - Ethernet1/1;Ethernet1/3;Ethernet2/1;Ethernet2/3;Ethernet3/1;Ethernet3/3;Ethernet4/1;Ethernet4/3;Ethernet5/1;Ethernet5/3;Ethernet6/1;Ethernet6/3;Ethernet7/1;Ethernet7/3;Ethernet8/1;Ethernet8/3;Ethernet9/1;Ethernet9/3;Ethernet10/1;Ethernet10/3;Ethernet11/1;Ethernet11/3;Ethernet12/1;Ethernet12/3;Ethernet17/1;Ethernet17/3;Ethernet18/1;Ethernet18/3;Ethernet19/1;Ethernet19/3;Ethernet20/1;Ethernet20/3;Ethernet21/1;Ethernet21/3;Ethernet22/1;Ethernet22/3;Ethernet23/1;Ethernet23/3;Ethernet24/1;Ethernet24/3;Ethernet25/1;Ethernet25/3;Ethernet26/1;Ethernet26/3;Ethernet27/1;Ethernet27/3;Ethernet28/1;Ethernet28/3;Ethernet29/1;Ethernet29/3;Ethernet30/1;Ethernet30/3;Ethernet31/1;Ethernet31/3;Ethernet32/1;Ethernet32/3;Ethernet33/1;Ethernet33/3;Ethernet34/1;Ethernet34/3;Ethernet35/1;Ethernet35/3;Ethernet36/1;Ethernet36/3;Ethernet37/1;Ethernet37/3;Ethernet38/1;Ethernet38/3;Ethernet39/1;Ethernet39/3;Ethernet40/1;Ethernet40/3;Ethernet41/1;Ethernet41/3;Ethernet42/1;Ethernet42/3;Ethernet43/1;Ethernet43/3;Ethernet44/1;Ethernet44/3;Ethernet45/1;Ethernet46/1;Ethernet47/1;Ethernet48/1;Ethernet49/1;Ethernet50/1;Ethernet51/1;Ethernet52/1;Ethernet53/1;Ethernet53/3;Ethernet54/1;Ethernet54/3;Ethernet55/1;Ethernet55/3;Ethernet56/1;Ethernet56/3;Ethernet57/1;Ethernet57/3;Ethernet58/1;Ethernet58/3;Ethernet59/1;Ethernet59/3;Ethernet60/1;Ethernet60/3;Ethernet61/1;Ethernet61/3;Ethernet62/1;Ethernet62/3;Ethernet63/1;Ethernet63/3;Ethernet64/1;Ethernet64/3 + Ethernet1/1;Ethernet1/3;Ethernet2/1;Ethernet2/3;Ethernet3/1;Ethernet3/3;Ethernet4/1;Ethernet4/3;Ethernet5/1;Ethernet5/3;Ethernet6/1;Ethernet6/3;Ethernet7/1;Ethernet7/3;Ethernet8/1;Ethernet8/3;Ethernet9/1;Ethernet9/3;Ethernet10/1;Ethernet10/3;Ethernet11/1;Ethernet11/3;Ethernet12/1;Ethernet12/3;Ethernet21/1;Ethernet21/3;Ethernet22/1;Ethernet22/3;Ethernet23/1;Ethernet23/3;Ethernet24/1;Ethernet24/3;Ethernet25/1;Ethernet25/3;Ethernet26/1;Ethernet26/3;Ethernet27/1;Ethernet27/3;Ethernet28/1;Ethernet28/3;Ethernet29/1;Ethernet29/3;Ethernet30/1;Ethernet30/3;Ethernet31/1;Ethernet31/3;Ethernet32/1;Ethernet32/3;Ethernet33/1;Ethernet33/3;Ethernet34/1;Ethernet34/3;Ethernet35/1;Ethernet35/3;Ethernet36/1;Ethernet36/3;Ethernet37/1;Ethernet37/3;Ethernet38/1;Ethernet38/3;Ethernet39/1;Ethernet39/3;Ethernet40/1;Ethernet40/3;Ethernet41/1;Ethernet41/3;Ethernet42/1;Ethernet42/3;Ethernet43/1;Ethernet43/3;Ethernet44/1;Ethernet44/3;Ethernet45/1;Ethernet45/3;Ethernet46/1;Ethernet46/3;Ethernet47/1;Ethernet47/3;Ethernet48/1;Ethernet48/3;Ethernet49/1;Ethernet49/3;Ethernet50/1;Ethernet50/3;Ethernet51/1;Ethernet51/3;Ethernet52/1;Ethernet52/3;Ethernet53/1;Ethernet53/3;Ethernet54/1;Ethernet54/3;Ethernet55/1;Ethernet55/3;Ethernet56/1;Ethernet56/3;Ethernet57/1;Ethernet57/3;Ethernet58/1;Ethernet58/3;Ethernet59/1;Ethernet59/3;Ethernet60/1;Ethernet60/3;Ethernet61/1;Ethernet61/3;Ethernet62/1;Ethernet62/3;Ethernet63/1;Ethernet63/3;Ethernet64/1;Ethernet64/3 False 0.0.0.0/0 @@ -283,8 +283,8 @@ SNMP_ACL SNMP SNMP - - + + ERSPAN Everflow Everflow @@ -294,6 +294,11 @@ ssh-only SSH + + Ethernet1/1;Ethernet1/3;Ethernet2/1;Ethernet2/3;Ethernet3/1;Ethernet3/3;Ethernet4/1;Ethernet4/3;Ethernet5/1;Ethernet5/3;Ethernet6/1;Ethernet6/3;Ethernet7/1;Ethernet7/3;Ethernet8/1;Ethernet8/3;Ethernet9/1;Ethernet9/3;Ethernet10/1;Ethernet10/3;Ethernet11/1;Ethernet11/3;Ethernet12/1;Ethernet12/3;Ethernet21/1;Ethernet21/3;Ethernet22/1;Ethernet22/3;Ethernet23/1;Ethernet23/3;Ethernet24/1;Ethernet24/3;Ethernet25/1;Ethernet25/3;Ethernet26/1;Ethernet26/3;Ethernet27/1;Ethernet27/3;Ethernet28/1;Ethernet28/3;Ethernet29/1;Ethernet29/3;Ethernet30/1;Ethernet30/3;Ethernet31/1;Ethernet31/3;Ethernet32/1;Ethernet32/3;Ethernet33/1;Ethernet33/3;Ethernet34/1;Ethernet34/3;Ethernet35/1;Ethernet35/3;Ethernet36/1;Ethernet36/3;Ethernet37/1;Ethernet37/3;Ethernet38/1;Ethernet38/3;Ethernet39/1;Ethernet39/3;Ethernet40/1;Ethernet40/3;Ethernet41/1;Ethernet41/3;Ethernet42/1;Ethernet42/3;Ethernet43/1;Ethernet43/3;Ethernet44/1;Ethernet44/3;Ethernet45/1;Ethernet45/3;Ethernet46/1;Ethernet46/3;Ethernet47/1;Ethernet47/3;Ethernet48/1;Ethernet48/3;Ethernet49/1;Ethernet49/3;Ethernet50/1;Ethernet50/3;Ethernet51/1;Ethernet51/3;Ethernet52/1;Ethernet52/3;Ethernet53/1;Ethernet53/3;Ethernet54/1;Ethernet54/3;Ethernet55/1;Ethernet55/3;Ethernet56/1;Ethernet56/3;Ethernet57/1;Ethernet57/3;Ethernet58/1;Ethernet58/3;Ethernet59/1;Ethernet59/3;Ethernet60/1;Ethernet60/3;Ethernet61/1;Ethernet61/3;Ethernet62/1;Ethernet62/3;Ethernet63/1;Ethernet63/3;Ethernet64/1;Ethernet64/3Ethernet19/1;Ethernet20/1;Ethernet17/1;Ethernet18/1;Ethernet15/1;Ethernet16/1;Ethernet13/1;Ethernet14/1 + DataAcl + DataPlane + @@ -313,49 +318,49 @@ ARISTA01T1 Ethernet2 lab-a7260-01 - Ethernet13/3 + Ethernet14/1 DeviceInterfaceLink ARISTA02T1 Ethernet1 lab-a7260-01 - Ethernet14/1 + Ethernet15/1 DeviceInterfaceLink ARISTA02T1 Ethernet2 lab-a7260-01 - Ethernet14/3 + Ethernet16/1 DeviceInterfaceLink ARISTA03T1 Ethernet1 lab-a7260-01 - Ethernet15/1 + Ethernet17/1 DeviceInterfaceLink ARISTA03T1 Ethernet2 lab-a7260-01 - Ethernet15/3 + Ethernet18/1 DeviceInterfaceLink ARISTA04T1 Ethernet1 lab-a7260-01 - Ethernet16/1 + Ethernet19/1 DeviceInterfaceLink ARISTA04T1 Ethernet2 lab-a7260-01 - Ethernet16/3 + Ethernet20/1 @@ -410,7 +415,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -423,7 +428,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -436,7 +441,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -449,7 +454,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -462,7 +467,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -475,7 +480,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -488,7 +493,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -501,7 +506,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -514,7 +519,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -527,7 +532,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -540,7 +545,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -553,7 +558,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -566,7 +571,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -579,7 +584,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -592,7 +597,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -605,7 +610,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -618,7 +623,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -631,7 +636,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -644,7 +649,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -657,7 +662,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -670,7 +675,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -683,7 +688,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -696,7 +701,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -709,7 +714,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -730,7 +735,7 @@ true true 1 - Ethernet13/3 + Ethernet14/1 false 0 @@ -743,7 +748,7 @@ true true 1 - Ethernet14/1 + Ethernet15/1 false 0 @@ -756,7 +761,7 @@ true true 1 - Ethernet14/3 + Ethernet16/1 false 0 @@ -769,7 +774,7 @@ true true 1 - Ethernet15/1 + Ethernet17/1 false 0 @@ -782,7 +787,7 @@ true true 1 - Ethernet15/3 + Ethernet18/1 false 0 @@ -795,7 +800,7 @@ true true 1 - Ethernet16/1 + Ethernet19/1 false 0 @@ -808,7 +813,7 @@ true true 1 - Ethernet16/3 + Ethernet20/1 false 0 @@ -821,12 +826,12 @@ true true 1 - Ethernet17/1 + Ethernet21/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -834,12 +839,12 @@ true true 1 - Ethernet17/3 + Ethernet21/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -847,12 +852,12 @@ true true 1 - Ethernet18/1 + Ethernet22/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -860,12 +865,12 @@ true true 1 - Ethernet18/3 + Ethernet22/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -873,12 +878,12 @@ true true 1 - Ethernet19/1 + Ethernet23/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -886,12 +891,12 @@ true true 1 - Ethernet19/3 + Ethernet23/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -899,12 +904,12 @@ true true 1 - Ethernet20/1 + Ethernet24/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -912,12 +917,12 @@ true true 1 - Ethernet20/3 + Ethernet24/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -925,12 +930,12 @@ true true 1 - Ethernet21/1 + Ethernet25/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -938,12 +943,12 @@ true true 1 - Ethernet21/3 + Ethernet25/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -951,12 +956,12 @@ true true 1 - Ethernet22/1 + Ethernet26/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -964,12 +969,12 @@ true true 1 - Ethernet22/3 + Ethernet26/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -977,12 +982,12 @@ true true 1 - Ethernet23/1 + Ethernet27/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -990,12 +995,12 @@ true true 1 - Ethernet23/3 + Ethernet27/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1003,12 +1008,12 @@ true true 1 - Ethernet24/1 + Ethernet28/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1016,12 +1021,12 @@ true true 1 - Ethernet24/3 + Ethernet28/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1029,12 +1034,12 @@ true true 1 - Ethernet25/1 + Ethernet29/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1042,12 +1047,12 @@ true true 1 - Ethernet25/3 + Ethernet29/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1055,12 +1060,12 @@ true true 1 - Ethernet26/1 + Ethernet30/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1068,12 +1073,12 @@ true true 1 - Ethernet26/3 + Ethernet30/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1081,12 +1086,12 @@ true true 1 - Ethernet27/1 + Ethernet31/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1094,12 +1099,12 @@ true true 1 - Ethernet27/3 + Ethernet31/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1107,12 +1112,12 @@ true true 1 - Ethernet28/1 + Ethernet32/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1120,12 +1125,12 @@ true true 1 - Ethernet28/3 + Ethernet32/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1133,12 +1138,12 @@ true true 1 - Ethernet29/1 + Ethernet33/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1146,12 +1151,12 @@ true true 1 - Ethernet29/3 + Ethernet33/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1159,12 +1164,12 @@ true true 1 - Ethernet30/1 + Ethernet34/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1172,12 +1177,12 @@ true true 1 - Ethernet30/3 + Ethernet34/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1185,12 +1190,12 @@ true true 1 - Ethernet31/1 + Ethernet35/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1198,12 +1203,12 @@ true true 1 - Ethernet31/3 + Ethernet35/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1211,12 +1216,12 @@ true true 1 - Ethernet32/1 + Ethernet36/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1224,12 +1229,12 @@ true true 1 - Ethernet32/3 + Ethernet36/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1237,12 +1242,12 @@ true true 1 - Ethernet33/1 + Ethernet37/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1250,12 +1255,12 @@ true true 1 - Ethernet33/3 + Ethernet37/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1263,12 +1268,12 @@ true true 1 - Ethernet34/1 + Ethernet38/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1276,12 +1281,12 @@ true true 1 - Ethernet34/3 + Ethernet38/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1289,12 +1294,12 @@ true true 1 - Ethernet35/1 + Ethernet39/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1302,12 +1307,12 @@ true true 1 - Ethernet35/3 + Ethernet39/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1315,12 +1320,12 @@ true true 1 - Ethernet36/1 + Ethernet40/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1328,12 +1333,12 @@ true true 1 - Ethernet36/3 + Ethernet40/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1341,12 +1346,12 @@ true true 1 - Ethernet37/1 + Ethernet41/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1354,12 +1359,12 @@ true true 1 - Ethernet37/3 + Ethernet41/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1367,12 +1372,12 @@ true true 1 - Ethernet38/1 + Ethernet42/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1380,12 +1385,12 @@ true true 1 - Ethernet38/3 + Ethernet42/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1393,12 +1398,12 @@ true true 1 - Ethernet39/1 + Ethernet43/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1406,12 +1411,12 @@ true true 1 - Ethernet39/3 + Ethernet43/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1419,12 +1424,12 @@ true true 1 - Ethernet40/1 + Ethernet44/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1432,12 +1437,12 @@ true true 1 - Ethernet40/3 + Ethernet44/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1445,12 +1450,12 @@ true true 1 - Ethernet41/1 + Ethernet45/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1458,12 +1463,12 @@ true true 1 - Ethernet41/3 + Ethernet45/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1471,12 +1476,12 @@ true true 1 - Ethernet42/1 + Ethernet46/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1484,12 +1489,12 @@ true true 1 - Ethernet42/3 + Ethernet46/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1497,12 +1502,12 @@ true true 1 - Ethernet43/1 + Ethernet47/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1510,12 +1515,12 @@ true true 1 - Ethernet43/3 + Ethernet47/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1523,12 +1528,12 @@ true true 1 - Ethernet44/1 + Ethernet48/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1536,12 +1541,12 @@ true true 1 - Ethernet44/3 + Ethernet48/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1549,12 +1554,12 @@ true true 1 - Ethernet45/1 + Ethernet49/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1562,12 +1567,12 @@ true true 1 - Ethernet46/1 + Ethernet49/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1575,12 +1580,12 @@ true true 1 - Ethernet47/1 + Ethernet50/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1588,12 +1593,12 @@ true true 1 - Ethernet48/1 + Ethernet50/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1601,12 +1606,12 @@ true true 1 - Ethernet49/1 + Ethernet51/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1614,12 +1619,12 @@ true true 1 - Ethernet50/1 + Ethernet51/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1627,12 +1632,12 @@ true true 1 - Ethernet51/1 + Ethernet52/1 false 0 0 - 100000 + 50000 DeviceInterface @@ -1640,12 +1645,12 @@ true true 1 - Ethernet52/1 + Ethernet52/3 false 0 0 - 100000 + 50000 DeviceInterface @@ -1658,7 +1663,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1671,7 +1676,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1684,7 +1689,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1697,7 +1702,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1710,7 +1715,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1723,7 +1728,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1736,7 +1741,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1749,7 +1754,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1762,7 +1767,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1775,7 +1780,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1788,7 +1793,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1801,7 +1806,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1814,7 +1819,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1827,7 +1832,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1840,7 +1845,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1853,7 +1858,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1866,7 +1871,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1879,7 +1884,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1892,7 +1897,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1905,7 +1910,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1918,7 +1923,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1931,7 +1936,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1944,7 +1949,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1957,7 +1962,7 @@ false 0 0 - 100000 + 50000 DeviceInterface @@ -1970,7 +1975,7 @@ false 0 0 - 100000 + 10000 DeviceInterface @@ -1983,7 +1988,7 @@ false 0 0 - 100000 + 10000 true diff --git a/ansible/minigraph/lab-s6000-01.t0.xml b/ansible/minigraph/lab-s6000-01.t0.xml index 8f3d2b7878c..bf269c28376 100644 --- a/ansible/minigraph/lab-s6000-01.t0.xml +++ b/ansible/minigraph/lab-s6000-01.t0.xml @@ -220,7 +220,7 @@ Vlan1000 - fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96 + fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96 False 0.0.0.0/0 @@ -283,8 +283,8 @@ SNMP_ACL SNMP SNMP - - + + ERSPAN Everflow Everflow @@ -294,6 +294,11 @@ ssh-only SSH + + fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96fortyGigE0/124;fortyGigE0/120;fortyGigE0/116;fortyGigE0/112 + DataAcl + DataPlane + diff --git a/ansible/minigraph/lab-s6100-01.t0-64.xml b/ansible/minigraph/lab-s6100-01.t0-64.xml index b3f640936b4..f73bb872473 100644 --- a/ansible/minigraph/lab-s6100-01.t0-64.xml +++ b/ansible/minigraph/lab-s6100-01.t0-64.xml @@ -220,7 +220,7 @@ Vlan1000 - fortyGigE1/1/7;fortyGigE1/1/8;fortyGigE1/1/9;fortyGigE1/1/10;fortyGigE1/1/11;fortyGigE1/1/12;fortyGigE1/1/13;fortyGigE1/1/14;fortyGigE1/1/15;fortyGigE1/1/16;fortyGigE1/2/7;fortyGigE1/2/8;fortyGigE1/2/9;fortyGigE1/2/10;fortyGigE1/2/11;fortyGigE1/2/12;fortyGigE1/2/13;fortyGigE1/2/14;fortyGigE1/2/15;fortyGigE1/2/16;fortyGigE1/3/1;fortyGigE1/3/5;fortyGigE1/3/6;fortyGigE1/3/7;fortyGigE1/3/8;fortyGigE1/3/9;fortyGigE1/3/10;fortyGigE1/3/11;fortyGigE1/4/1;fortyGigE1/4/5;fortyGigE1/4/6;fortyGigE1/4/7;fortyGigE1/4/8;fortyGigE1/4/9;fortyGigE1/4/10;fortyGigE1/4/11 + fortyGigE1/1/7;fortyGigE1/1/8;fortyGigE1/1/9;fortyGigE1/1/10;fortyGigE1/1/11;fortyGigE1/1/12;fortyGigE1/1/13;fortyGigE1/1/14;fortyGigE1/1/15;fortyGigE1/1/16;fortyGigE1/2/7;fortyGigE1/2/8;fortyGigE1/2/9;fortyGigE1/2/10;fortyGigE1/2/11;fortyGigE1/2/12;fortyGigE1/2/13;fortyGigE1/2/14;fortyGigE1/2/15;fortyGigE1/2/16;fortyGigE1/3/1;fortyGigE1/3/5;fortyGigE1/3/6;fortyGigE1/3/7;fortyGigE1/3/8;fortyGigE1/3/9;fortyGigE1/3/10;fortyGigE1/3/11;fortyGigE1/4/1;fortyGigE1/4/5;fortyGigE1/4/6;fortyGigE1/4/7;fortyGigE1/4/8;fortyGigE1/4/9;fortyGigE1/4/10;fortyGigE1/4/11 False 0.0.0.0/0 @@ -283,8 +283,8 @@ SNMP_ACL SNMP SNMP - - + + ERSPAN Everflow Everflow @@ -294,6 +294,11 @@ ssh-only SSH + + fortyGigE1/1/7;fortyGigE1/1/8;fortyGigE1/1/9;fortyGigE1/1/10;fortyGigE1/1/11;fortyGigE1/1/12;fortyGigE1/1/13;fortyGigE1/1/14;fortyGigE1/1/15;fortyGigE1/1/16;fortyGigE1/2/7;fortyGigE1/2/8;fortyGigE1/2/9;fortyGigE1/2/10;fortyGigE1/2/11;fortyGigE1/2/12;fortyGigE1/2/13;fortyGigE1/2/14;fortyGigE1/2/15;fortyGigE1/2/16;fortyGigE1/3/1;fortyGigE1/3/5;fortyGigE1/3/6;fortyGigE1/3/7;fortyGigE1/3/8;fortyGigE1/3/9;fortyGigE1/3/10;fortyGigE1/3/11;fortyGigE1/4/1;fortyGigE1/4/5;fortyGigE1/4/6;fortyGigE1/4/7;fortyGigE1/4/8;fortyGigE1/4/9;fortyGigE1/4/10;fortyGigE1/4/11fortyGigE1/2/5;fortyGigE1/2/6;fortyGigE1/2/1;fortyGigE1/2/2;fortyGigE1/1/5;fortyGigE1/1/6;fortyGigE1/1/1;fortyGigE1/1/2 + DataAcl + DataPlane + diff --git a/ansible/minigraph/lab-s6100-01.t1-64-lag.xml b/ansible/minigraph/lab-s6100-01.t1-64-lag.xml index 1daa68b8f85..e354ad5d3c2 100644 --- a/ansible/minigraph/lab-s6100-01.t1-64-lag.xml +++ b/ansible/minigraph/lab-s6100-01.t1-64-lag.xml @@ -1149,8 +1149,8 @@ SNMP_ACL SNMP SNMP - - + + ERSPAN Everflow Everflow @@ -1160,6 +1160,11 @@ ssh-only SSH + + fortyGigE1/4/11;fortyGigE1/4/3;fortyGigE1/3/16;fortyGigE1/4/13;fortyGigE1/3/8;fortyGigE1/3/15;fortyGigE1/3/11;fortyGigE1/3/14;fortyGigE1/3/13;fortyGigE1/2/5;fortyGigE1/2/6;fortyGigE1/1/1;fortyGigE1/1/2;fortyGigE1/3/3;fortyGigE1/2/1;fortyGigE1/2/2;fortyGigE1/4/16;fortyGigE1/3/5;fortyGigE1/3/6;fortyGigE1/1/5;fortyGigE1/1/6;fortyGigE1/3/7;fortyGigE1/4/14;fortyGigE1/4/8;fortyGigE1/4/15;fortyGigE1/4/7;fortyGigE1/4/5;fortyGigE1/4/6 + DataAcl + DataPlane + diff --git a/ansible/minigraph/str-msn2700-01.t0.xml b/ansible/minigraph/str-msn2700-01.t0.xml index 12581604d2c..f0696d752fa 100644 --- a/ansible/minigraph/str-msn2700-01.t0.xml +++ b/ansible/minigraph/str-msn2700-01.t0.xml @@ -220,7 +220,7 @@ Vlan1000 - Ethernet4;Ethernet8;Ethernet12;Ethernet16;Ethernet20;Ethernet24;Ethernet28;Ethernet32;Ethernet36;Ethernet40;Ethernet44;Ethernet48;Ethernet52;Ethernet56;Ethernet60;Ethernet64;Ethernet68;Ethernet72;Ethernet76;Ethernet80;Ethernet84;Ethernet88;Ethernet92;Ethernet96 + Ethernet4;Ethernet8;Ethernet12;Ethernet16;Ethernet20;Ethernet24;Ethernet28;Ethernet32;Ethernet36;Ethernet40;Ethernet44;Ethernet48;Ethernet52;Ethernet56;Ethernet60;Ethernet64;Ethernet68;Ethernet72;Ethernet76;Ethernet80;Ethernet84;Ethernet88;Ethernet92;Ethernet96 False 0.0.0.0/0 @@ -283,8 +283,8 @@ SNMP_ACL SNMP SNMP - - + + ERSPAN Everflow Everflow @@ -294,6 +294,11 @@ ssh-only SSH + + Ethernet4;Ethernet8;Ethernet12;Ethernet16;Ethernet20;Ethernet24;Ethernet28;Ethernet32;Ethernet36;Ethernet40;Ethernet44;Ethernet48;Ethernet52;Ethernet56;Ethernet60;Ethernet64;Ethernet68;Ethernet72;Ethernet76;Ethernet80;Ethernet84;Ethernet88;Ethernet92;Ethernet96Ethernet124;Ethernet120;Ethernet116;Ethernet112 + DataAcl + DataPlane + diff --git a/ansible/minigraph/str-msn2700-01.t1-lag.xml b/ansible/minigraph/str-msn2700-01.t1-lag.xml index 1b8e475dca1..e874df15efc 100644 --- a/ansible/minigraph/str-msn2700-01.t1-lag.xml +++ b/ansible/minigraph/str-msn2700-01.t1-lag.xml @@ -1069,8 +1069,8 @@ SNMP_ACL SNMP SNMP - - + + ERSPAN Everflow Everflow @@ -1080,6 +1080,11 @@ ssh-only SSH + + Ethernet124;Ethernet104;Ethernet100;Ethernet40;Ethernet44;Ethernet32;Ethernet36;Ethernet96;Ethernet84;Ethernet92;Ethernet88;Ethernet24;Ethernet28;Ethernet0;Ethernet4;Ethernet64;Ethernet16;Ethernet20;Ethernet80;Ethernet68;Ethernet72;Ethernet8;Ethernet12;Ethernet76;Ethernet120;Ethernet56;Ethernet60;Ethernet116;Ethernet108;Ethernet48;Ethernet52;Ethernet112 + DataAcl + DataPlane + diff --git a/ansible/minigraph/str-msn2700-01.t1.xml b/ansible/minigraph/str-msn2700-01.t1.xml index 44a8d321808..bb50cd8e4cc 100644 --- a/ansible/minigraph/str-msn2700-01.t1.xml +++ b/ansible/minigraph/str-msn2700-01.t1.xml @@ -1349,8 +1349,8 @@ SNMP_ACL SNMP SNMP - - + + ERSPAN Everflow Everflow @@ -1360,6 +1360,11 @@ ssh-only SSH + + Ethernet60;Ethernet72;Ethernet124;Ethernet104;Ethernet100;Ethernet40;Ethernet36;Ethernet12;Ethernet76;Ethernet108;Ethernet56;Ethernet16;Ethernet80;Ethernet120;Ethernet68;Ethernet32;Ethernet96;Ethernet84;Ethernet20;Ethernet28;Ethernet4;Ethernet92;Ethernet116;Ethernet8;Ethernet88;Ethernet24;Ethernet0;Ethernet64;Ethernet52;Ethernet48;Ethernet112;Ethernet44 + DataAcl + DataPlane + diff --git a/ansible/templates/minigraph_dpg.j2 b/ansible/templates/minigraph_dpg.j2 index 3a93a886a9e..03b4256b94d 100644 --- a/ansible/templates/minigraph_dpg.j2 +++ b/ansible/templates/minigraph_dpg.j2 @@ -59,7 +59,7 @@ {% set vlan_intf_str=';'.join(vlan_intfs) %} Vlan1000 - {{ vlan_intf_str }} + {{ vlan_intf_str }} False 0.0.0.0/0 @@ -106,8 +106,8 @@ SNMP_ACL SNMP SNMP - - + + ERSPAN Everflow Everflow @@ -117,6 +117,18 @@ ssh-only SSH + + +{%- for index in host_if_indexes %} +{{ port_alias[index] }}{% if not loop.last %};{% endif %} +{% endfor %} +{% for index in ifindex_to_vms %} +{{ port_alias[index] }}{% if not loop.last %};{% endif %} +{% endfor -%} + + DataAcl + DataPlane +