From d4911a3c99bea840ac7c24aafa06777efbb2472d Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sat, 3 Dec 2022 09:54:53 +0000 Subject: [PATCH] Update PCI bus enumeration for hippo's regression test. Hu12/* -> Hu13/* --- vppcfg/intest/hippo-empty.yaml | 4 ++-- vppcfg/intest/hippo1.yaml | 6 +++--- vppcfg/intest/hippo10.yaml | 4 ++-- vppcfg/intest/hippo11.yaml | 6 +++--- vppcfg/intest/hippo12.yaml | 6 +++--- vppcfg/intest/hippo13.yaml | 6 +++--- vppcfg/intest/hippo14.yaml | 4 ++-- vppcfg/intest/hippo2.yaml | 4 ++-- vppcfg/intest/hippo3.yaml | 6 +++--- vppcfg/intest/hippo4.yaml | 8 ++++---- vppcfg/intest/hippo5.yaml | 6 +++--- vppcfg/intest/hippo6.yaml | 6 +++--- vppcfg/intest/hippo7.yaml | 6 +++--- vppcfg/intest/hippo8.yaml | 10 +++++----- vppcfg/intest/hippo9.yaml | 4 ++-- 15 files changed, 43 insertions(+), 43 deletions(-) diff --git a/vppcfg/intest/hippo-empty.yaml b/vppcfg/intest/hippo-empty.yaml index 68c59bc..970e046 100644 --- a/vppcfg/intest/hippo-empty.yaml +++ b/vppcfg/intest/hippo-empty.yaml @@ -9,12 +9,12 @@ interfaces: mac: 00:25:90:0c:05:01 state: down description: Not Used - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 1500 mac: b4:96:91:b3:b1:10 state: down description: Not Used - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 1500 mac: b4:96:91:b3:b1:11 state: down diff --git a/vppcfg/intest/hippo1.yaml b/vppcfg/intest/hippo1.yaml index 4f8d059..73790fb 100644 --- a/vppcfg/intest/hippo1.yaml +++ b/vppcfg/intest/hippo1.yaml @@ -12,7 +12,7 @@ interfaces: mtu: 9000 description: "LAG #2" - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: lcp: "ice0" mtu: 9000 addresses: [ 192.0.2.17/30, 2001:db8:3::1/64 ] @@ -31,7 +31,7 @@ interfaces: inner-dot1q: 1000 exact-match: True - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 2000 description: "Bridged" @@ -81,7 +81,7 @@ bridgedomains: bd1: mtu: 2000 bvi: loop1 - interfaces: [ BondEthernet0.500, BondEthernet0.501, HundredGigabitEthernet12/0/1, vxlan_tunnel1 ] + interfaces: [ BondEthernet0.500, BondEthernet0.501, HundredGigabitEthernet13/0/1, vxlan_tunnel1 ] bd11: mtu: 1500 diff --git a/vppcfg/intest/hippo10.yaml b/vppcfg/intest/hippo10.yaml index 1b4d7f9..eb5f8e0 100644 --- a/vppcfg/intest/hippo10.yaml +++ b/vppcfg/intest/hippo10.yaml @@ -12,10 +12,10 @@ interfaces: mtu: 9000 description: "LAG #2" - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: description: Not Used - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: description: Not Used BondEthernet0: diff --git a/vppcfg/intest/hippo11.yaml b/vppcfg/intest/hippo11.yaml index 82035b5..f3e804c 100644 --- a/vppcfg/intest/hippo11.yaml +++ b/vppcfg/intest/hippo11.yaml @@ -10,11 +10,11 @@ interfaces: mtu: 9000 description: "LAG #2" - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 1500 description: "bridged with tap" - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: description: Not Used BondEthernet0: @@ -56,7 +56,7 @@ bridgedomains: description: "Bridge Domain 100" mtu: 1500 bvi: loop100 - interfaces: [ HundredGigabitEthernet12/0/0, tap100 ] + interfaces: [ HundredGigabitEthernet13/0/0, tap100 ] taps: tap100: diff --git a/vppcfg/intest/hippo12.yaml b/vppcfg/intest/hippo12.yaml index e51e19b..4652836 100644 --- a/vppcfg/intest/hippo12.yaml +++ b/vppcfg/intest/hippo12.yaml @@ -12,7 +12,7 @@ interfaces: mtu: 9000 description: "LAG #2" - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: lcp: "ice12-0-0" mtu: 9000 addresses: [ 192.0.2.17/30, 2001:db8:3::1/64 ] @@ -31,7 +31,7 @@ interfaces: inner-dot1q: 1000 exact-match: True - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 2000 description: "Bridged" @@ -83,7 +83,7 @@ bridgedomains: bd1: mtu: 2000 bvi: loop1 - interfaces: [ BondEthernet0.500, BondEthernet0.501, HundredGigabitEthernet12/0/1, vxlan_tunnel1 ] + interfaces: [ BondEthernet0.500, BondEthernet0.501, HundredGigabitEthernet13/0/1, vxlan_tunnel1 ] bd11: mtu: 1500 diff --git a/vppcfg/intest/hippo13.yaml b/vppcfg/intest/hippo13.yaml index 1ec0cc8..4ee4410 100644 --- a/vppcfg/intest/hippo13.yaml +++ b/vppcfg/intest/hippo13.yaml @@ -11,7 +11,7 @@ interfaces: mtu: 9000 description: "LAG #2" - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: lcp: "ice0" mtu: 9000 addresses: [ 192.0.2.17/30, 2001:db8:3::1/64 ] @@ -30,7 +30,7 @@ interfaces: inner-dot1q: 1000 exact-match: True - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 2000 description: "Bridged" @@ -88,7 +88,7 @@ bridgedomains: bd1: mtu: 2000 bvi: loop1 - interfaces: [ BondEthernet0.500, BondEthernet0.501, HundredGigabitEthernet12/0/1, vxlan_tunnel1 ] + interfaces: [ BondEthernet0.500, BondEthernet0.501, HundredGigabitEthernet13/0/1, vxlan_tunnel1 ] bd11: mtu: 1500 diff --git a/vppcfg/intest/hippo14.yaml b/vppcfg/intest/hippo14.yaml index 6cb0927..81d24bb 100644 --- a/vppcfg/intest/hippo14.yaml +++ b/vppcfg/intest/hippo14.yaml @@ -11,12 +11,12 @@ interfaces: mac: 00:25:90:0c:05:01 state: down description: Not Used - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 1500 mac: b4:96:91:b3:b1:10 state: down description: Not Used - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 1500 mac: b4:96:91:b3:b1:11 state: down diff --git a/vppcfg/intest/hippo2.yaml b/vppcfg/intest/hippo2.yaml index a1e8a10..75714ee 100644 --- a/vppcfg/intest/hippo2.yaml +++ b/vppcfg/intest/hippo2.yaml @@ -33,7 +33,7 @@ interfaces: dot1ad: 100 inner-dot1q: 100 - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: sub-interfaces: 100: description: "Sub-int" @@ -47,7 +47,7 @@ interfaces: dot1ad: 100 inner-dot1q: 100 - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: sub-interfaces: 100: description: "Sub-int" diff --git a/vppcfg/intest/hippo3.yaml b/vppcfg/intest/hippo3.yaml index ddcce4b..b934e27 100644 --- a/vppcfg/intest/hippo3.yaml +++ b/vppcfg/intest/hippo3.yaml @@ -11,9 +11,9 @@ interfaces: GigabitEthernet3/0/1: mtu: 9000 description: LAG - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 2500 - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: description: Not Used BondEthernet1: @@ -47,5 +47,5 @@ bridgedomains: bd10: description: "Bridge Domain 10" mtu: 2500 - interfaces: [ BondEthernet1.203, HundredGigabitEthernet12/0/0 ] + interfaces: [ BondEthernet1.203, HundredGigabitEthernet13/0/0 ] diff --git a/vppcfg/intest/hippo4.yaml b/vppcfg/intest/hippo4.yaml index 9a0b2f9..489c2ea 100644 --- a/vppcfg/intest/hippo4.yaml +++ b/vppcfg/intest/hippo4.yaml @@ -5,10 +5,10 @@ interfaces: sub-interfaces: 100: mtu: 2000 - l2xc: HundredGigabitEthernet12/0/1.100 + l2xc: HundredGigabitEthernet13/0/1.100 GigabitEthernet3/0/1: description: Not Used - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 9216 sub-interfaces: 100: @@ -19,7 +19,7 @@ interfaces: dot1q: 100 inner-dot1q: 200 exact-match: True - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 9216 sub-interfaces: 100: @@ -30,5 +30,5 @@ bridgedomains: bd10: description: "Bridge Domain 10" mtu: 2000 - interfaces: [ HundredGigabitEthernet12/0/0.101 ] + interfaces: [ HundredGigabitEthernet13/0/0.101 ] diff --git a/vppcfg/intest/hippo5.yaml b/vppcfg/intest/hippo5.yaml index 7aa03cc..f255f15 100644 --- a/vppcfg/intest/hippo5.yaml +++ b/vppcfg/intest/hippo5.yaml @@ -11,7 +11,7 @@ interfaces: GigabitEthernet3/0/1: lcp: "e3-0-1" addresses: [ 10.0.0.1/24 ] - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 9216 sub-interfaces: 100: @@ -22,7 +22,7 @@ interfaces: dot1q: 100 inner-dot1q: 200 exact-match: True - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 9216 vxlan_tunnel0: mtu: 2000 @@ -34,7 +34,7 @@ bridgedomains: bd10: description: "Bridge Domain 10" mtu: 2000 - interfaces: [ HundredGigabitEthernet12/0/0.101 ] + interfaces: [ HundredGigabitEthernet13/0/0.101 ] vxlan_tunnels: vxlan_tunnel0: diff --git a/vppcfg/intest/hippo6.yaml b/vppcfg/intest/hippo6.yaml index f345218..e3af0e4 100644 --- a/vppcfg/intest/hippo6.yaml +++ b/vppcfg/intest/hippo6.yaml @@ -10,7 +10,7 @@ interfaces: GigabitEthernet3/0/1: lcp: "e3-0-1" addresses: [ 10.0.0.1/24 ] - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 9216 sub-interfaces: 100: @@ -21,7 +21,7 @@ interfaces: dot1q: 100 inner-dot1q: 200 exact-match: True - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 9216 vxlan_tunnel0: mtu: 2000 @@ -33,7 +33,7 @@ bridgedomains: bd10: description: "Bridge Domain 10" mtu: 3000 - interfaces: [ HundredGigabitEthernet12/0/0.101, GigabitEthernet3/0/0.101, vxlan_tunnel1 ] + interfaces: [ HundredGigabitEthernet13/0/0.101, GigabitEthernet3/0/0.101, vxlan_tunnel1 ] vxlan_tunnels: vxlan_tunnel0: diff --git a/vppcfg/intest/hippo7.yaml b/vppcfg/intest/hippo7.yaml index db363e7..c3e8a06 100644 --- a/vppcfg/intest/hippo7.yaml +++ b/vppcfg/intest/hippo7.yaml @@ -10,7 +10,7 @@ interfaces: mtu: 3000 GigabitEthernet3/0/1: description: Not Used - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 9216 sub-interfaces: 100: @@ -21,7 +21,7 @@ interfaces: dot1q: 100 inner-dot1q: 200 exact-match: True - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 9216 vxlan_tunnel0: mtu: 2000 @@ -33,7 +33,7 @@ bridgedomains: bd10: description: "Bridge Domain 10" mtu: 3000 - interfaces: [ HundredGigabitEthernet12/0/0.101, GigabitEthernet3/0/0.101, vxlan_tunnel1 ] + interfaces: [ HundredGigabitEthernet13/0/0.101, GigabitEthernet3/0/0.101, vxlan_tunnel1 ] vxlan_tunnels: vxlan_tunnel0: diff --git a/vppcfg/intest/hippo8.yaml b/vppcfg/intest/hippo8.yaml index 92bce2d..d2bfc61 100644 --- a/vppcfg/intest/hippo8.yaml +++ b/vppcfg/intest/hippo8.yaml @@ -9,7 +9,7 @@ interfaces: mtu: 3000 GigabitEthernet3/0/1: description: Not Used - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mtu: 9216 sub-interfaces: 100: @@ -20,13 +20,13 @@ interfaces: dot1q: 100 inner-dot1q: 200 exact-match: True - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: mtu: 9216 sub-interfaces: 100: - l2xc: HundredGigabitEthernet12/0/1.101 + l2xc: HundredGigabitEthernet13/0/1.101 101: - l2xc: HundredGigabitEthernet12/0/1.100 + l2xc: HundredGigabitEthernet13/0/1.100 vxlan_tunnel10: mtu: 2000 l2xc: GigabitEthernet3/0/0.100 @@ -53,7 +53,7 @@ bridgedomains: bd11: description: "Bridge Domain 11" mtu: 3000 - interfaces: [ HundredGigabitEthernet12/0/0.101, GigabitEthernet3/0/0.101, vxlan_tunnel11 ] + interfaces: [ HundredGigabitEthernet13/0/0.101, GigabitEthernet3/0/0.101, vxlan_tunnel11 ] bvi: loop11 vxlan_tunnels: diff --git a/vppcfg/intest/hippo9.yaml b/vppcfg/intest/hippo9.yaml index 0200740..beab0ae 100644 --- a/vppcfg/intest/hippo9.yaml +++ b/vppcfg/intest/hippo9.yaml @@ -11,11 +11,11 @@ interfaces: mtu: 9000 description: "LAG #2" - HundredGigabitEthernet12/0/0: + HundredGigabitEthernet13/0/0: mac: 02:ff:ba:12:00:00 lcp: "ice0" - HundredGigabitEthernet12/0/1: + HundredGigabitEthernet13/0/1: lcp: "ice1" mtu: 9000 addresses: [ 192.0.2.17/30, 2001:db8:3::1/64 ]