diff --git a/containerlab/frinx_topo_1/config_c1.partial.txt b/containerlab/frinx_topo_1/config_c1.partial.txt index 31577ab..2778f30 100644 --- a/containerlab/frinx_topo_1/config_c1.partial.txt +++ b/containerlab/frinx_topo_1/config_c1.partial.txt @@ -132,7 +132,7 @@ configure { interface "system" { ipv4 { primary { - address 1.1.1.11 + address 1.1.1.1 prefix-length 32 } } @@ -142,8 +142,8 @@ configure { port 1/1/c1/1 ipv4 { primary { - address 30.30.30.11 - prefix-length 24 + address 10.10.0.0 + prefix-length 31 } } } @@ -152,8 +152,8 @@ configure { port 1/1/c3/1 ipv4 { primary { - address 20.20.20.11 - prefix-length 24 + address 10.20.0.0 + prefix-length 31 } } } @@ -162,23 +162,53 @@ configure { port 1/1/c4/1 ipv4 { primary { - address 40.40.40.11 - prefix-length 24 + address 10.20.0.4 + prefix-length 31 } } } - interface "to-dc1_pe1" { + interface "to-dc1-pe1" { admin-state enable port 1/1/c2/1 ipv4 { primary { - address 10.10.10.11 - prefix-length 24 + address 10.20.0.8 + prefix-length 31 + } + } + } + ldp { + admin-state enable + interface-parameters { + interface "to-c2" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-r1-pe1" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-r2-pe1" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-dc1-pe1" { + admin-state enable + ipv4 { + admin-state enable + } } } } ospf 0 { admin-state enable + router-id 1.1.1.1 area 0.0.0.0 { interface "system" { admin-state enable @@ -192,7 +222,7 @@ configure { interface "to-r2-pe1" { admin-state enable } - interface "to-dc1_pe1" { + interface "to-dc1-pe1" { admin-state enable } } diff --git a/containerlab/frinx_topo_1/config_c2.partial.txt b/containerlab/frinx_topo_1/config_c2.partial.txt index 5934f79..c2c7328 100644 --- a/containerlab/frinx_topo_1/config_c2.partial.txt +++ b/containerlab/frinx_topo_1/config_c2.partial.txt @@ -133,7 +133,7 @@ configure { interface "system" { ipv4 { primary { - address 1.1.1.12 + address 2.2.2.2 prefix-length 32 } } @@ -143,8 +143,8 @@ configure { port 1/1/c1/1 ipv4 { primary { - address 30.30.30.12 - prefix-length 24 + address 10.10.0.1 + prefix-length 31 } } } @@ -153,33 +153,63 @@ configure { port 1/1/c3/1 ipv4 { primary { - address 40.40.40.12 - prefix-length 24 + address 10.20.0.2 + prefix-length 31 } } } - interface "to-r2_pe2" { + interface "to-r2-pe2" { admin-state enable port 1/1/c4/1 ipv4 { primary { - address 10.10.10.12 - prefix-length 24 + address 10.20.0.6 + prefix-length 31 } } } - interface "to-dc1_pe1" { + interface "to-dc1-pe1" { admin-state enable port 1/1/c2/1 ipv4 { primary { - address 20.20.20.12 - prefix-length 24 + address 10.20.0.10 + prefix-length 31 + } + } + } + ldp { + admin-state enable + interface-parameters { + interface "to-c1" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-r1-pe2" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-r2-pe2" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-dc1-pe1" { + admin-state enable + ipv4 { + admin-state enable + } } } } ospf 0 { admin-state enable + router-id 2.2.2.2 area 0.0.0.0 { interface "system" { admin-state enable @@ -190,10 +220,10 @@ configure { interface "to-r1-pe2" { admin-state enable } - interface "to-r2_pe2" { + interface "to-r2-pe2" { admin-state enable } - interface "to-dc1_pe1" { + interface "to-dc1-pe1" { admin-state enable } } diff --git a/containerlab/frinx_topo_1/config_dc1_pe1.partial.txt b/containerlab/frinx_topo_1/config_dc1_pe1.partial.txt index e6c6aca..6cae156 100644 --- a/containerlab/frinx_topo_1/config_dc1_pe1.partial.txt +++ b/containerlab/frinx_topo_1/config_dc1_pe1.partial.txt @@ -132,7 +132,7 @@ configure { interface "system" { ipv4 { primary { - address 1.1.1.93 + address 7.7.7.7 prefix-length 32 } } @@ -142,8 +142,8 @@ configure { port 1/1/c1/1 ipv4 { primary { - address 10.10.10.93 - prefix-length 24 + address 10.20.0.9 + prefix-length 31 } } } @@ -152,13 +152,31 @@ configure { port 1/1/c2/1 ipv4 { primary { - address 20.20.20.93 - prefix-length 24 + address 10.20.0.11 + prefix-length 31 + } + } + } + ldp { + admin-state enable + interface-parameters { + interface "to-c1" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-c2" { + admin-state enable + ipv4 { + admin-state enable + } } } } ospf 0 { admin-state enable + router-id 7.7.7.7 area 0.0.0.0 { interface "system" { admin-state enable diff --git a/containerlab/frinx_topo_1/config_r1_pe1.partial.txt b/containerlab/frinx_topo_1/config_r1_pe1.partial.txt index af5b4bb..3f15961 100644 --- a/containerlab/frinx_topo_1/config_r1_pe1.partial.txt +++ b/containerlab/frinx_topo_1/config_r1_pe1.partial.txt @@ -132,7 +132,7 @@ configure { interface "system" { ipv4 { primary { - address 1.1.1.111 + address 3.3.3.3 prefix-length 32 } } @@ -142,8 +142,8 @@ configure { port 1/1/c2/1 ipv4 { primary { - address 20.20.20.111 - prefix-length 24 + address 10.20.0.1 + prefix-length 31 } } } @@ -152,13 +152,41 @@ configure { port 1/1/c1/1 ipv4 { primary { - address 10.10.10.111 - prefix-length 24 + address 10.30.0.0 + prefix-length 31 + } + } + } + interface "to-bts" { + admin-state enable + port 1/1/c3/1 + ipv4 { + primary { + address 120.0.0.1 + prefix-length 16 + } + } + } + ldp { + admin-state enable + interface-parameters { + interface "to-c1" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-r1-pe2" { + admin-state enable + ipv4 { + admin-state enable + } } } } ospf 0 { admin-state enable + router-id 3.3.3.3 area 0.0.0.0 { interface "system" { admin-state enable @@ -199,7 +227,7 @@ configure { central-frequency-clock { ref1 { admin-state enable - source-port 1/1/c1/1 + source-port 1/1/c2/1 } } diff --git a/containerlab/frinx_topo_1/config_r1_pe2.partial.txt b/containerlab/frinx_topo_1/config_r1_pe2.partial.txt index 09a2226..d0051bc 100644 --- a/containerlab/frinx_topo_1/config_r1_pe2.partial.txt +++ b/containerlab/frinx_topo_1/config_r1_pe2.partial.txt @@ -132,7 +132,7 @@ configure { interface "system" { ipv4 { primary { - address 1.1.1.112 + address 4.4.4.4 prefix-length 32 } } @@ -142,8 +142,8 @@ configure { port 1/1/c2/1 ipv4 { primary { - address 40.40.40.112 - prefix-length 24 + address 10.20.0.3 + prefix-length 31 } } } @@ -152,13 +152,31 @@ configure { port 1/1/c1/1 ipv4 { primary { - address 10.10.10.112 - prefix-length 24 + address 10.30.0.1 + prefix-length 31 + } + } + } + ldp { + admin-state enable + interface-parameters { + interface "to-c2" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-r1-pe1" { + admin-state enable + ipv4 { + admin-state enable + } } } } ospf 0 { admin-state enable + router-id 4.4.4.4 area 0.0.0.0 { interface "system" { admin-state enable @@ -199,7 +217,7 @@ configure { central-frequency-clock { ref1 { admin-state enable - source-port 1/1/c1/1 + source-port 1/1/c2/1 } } diff --git a/containerlab/frinx_topo_1/config_r2_pe1.partial.txt b/containerlab/frinx_topo_1/config_r2_pe1.partial.txt index 621d7a2..bb9272f 100644 --- a/containerlab/frinx_topo_1/config_r2_pe1.partial.txt +++ b/containerlab/frinx_topo_1/config_r2_pe1.partial.txt @@ -132,33 +132,51 @@ configure { interface "system" { ipv4 { primary { - address 1.1.1.121 + address 5.5.5.5 prefix-length 32 } } } interface "to-c1" { admin-state enable - port 1/1/c1/1 + port 1/1/c2/1 ipv4 { primary { - address 20.20.20.121 - prefix-length 24 + address 10.20.0.5 + prefix-length 31 } } } interface "to-r2-pe2" { admin-state enable - port 1/1/c2/1 + port 1/1/c1/1 ipv4 { primary { - address 40.40.40.121 - prefix-length 24 + address 10.30.0.2 + prefix-length 31 + } + } + } + ldp { + admin-state enable + interface-parameters { + interface "to-c1" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-r2-pe2" { + admin-state enable + ipv4 { + admin-state enable + } } } } ospf 0 { admin-state enable + router-id 5.5.5.5 area 0.0.0.0 { interface "system" { admin-state enable @@ -199,7 +217,7 @@ configure { central-frequency-clock { ref1 { admin-state enable - source-port 1/1/c1/1 + source-port 1/1/c2/1 } } diff --git a/containerlab/frinx_topo_1/config_r2_pe2.partial.txt b/containerlab/frinx_topo_1/config_r2_pe2.partial.txt index 2ada183..8feb6b0 100644 --- a/containerlab/frinx_topo_1/config_r2_pe2.partial.txt +++ b/containerlab/frinx_topo_1/config_r2_pe2.partial.txt @@ -132,7 +132,7 @@ configure { interface "system" { ipv4 { primary { - address 1.1.1.122 + address 6.6.6.6 prefix-length 32 } } @@ -142,8 +142,8 @@ configure { port 1/1/c2/1 ipv4 { primary { - address 10.10.10.122 - prefix-length 24 + address 10.20.0.7 + prefix-length 31 } } } @@ -152,13 +152,31 @@ configure { port 1/1/c1/1 ipv4 { primary { - address 20.20.20.122 - prefix-length 24 + address 10.30.0.3 + prefix-length 31 + } + } + } + ldp { + admin-state enable + interface-parameters { + interface "to-c2" { + admin-state enable + ipv4 { + admin-state enable + } + } + interface "to-r2-pe1" { + admin-state enable + ipv4 { + admin-state enable + } } } } ospf 0 { admin-state enable + router-id 6.6.6.6 area 0.0.0.0 { interface "system" { admin-state enable @@ -199,7 +217,7 @@ configure { central-frequency-clock { ref1 { admin-state enable - source-port 1/1/c1/1 + source-port 1/1/c2/1 } } diff --git a/containerlab/frinx_topo_1/frinx_topo_1.yml b/containerlab/frinx_topo_1/frinx_topo_1.yml index fd3886b..e14c4d0 100644 --- a/containerlab/frinx_topo_1/frinx_topo_1.yml +++ b/containerlab/frinx_topo_1/frinx_topo_1.yml @@ -17,7 +17,7 @@ topology: PTP_GM_BACKUP: mgmt-ipv4: 172.20.20.8 startup-config: config_ptp_gm_backup.partial.txt - + # core routers C1: mgmt-ipv4: 172.20.20.11 @@ -46,8 +46,8 @@ topology: R2_PE2: mgmt-ipv4: 172.20.20.122 startup-config: config_r2_pe2.partial.txt - - # BTS + + # BTS BTS: image: bts kind: linux @@ -70,7 +70,5 @@ topology: # PTP grandmaster to core routers - endpoints: [PTP_GM:eth1, C1:eth5] - endpoints: [PTP_GM_BACKUP:eth1, C2:eth5] - # BTS + # BTS - endpoints: ["BTS:eth1", "R1_PE1:eth3"] - - diff --git a/containerlab/frinx_topo_1/region1Pe1.partial.txt b/containerlab/frinx_topo_1/region1Pe1.partial.txt deleted file mode 100644 index 57dab59..0000000 --- a/containerlab/frinx_topo_1/region1Pe1.partial.txt +++ /dev/null @@ -1,224 +0,0 @@ -configure { - card 1 { - mda 1 { - sync-e true - } - } - port 1/1/c1 { - admin-state enable - connector { - breakout c4-10g - } - } - - port 1/1/c2 { - admin-state enable - connector { - breakout c4-10g - } - } - - port 1/1/c3 { - admin-state enable - connector { - breakout c4-10g - } - } - - port 1/1/c4 { - admin-state enable - connector { - breakout c4-10g - } - } - - port 1/1/c5 { - admin-state enable - connector { - breakout c4-10g - } - } - - port 1/1/c1/1 { - admin-state enable - ethernet { - lldp { - dest-mac nearest-bridge { - receive true - transmit true - tx-tlvs { - port-desc true - sys-name true - sys-desc true - sys-cap true - } - } - } - } - } - - port 1/1/c2/1 { - admin-state enable - ethernet { - lldp { - dest-mac nearest-bridge { - receive true - transmit true - tx-tlvs { - port-desc true - sys-name true - sys-desc true - sys-cap true - } - } - } - } - } - - port 1/1/c3/1 { - admin-state enable - ethernet { - lldp { - dest-mac nearest-bridge { - receive true - transmit true - tx-tlvs { - port-desc true - sys-name true - sys-desc true - sys-cap true - } - } - } - } - } - port 1/1/c4/1 { - admin-state enable - ethernet { - lldp { - dest-mac nearest-bridge { - receive true - transmit true - tx-tlvs { - port-desc true - sys-name true - sys-desc true - sys-cap true - } - } - } - } - } - - port 1/1/c5/1 { - admin-state enable - ethernet { - lldp { - dest-mac nearest-bridge { - receive true - transmit true - tx-tlvs { - port-desc true - sys-name true - sys-desc true - sys-cap true - } - } - } - } - } - - # router "Base" { - # interface "core2/1" { - # port 1/1/c1/1 - # ipv4 { - # primary { - # address 1.1.1.10 - # prefix-length 24 - # } - # } - # } - # } - - system { - ptp { - admin-state enable - clock-type boundary - profile ieee1588-2008 - port 1/1/c1/1 { - admin-state enable - } - port 1/1/c2/1 { - admin-state enable - } - port 1/1/c3/1 { - admin-state enable - } - port 1/1/c4/1 { - admin-state enable - } - port 1/1/c5/1 { - admin-state enable - } - } - - central-frequency-clock { - ref1 { - admin-state enable - source-port 1/1/c1/1 - } - } - - lldp { - admin-state enable - } - grpc { - admin-state enable - allow-unsecure-connection - gnmi { - admin-state enable - auto-config-save true - } - rib-api { - admin-state enable - } - } - security { - aaa { - local-profiles { - profile "grpc" { - default-action permit-all - grpc { - rpc-authorization { - gnmi-capabilities permit - gnmi-get permit - gnmi-set permit - gnmi-subscribe permit - rib-api-getversion permit - rib-api-modify permit - } - } - } - } - } - - user-params { - local-user { - user "admin" { - access { - console true - ftp true - snmp true - netconf true - grpc true - } - console { - member ["administrative" "grpc"] - } - - } - } - } - } - } -}