From ac9d01365a9fd41003b4b8427348a3c3102341f5 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Wed, 25 May 2022 11:01:48 -0500
Subject: configtest: T4382: no migration to 'bgp local-as' under vrf
The migration script bgp/0-to-1 did not address
'protocols bgp ASN' -> 'protocols bgp local-as ASN'
under a vrf. Move to configs.no-load for review on extending/adding a
migration script.
---
smoketest/configs.no-load/vrf-bgp | 166 ++++++++++++++++++++++++++++++++++++++
smoketest/configs/vrf-bgp | 166 --------------------------------------
2 files changed, 166 insertions(+), 166 deletions(-)
create mode 100644 smoketest/configs.no-load/vrf-bgp
delete mode 100644 smoketest/configs/vrf-bgp
diff --git a/smoketest/configs.no-load/vrf-bgp b/smoketest/configs.no-load/vrf-bgp
new file mode 100644
index 000000000..4ad372a36
--- /dev/null
+++ b/smoketest/configs.no-load/vrf-bgp
@@ -0,0 +1,166 @@
+interfaces {
+ ethernet eth0 {
+ address 192.0.2.1/24
+ }
+ ethernet eth1 {
+ vrf black
+ }
+ ethernet eth2 {
+ vrf black
+ }
+}
+protocols {
+ ospf {
+ area 0 {
+ network 192.0.2.0/24
+ }
+ interface eth0 {
+ authentication {
+ md5 {
+ key-id 10 {
+ md5-key ospfkey
+ }
+ }
+ }
+ }
+ log-adjacency-changes {
+ }
+ parameters {
+ abr-type cisco
+ router-id 1.2.3.4
+ }
+ passive-interface default
+ passive-interface-exclude eth0
+ }
+}
+system {
+ config-management {
+ commit-revisions 100
+ }
+ console {
+ device ttyS0 {
+ speed 115200
+ }
+ }
+ host-name vyos
+ login {
+ user vyos {
+ authentication {
+ encrypted-password $6$O5gJRlDYQpj$MtrCV9lxMnZPMbcxlU7.FI793MImNHznxGoMFgm3Q6QP3vfKJyOSRCt3Ka/GzFQyW1yZS4NS616NLHaIPPFHc0
+ plaintext-password ""
+ }
+ }
+ }
+ nt
+ ntp {
+ server 0.pool.ntp.org {
+ }
+ server 1.pool.ntp.org {
+ }
+ server 2.pool.ntp.org {
+ }
+ }
+ syslog {
+ global {
+ facility all {
+ level info
+ }
+ facility protocols {
+ level debug
+ }
+ }
+ }
+ time-zone Europe/Berlin
+}
+vrf {
+ name black {
+ protocols {
+ bgp 65000 {
+ address-family {
+ ipv4-unicast {
+ network 10.0.150.0/23 {
+ }
+ }
+ ipv6-unicast {
+ network 2001:db8:200::/40 {
+ }
+ }
+ }
+ neighbor 10.0.151.222 {
+ disable-send-community {
+ extended
+ standard
+ }
+ address-family {
+ ipv4-unicast {
+ default-originate {
+ }
+ soft-reconfiguration {
+ inbound
+ }
+ }
+ }
+ capability {
+ dynamic
+ }
+ remote-as 65010
+ }
+ neighbor 10.0.151.252 {
+ peer-group VYOSv4
+ }
+ neighbor 10.0.151.254 {
+ peer-group VYOSv4
+ }
+ neighbor 2001:db8:200:ffff::3 {
+ peer-group VYOSv6
+ }
+ neighbor 2001:db8:200:ffff::a {
+ peer-group VYOSv6
+ }
+ neighbor 2001:db8:200:ff::101:2 {
+ remote-as 65010
+ }
+ parameters {
+ default {
+ no-ipv4-unicast
+ }
+ log-neighbor-changes
+ router-id 10.0.151.251
+ }
+ peer-group VYOSv4 {
+ address-family {
+ ipv4-unicast {
+ nexthop-self {
+ }
+ }
+ }
+ capability {
+ dynamic
+ }
+ remote-as 65000
+ update-source dum0
+ }
+ peer-group VYOSv6 {
+ address-family {
+ ipv6-unicast {
+ nexthop-self {
+ }
+ }
+ }
+ capability {
+ dynamic
+ }
+ remote-as 65000
+ update-source dum0
+ }
+ }
+
+ }
+ table 2000
+ }
+}
+
+
+// Warning: Do not remove the following line.
+// vyos-config-version: "broadcast-relay@1:cluster@1:config-management@1:conntrack@2:conntrack-sync@1:dhcp-relay@2:dhcp-server@5:dhcpv6-server@1:dns-forwarding@3:firewall@5:https@2:interfaces@20:ipoe-server@1:ipsec@5:l2tp@3:lldp@1:mdns@1:nat@5:nat66@1:ntp@1:pppoe-server@5:pptp@2:qos@1:quagga@9:rpki@1:salt@1:snmp@2:ssh@2:sstp@3:system@20:vrf@2:vrrp@2:vyos-accel-ppp@2:wanloadbalance@3:webproxy@2:zone-policy@1"
+// Release version: 1.4-rolling-202103130218
diff --git a/smoketest/configs/vrf-bgp b/smoketest/configs/vrf-bgp
deleted file mode 100644
index 4ad372a36..000000000
--- a/smoketest/configs/vrf-bgp
+++ /dev/null
@@ -1,166 +0,0 @@
-interfaces {
- ethernet eth0 {
- address 192.0.2.1/24
- }
- ethernet eth1 {
- vrf black
- }
- ethernet eth2 {
- vrf black
- }
-}
-protocols {
- ospf {
- area 0 {
- network 192.0.2.0/24
- }
- interface eth0 {
- authentication {
- md5 {
- key-id 10 {
- md5-key ospfkey
- }
- }
- }
- }
- log-adjacency-changes {
- }
- parameters {
- abr-type cisco
- router-id 1.2.3.4
- }
- passive-interface default
- passive-interface-exclude eth0
- }
-}
-system {
- config-management {
- commit-revisions 100
- }
- console {
- device ttyS0 {
- speed 115200
- }
- }
- host-name vyos
- login {
- user vyos {
- authentication {
- encrypted-password $6$O5gJRlDYQpj$MtrCV9lxMnZPMbcxlU7.FI793MImNHznxGoMFgm3Q6QP3vfKJyOSRCt3Ka/GzFQyW1yZS4NS616NLHaIPPFHc0
- plaintext-password ""
- }
- }
- }
- nt
- ntp {
- server 0.pool.ntp.org {
- }
- server 1.pool.ntp.org {
- }
- server 2.pool.ntp.org {
- }
- }
- syslog {
- global {
- facility all {
- level info
- }
- facility protocols {
- level debug
- }
- }
- }
- time-zone Europe/Berlin
-}
-vrf {
- name black {
- protocols {
- bgp 65000 {
- address-family {
- ipv4-unicast {
- network 10.0.150.0/23 {
- }
- }
- ipv6-unicast {
- network 2001:db8:200::/40 {
- }
- }
- }
- neighbor 10.0.151.222 {
- disable-send-community {
- extended
- standard
- }
- address-family {
- ipv4-unicast {
- default-originate {
- }
- soft-reconfiguration {
- inbound
- }
- }
- }
- capability {
- dynamic
- }
- remote-as 65010
- }
- neighbor 10.0.151.252 {
- peer-group VYOSv4
- }
- neighbor 10.0.151.254 {
- peer-group VYOSv4
- }
- neighbor 2001:db8:200:ffff::3 {
- peer-group VYOSv6
- }
- neighbor 2001:db8:200:ffff::a {
- peer-group VYOSv6
- }
- neighbor 2001:db8:200:ff::101:2 {
- remote-as 65010
- }
- parameters {
- default {
- no-ipv4-unicast
- }
- log-neighbor-changes
- router-id 10.0.151.251
- }
- peer-group VYOSv4 {
- address-family {
- ipv4-unicast {
- nexthop-self {
- }
- }
- }
- capability {
- dynamic
- }
- remote-as 65000
- update-source dum0
- }
- peer-group VYOSv6 {
- address-family {
- ipv6-unicast {
- nexthop-self {
- }
- }
- }
- capability {
- dynamic
- }
- remote-as 65000
- update-source dum0
- }
- }
-
- }
- table 2000
- }
-}
-
-
-// Warning: Do not remove the following line.
-// vyos-config-version: "broadcast-relay@1:cluster@1:config-management@1:conntrack@2:conntrack-sync@1:dhcp-relay@2:dhcp-server@5:dhcpv6-server@1:dns-forwarding@3:firewall@5:https@2:interfaces@20:ipoe-server@1:ipsec@5:l2tp@3:lldp@1:mdns@1:nat@5:nat66@1:ntp@1:pppoe-server@5:pptp@2:qos@1:quagga@9:rpki@1:salt@1:snmp@2:ssh@2:sstp@3:system@20:vrf@2:vrrp@2:vyos-accel-ppp@2:wanloadbalance@3:webproxy@2:zone-policy@1"
-// Release version: 1.4-rolling-202103130218
--
cgit v1.2.3