diff --git a/ansible/minigraph/t0-64-32.xml b/ansible/minigraph/t0-64-32.xml
new file mode 100644
index 00000000000..8bc775cfb12
--- /dev/null
+++ b/ansible/minigraph/t0-64-32.xml
@@ -0,0 +1,585 @@
+
+
+
+
+
+ ARISTA01T1
+ 10.0.0.1
+ t0-64-32
+ 10.0.0.0
+ 1
+ 180
+ 60
+
+
+ ARISTA02T1
+ 10.0.0.5
+ t0-64-32
+ 10.0.0.4
+ 1
+ 180
+ 60
+
+
+ ARISTA03T1
+ 10.0.0.9
+ t0-64-32
+ 10.0.0.8
+ 1
+ 180
+ 60
+
+
+ ARISTA04T1
+ 10.0.0.13
+ t0-64-32
+ 10.0.0.12
+ 1
+ 180
+ 60
+
+
+ ARISTA01T1
+ FC00::2
+ t0-64-32
+ FC00::1
+ 1
+ 180
+ 60
+
+
+ ARISTA02T1
+ FC00::A
+ t0-64-32
+ FC00::9
+ 1
+ 180
+ 60
+
+
+ ARISTA03T1
+ FC00::12
+ t0-64-32
+ FC00::11
+ 1
+ 180
+ 60
+
+
+ ARISTA04T1
+ FC00::1A
+ t0-64-32
+ FC00::19
+ 1
+ 180
+ 60
+
+
+
+
+ 64601
+ t0-64-32
+
+
+ BGPPeer
+ 10.0.0.1
+
+
+
+
+
+ BGPPeer
+ 10.0.0.5
+
+
+
+
+
+ BGPPeer
+ 10.0.0.9
+
+
+
+
+
+ BGPPeer
+ 10.0.0.13
+
+
+
+
+
+ BGPPeer
+ FC00::2
+
+
+
+
+
+ BGPPeer
+ FC00::A
+
+
+
+
+
+ BGPPeer
+ FC00::12
+
+
+
+
+
+ BGPPeer
+ FC00::1A
+
+
+
+
+
+
+
+
+ 64802
+ ARISTA01T1
+
+
+
+ 64802
+ ARISTA02T1
+
+
+
+ 64802
+ ARISTA03T1
+
+
+
+ 64802
+ ARISTA04T1
+
+
+
+
+
+
+
+
+
+ HostIP
+ Loopback0
+
+ 10.1.0.33/32
+
+ 10.1.0.33/32
+
+
+ HostIP1
+ Loopback0
+
+ FC00:1::33/128
+
+ FC00:1::33/128
+
+
+
+
+ HostIP
+ eth0
+
+ 10.250.0.113/23
+
+ 10.250.0.113/23
+
+
+
+
+
+ t0-64-32
+
+
+ PortChannelInterface
+ PortChannel1
+ fortyGigE0/0;fortyGigE0/4
+
+
+
+ PortChannelInterface
+ PortChannel4
+ fortyGigE0/16;fortyGigE0/20
+
+
+
+ PortChannelInterface
+ PortChannel16
+ fortyGigE0/64;fortyGigE0/68
+
+
+
+ PortChannelInterface
+ PortChannel20
+ fortyGigE0/80;fortyGigE0/84
+
+
+
+
+
+ VlanInterface
+ Vlan2
+ fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96;fortyGigE0/100;fortyGigE0/104;fortyGigE0/108;fortyGigE0/112;fortyGigE0/116;fortyGigE0/120;fortyGigE0/124
+ False
+ 0.0.0.0/0
+
+ 2
+ 2
+ 172.0.0.0/26
+
+
+
+
+ IPInterface
+
+ PortChannel1
+ 10.0.0.0/31
+
+
+ IPInterface
+
+ PortChannel4
+ 10.0.0.4/31
+
+
+ IPInterface
+
+ PortChannel16
+ 10.0.0.8/31
+
+
+ IPInterface
+
+ PortChannel20
+ 10.0.0.12/31
+
+
+ IPInterface
+
+ PortChannel1
+ FC00::1/126
+
+
+ IPInterface
+
+ PortChannel4
+ FC00::9/126
+
+
+ IPInterface
+
+ PortChannel16
+ FC00::11/126
+
+
+ IPInterface
+
+ PortChannel20
+ FC00::19/126
+
+
+ IPInterface
+
+ Vlan2
+ 172.0.0.1/26
+
+
+
+
+
+
+
+
+
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA01T1
+ Ethernet1
+ true
+ t0-64-32
+ fortyGigE0/0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA01T1
+ Ethernet2
+ true
+ t0-64-32
+ fortyGigE0/4
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA02T1
+ Ethernet1
+ true
+ t0-64-32
+ fortyGigE0/16
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA02T1
+ Ethernet2
+ true
+ t0-64-32
+ fortyGigE0/20
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA03T1
+ Ethernet1
+ true
+ t0-64-32
+ fortyGigE0/64
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA03T1
+ Ethernet2
+ true
+ t0-64-32
+ fortyGigE0/68
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA04T1
+ Ethernet1
+ true
+ t0-64-32
+ fortyGigE0/80
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA04T1
+ Ethernet2
+ true
+ t0-64-32
+ fortyGigE0/84
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/24
+ true
+ server-01
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/28
+ true
+ server-02
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/32
+ true
+ server-03
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/40
+ true
+ server-05
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/44
+ true
+ server-06
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/48
+ true
+ server-07
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/52
+ true
+ server-08
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/56
+ true
+ server-09
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/60
+ true
+ server-10
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/88
+ true
+ server-19
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/92
+ true
+ server-20
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/96
+ true
+ server-21
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/100
+ true
+ server-22
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/104
+ true
+ server-23
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/108
+ true
+ server-24
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/112
+ true
+ server-25
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/116
+ true
+ server-26
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/120
+ true
+ server-27
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64-32
+ fortyGigE0/124
+ true
+ server-28
+ 0
+
+
+
+
+ t0-64-32
+ Force10-S6000
+
+ 10.250.0.113
+
+
+
+
+ t0-64-32
+ Force10-S6000
+
diff --git a/ansible/minigraph/t0-64.xml b/ansible/minigraph/t0-64.xml
new file mode 100644
index 00000000000..8b5f9fa7f10
--- /dev/null
+++ b/ansible/minigraph/t0-64.xml
@@ -0,0 +1,755 @@
+
+
+
+
+
+ ARISTA01T1
+ 10.0.0.1
+ t0-64
+ 10.0.0.0
+ 1
+ 180
+ 60
+
+
+ ARISTA02T1
+ 10.0.0.5
+ t0-64
+ 10.0.0.4
+ 1
+ 180
+ 60
+
+
+ ARISTA03T1
+ 10.0.0.9
+ t0-64
+ 10.0.0.8
+ 1
+ 180
+ 60
+
+
+ ARISTA04T1
+ 10.0.0.13
+ t0-64
+ 10.0.0.12
+ 1
+ 180
+ 60
+
+
+ ARISTA01T1
+ FC00::2
+ t0-64
+ FC00::1
+ 1
+ 180
+ 60
+
+
+ ARISTA02T1
+ FC00::A
+ t0-64
+ FC00::9
+ 1
+ 180
+ 60
+
+
+ ARISTA03T1
+ FC00::12
+ t0-64
+ FC00::11
+ 1
+ 180
+ 60
+
+
+ ARISTA04T1
+ FC00::1A
+ t0-64
+ FC00::19
+ 1
+ 180
+ 60
+
+
+
+
+ 64601
+ t0-64
+
+
+ BGPPeer
+ 10.0.0.1
+
+
+
+
+
+ BGPPeer
+ 10.0.0.5
+
+
+
+
+
+ BGPPeer
+ 10.0.0.9
+
+
+
+
+
+ BGPPeer
+ 10.0.0.13
+
+
+
+
+
+ BGPPeer
+ FC00::2
+
+
+
+
+
+ BGPPeer
+ FC00::A
+
+
+
+
+
+ BGPPeer
+ FC00::12
+
+
+
+
+
+ BGPPeer
+ FC00::1A
+
+
+
+
+
+
+
+
+ 64802
+ ARISTA01T1
+
+
+
+ 64802
+ ARISTA02T1
+
+
+
+ 64802
+ ARISTA03T1
+
+
+
+ 64802
+ ARISTA04T1
+
+
+
+
+
+
+
+
+
+ HostIP
+ Loopback0
+
+ 10.1.0.32/32
+
+ 10.1.0.32/32
+
+
+ HostIP1
+ Loopback0
+
+ FC00:1::32/128
+
+ FC00:1::32/128
+
+
+
+
+ HostIP
+ eth0
+
+ 10.251.0.243/23
+
+ 10.251.0.243/23
+
+
+
+
+
+ t0-64
+
+
+ PortChannelInterface
+ PortChannel1
+ fortyGigE1/1/1;fortyGigE1/1/2
+
+
+
+ PortChannelInterface
+ PortChannel4
+ fortyGigE1/1/5;fortyGigE1/1/6
+
+
+
+ PortChannelInterface
+ PortChannel16
+ fortyGigE1/2/1;fortyGigE1/2/2
+
+
+
+ PortChannelInterface
+ PortChannel20
+ fortyGigE1/2/5;fortyGigE1/2/6
+
+
+
+
+
+ VlanInterface
+ Vlan2
+ 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/3/1;fortyGigE1/3/5;fortyGigE1/3/6;fortyGigE1/3/7;fortyGigE1/3/8;fortyGigE1/3/9;fortyGigE1/3/10;fortyGigE1/3/11;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/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
+
+ 2
+ 2
+ 172.0.0.0/26
+
+
+
+
+ IPInterface
+
+ PortChannel1
+ 10.0.0.0/31
+
+
+ IPInterface
+
+ PortChannel4
+ 10.0.0.4/31
+
+
+ IPInterface
+
+ PortChannel16
+ 10.0.0.8/31
+
+
+ IPInterface
+
+ PortChannel20
+ 10.0.0.12/31
+
+
+ IPInterface
+
+ PortChannel1
+ FC00::1/126
+
+
+ IPInterface
+
+ PortChannel4
+ FC00::9/126
+
+
+ IPInterface
+
+ PortChannel16
+ FC00::11/126
+
+
+ IPInterface
+
+ PortChannel20
+ FC00::19/126
+
+
+ IPInterface
+
+ Vlan2
+ 172.0.0.1/26
+
+
+
+
+
+
+
+
+
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA01T1
+ Ethernet1
+ true
+ t0-64
+ fortyGigE1/1/1
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA01T1
+ Ethernet2
+ true
+ t0-64
+ fortyGigE1/1/2
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA02T1
+ Ethernet1
+ true
+ t0-64
+ fortyGigE1/1/5
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA02T1
+ Ethernet2
+ true
+ t0-64
+ fortyGigE1/1/6
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA03T1
+ Ethernet1
+ true
+ t0-64
+ fortyGigE1/2/1
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA03T1
+ Ethernet2
+ true
+ t0-64
+ fortyGigE1/2/2
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA04T1
+ Ethernet1
+ true
+ t0-64
+ fortyGigE1/2/5
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ ARISTA04T1
+ Ethernet2
+ true
+ t0-64
+ fortyGigE1/2/6
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/7
+ true
+ server-01
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/8
+ true
+ server-02
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/9
+ true
+ server-03
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/10
+ true
+ server-04
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/11
+ true
+ server-05
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/12
+ true
+ server-06
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/13
+ true
+ server-07
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/14
+ true
+ server-08
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/15
+ true
+ server-09
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/1/16
+ true
+ server-10
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/3/1
+ true
+ server-11
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/3/5
+ true
+ server-12
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/3/6
+ true
+ server-13
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/3/7
+ true
+ server-14
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/3/8
+ true
+ server-15
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/3/9
+ true
+ server-16
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/3/10
+ true
+ server-17
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/3/11
+ true
+ server-18
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/7
+ true
+ server-19
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/8
+ true
+ server-20
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/9
+ true
+ server-21
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/10
+ true
+ server-22
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/11
+ true
+ server-23
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/12
+ true
+ server-24
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/13
+ true
+ server-25
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/14
+ true
+ server-26
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/15
+ true
+ server-27
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/2/16
+ true
+ server-28
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/4/1
+ true
+ server-29
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/4/5
+ true
+ server-30
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/4/6
+ true
+ server-31
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/4/7
+ true
+ server-32
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/4/8
+ true
+ server-33
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/4/9
+ true
+ server-34
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/4/10
+ true
+ server-35
+ 0
+
+
+ DeviceInterfaceLink
+ true
+ 40000
+ t0-64
+ fortyGigE1/4/11
+ true
+ server-36
+ 0
+
+
+
+
+ t0-64
+ Force10-S6100
+
+ 10.251.0.243
+
+
+
+
+ t0-64
+ Force10-S6100
+
diff --git a/ansible/roles/eos/templates/t0-64-32-leaf.j2 b/ansible/roles/eos/templates/t0-64-32-leaf.j2
index 6cc500ac16b..9501152cf8d 100644
--- a/ansible/roles/eos/templates/t0-64-32-leaf.j2
+++ b/ansible/roles/eos/templates/t0-64-32-leaf.j2
@@ -149,3 +149,4 @@ management api http-commands
!
end
+
diff --git a/ansible/roles/test/files/ptftests/remote.py b/ansible/roles/test/files/ptftests/remote.py
index ae88ec0468b..85e864a446e 100644
--- a/ansible/roles/test/files/ptftests/remote.py
+++ b/ansible/roles/test/files/ptftests/remote.py
@@ -4,73 +4,27 @@
This platform uses physical ethernet interfaces.
"""
-# Update this dictionary to suit your environment.
-remote_port_map = {
- (0, 0) : "eth0",
- (0, 1) : "eth1",
- (0, 2) : "eth2",
- (0, 3) : "eth3",
- (0, 4) : "eth4",
- (0, 5) : "eth5",
- (0, 6) : "eth6",
- (0, 7) : "eth7",
- (0, 8) : "eth8",
- (0, 9) : "eth9",
- (0, 10) : "eth10",
- (0, 11) : "eth11",
- (0, 12) : "eth12",
- (0, 13) : "eth13",
- (0, 14) : "eth14",
- (0, 15) : "eth15",
- (0, 16) : "eth16",
- (0, 17) : "eth17",
- (0, 18) : "eth18",
- (0, 19) : "eth19",
- (0, 20) : "eth20",
- (0, 21) : "eth21",
- (0, 22) : "eth22",
- (0, 23) : "eth23",
- (0, 24) : "eth24",
- (0, 25) : "eth25",
- (0, 26) : "eth26",
- (0, 27) : "eth27",
- (0, 28) : "eth28",
- (0, 29) : "eth29",
- (0, 30) : "eth30",
- (0, 31) : "eth31",
- (0, 32) : "eth32",
- (0, 33) : "eth33",
- (0, 34) : "eth34",
- (0, 35) : "eth35",
- (0, 36) : "eth36",
- (0, 37) : "eth37",
- (0, 38) : "eth38",
- (0, 39) : "eth39",
- (0, 40) : "eth40",
- (0, 41) : "eth41",
- (0, 42) : "eth42",
- (0, 43) : "eth43",
- (0, 44) : "eth44",
- (0, 45) : "eth45",
- (0, 46) : "eth46",
- (0, 47) : "eth47",
- (0, 48) : "eth48",
- (0, 49) : "eth49",
- (0, 50) : "eth50",
- (0, 51) : "eth51",
- (0, 52) : "eth52",
- (0, 53) : "eth53",
- (0, 54) : "eth54",
- (0, 55) : "eth55",
- (0, 56) : "eth56",
- (0, 57) : "eth57",
- (0, 58) : "eth58",
- (0, 59) : "eth59",
- (0, 60) : "eth60",
- (0, 61) : "eth61",
- (0, 62) : "eth62",
- (0, 63) : "eth63",
-}
+def get_ifaces():
+ with open('/proc/net/dev') as fp:
+ all = fp.read()
+
+ ifaces = []
+ for line in all.split('\n'):
+ # Skip a header
+ if ':' not in line:
+ continue
+
+ iface = line.split(':')[0].strip()
+
+ # Skip not FP interfaces
+ if 'eth' not in iface:
+ continue
+
+ ifaces.append(iface)
+
+ # Sort before return
+ return sorted(ifaces, key=lambda x: int(x.replace('eth', '')))
+
def platform_config_update(config):
"""
@@ -78,7 +32,8 @@ def platform_config_update(config):
@param config The configuration dictionary to use/update
"""
- global remote_port_map
+
+ remote_port_map = {(0, i) : v for i, v in enumerate(get_ifaces())}
config["port_map"] = remote_port_map.copy()
config["caps_table_idx"] = 0
diff --git a/ansible/roles/test/tasks/fast-reboot.yml b/ansible/roles/test/tasks/fast-reboot.yml
index 74d41905416..7ee7a376fa6 100644
--- a/ansible/roles/test/tasks/fast-reboot.yml
+++ b/ansible/roles/test/tasks/fast-reboot.yml
@@ -29,9 +29,15 @@
- /root/.ssh/id_rsa.pub
delegate_to: "{{ ptf_host }}"
+ - name: Check that file /root/.ssh/known_hosts exists
+ stat: path=/etc/shorewall/rules
+ delegate_to: "{{ ptf_host }}"
+ register: known_hosts
+
- name: Remove old entry about DUT
shell: ssh-keygen -f /root/.ssh/known_hosts -R {{ ansible_host }}
delegate_to: "{{ ptf_host }}"
+ when: known_hosts.stat.exists
- name: Generate public key for ptf host
shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N ""
diff --git a/ansible/vars/topo_t0-64-32.yml b/ansible/vars/topo_t0-64-32.yml
index efae9f4bf1f..4e8d35941fd 100644
--- a/ansible/vars/topo_t0-64-32.yml
+++ b/ansible/vars/topo_t0-64-32.yml
@@ -82,7 +82,7 @@ configuration:
Ethernet9:
ipv4: 10.10.246.1/24
ipv6: fc0a::1/64
- Port-Channel0:
+ Port-Channel1:
ipv4: 10.0.0.1/31
ipv6: fc00::2/126
@@ -100,9 +100,9 @@ configuration:
ipv4: 100.1.0.2/32
ipv6: 2064:100::2/128
Ethernet1:
- lacp: 5
+ lacp: 4
Ethernet2:
- lacp: 5
+ lacp: 4
Ethernet9:
ipv4: 10.10.246.2/24
ipv6: fc0a::2/64
@@ -124,9 +124,9 @@ configuration:
ipv4: 100.1.0.3/32
ipv6: 2064:100::3/128
Ethernet1:
- lacp: 17
+ lacp: 16
Ethernet2:
- lacp: 17
+ lacp: 16
Ethernet9:
ipv4: 10.10.246.3/24
ipv6: fc0a::3/64
@@ -148,9 +148,9 @@ configuration:
ipv4: 100.1.0.4/32
ipv6: 2064:100::4/128
Ethernet1:
- lacp: 21
+ lacp: 20
Ethernet2:
- lacp: 21
+ lacp: 20
Ethernet9:
ipv4: 10.10.246.4/24
ipv6: fc0a::4/64
diff --git a/ansible/vars/topo_t0-64.yml b/ansible/vars/topo_t0-64.yml
index c44037943d0..9c6c681878f 100644
--- a/ansible/vars/topo_t0-64.yml
+++ b/ansible/vars/topo_t0-64.yml
@@ -132,13 +132,13 @@ configuration:
ipv4: 100.1.0.2/32
ipv6: 2064:100::2/128
Ethernet1:
- lacp: 5
+ lacp: 4
Ethernet2:
- lacp: 5
+ lacp: 4
Ethernet9:
ipv4: 10.10.246.2/24
ipv6: fc0a::2/64
- Port-Channel5:
+ Port-Channel4:
ipv4: 10.0.0.5/31
ipv6: fc00::a/126
@@ -156,13 +156,13 @@ configuration:
ipv4: 100.1.0.3/32
ipv6: 2064:100::3/128
Ethernet1:
- lacp: 17
+ lacp: 16
Ethernet2:
- lacp: 17
+ lacp: 16
Ethernet9:
ipv4: 10.10.246.3/24
ipv6: fc0a::3/64
- Port-Channel17:
+ Port-Channel16:
ipv4: 10.0.0.9/31
ipv6: fc00::12/126
@@ -180,13 +180,12 @@ configuration:
ipv4: 100.1.0.4/32
ipv6: 2064:100::4/128
Ethernet1:
- lacp: 21
+ lacp: 20
Ethernet2:
- lacp: 21
+ lacp: 20
Ethernet9:
ipv4: 10.10.246.4/24
ipv6: fc0a::4/64
- Port-Channel21:
+ Port-Channel20:
ipv4: 10.0.0.13/31
ipv6: fc00::1a/126
-