on FRR, distribute static/connected in OSPF; and disable OSPF/OSPFv3 on vpp0.e0 and vpp3.e1 respectively

2023-10-22 22:05:17 +00:00
parent 5d359744cf
commit e982fc72d0
13 changed files with 56 additions and 27 deletions
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/frr/frr.conf
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/frr/frr.conf
@ -7,10 +7,6 @@ service integrated-vtysh-config
 ip router-id 192.168.10.0
 !
 interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
 mpls enable
 exit
 !
@ -30,9 +26,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/frr/frr.conf
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/frr/frr.conf
@ -30,9 +30,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/frr/frr.conf
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/frr/frr.conf
@ -30,9 +30,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/frr/frr.conf
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/frr/frr.conf
@ -15,11 +15,6 @@ interface e0
 exit
 !
 interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
 exit
 !
 interface loop0
@ -30,9 +25,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/frr/frr.conf
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/frr/frr.conf
@ -7,10 +7,6 @@ service integrated-vtysh-config
 ip router-id 192.168.11.0
 !
 interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
 mpls enable
 exit
 !
@ -30,9 +26,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/frr/frr.conf
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/frr/frr.conf
@ -30,9 +30,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/frr/frr.conf
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/frr/frr.conf
@ -30,9 +30,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/frr/frr.conf
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/frr/frr.conf
@ -15,11 +15,6 @@ interface e0
 exit
 !
 interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
 exit
 !
 interface loop0
@ -30,9 +25,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/frr.conf
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/frr.conf
@ -7,10 +7,6 @@ service integrated-vtysh-config
 ip router-id 192.168.12.0
 !
 interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
 mpls enable
 exit
 !
@ -30,9 +26,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/frr/frr.conf
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/frr/frr.conf
@ -30,9 +30,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/frr/frr.conf
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/frr/frr.conf
@ -30,9 +30,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/frr.conf
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/frr.conf
@ -15,11 +15,6 @@ interface e0
 exit
 !
 interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
 exit
 !
 interface loop0
@ -30,9 +25,13 @@ interface loop0
 exit
 !
 router ospf
+ distribute connected
+ disrtibute static
 exit
 !
 router ospf6
+ distribute connected
+ disrtibute static
 exit
 !
 mpls ldp