Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade IOS-XRv version to 6.0.1 #30

Merged
merged 3 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions containerlab/frinx_topo_1/config_r1_cpe1.partial.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
!
interface GigabitEthernet0/0/0/2
interface GigabitEthernet0/0/0/0
ipv4 address 172.16.10.10 255.255.255.0
no shutdown
!
interface Loopback0
ipv4 address 192.168.10.1 255.255.255.128
no shutdown
!
interface Loopback1
ipv4 address 192.168.10.129 255.255.255.128
no shutdown
!
router static
address-family ipv4 unicast
0.0.0.0/0 172.16.10.1
!
!
lldp
!
7 changes: 5 additions & 2 deletions containerlab/frinx_topo_1/config_r1_cpe2.partial.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
!
interface GigabitEthernet0/0/0/2
interface GigabitEthernet0/0/0/0
ipv4 address 172.16.20.10 255.255.255.0
no shutdown
!
interface Loopback0
ipv4 address 192.168.20.1 255.255.255.128
no shutdown
!
interface Loopback1
ipv4 address 192.168.20.129 255.255.255.128
no shutdown
!
router static
address-family ipv4 unicast
0.0.0.0/0 172.16.20.1
!
!
lldp
!
7 changes: 5 additions & 2 deletions containerlab/frinx_topo_1/config_r2_cpe1.partial.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
!
interface GigabitEthernet0/0/0/2
interface GigabitEthernet0/0/0/0
ipv4 address 172.16.30.10 255.255.255.0
no shutdown
!
interface Loopback0
ipv4 address 192.168.30.1 255.255.255.128
no shutdown
!
interface Loopback1
ipv4 address 192.168.30.129 255.255.255.128
no shutdown
!
router static
address-family ipv4 unicast
0.0.0.0/0 172.16.30.1
!
!
lldp
!
7 changes: 5 additions & 2 deletions containerlab/frinx_topo_1/config_r2_cpe2.partial.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
!
interface GigabitEthernet0/0/0/2
interface GigabitEthernet0/0/0/0
ipv4 address 172.16.40.10 255.255.255.0
no shutdown
!
interface Loopback0
ipv4 address 192.168.40.1 255.255.255.128
no shutdown
!
interface Loopback1
ipv4 address 192.168.40.129 255.255.255.128
no shutdown
!
router static
address-family ipv4 unicast
0.0.0.0/0 172.16.40.1
!
!
lldp
!
19 changes: 9 additions & 10 deletions containerlab/frinx_topo_1/frinx_topo_1.clab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ topology:
vars:
isis_iid: 1
nodes:

# PTP & SyncE GMs
PTP_GM:
mgmt-ipv4: 172.20.20.9
Expand Down Expand Up @@ -48,32 +47,32 @@ topology:
startup-config: config_r2_pe2.partial.txt

R1_CPE1:
image: vrnetlab/vr-xrv9k:5.3.4
kind: cisco_xrv9k
image: vrnetlab/vr-xrv:6.0.1
kind: cisco_xrv
mgmt-ipv4: 172.20.20.202
startup-config: config_r1_cpe1.partial.txt
env:
RAM: 4096

R1_CPE2:
image: vrnetlab/vr-xrv9k:5.3.4
kind: cisco_xrv9k
image: vrnetlab/vr-xrv:6.0.1
kind: cisco_xrv
mgmt-ipv4: 172.20.20.203
startup-config: config_r1_cpe2.partial.txt
env:
RAM: 4096

R2_CPE1:
image: vrnetlab/vr-xrv9k:5.3.4
kind: cisco_xrv9k
image: vrnetlab/vr-xrv:6.0.1
kind: cisco_xrv
mgmt-ipv4: 172.20.20.204
startup-config: config_r2_cpe1.partial.txt
env:
RAM: 4096

R2_CPE2:
image: vrnetlab/vr-xrv9k:5.3.4
kind: cisco_xrv9k
image: vrnetlab/vr-xrv:6.0.1
kind: cisco_xrv
mgmt-ipv4: 172.20.20.205
startup-config: config_r2_cpe2.partial.txt
env:
Expand Down Expand Up @@ -109,7 +108,7 @@ topology:
- endpoints: [PTP_GM:eth1, C1:eth5]
- endpoints: [PTP_GM_BACKUP:eth1, C2:eth5]

# openswitch to Region 1 and 2
# openvswitch to Region 1 and 2
- endpoints: [R1_OLT:ovsp1, R1_CPE1:eth1]
- endpoints: [R1_OLT:ovsp2, R1_CPE2:eth1]
- endpoints: [R2_CMTS:ovsp4, R2_CPE1:eth1]
Expand Down
4 changes: 4 additions & 0 deletions containerlab/openswitch1.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

# remove existing bridges
ovs-vsctl del-br R1_OLT
ovs-vsctl del-br R2_CMTS

# adding two bridges
ovs-vsctl add-br R1_OLT
ovs-vsctl add-br R2_CMTS
12 changes: 10 additions & 2 deletions containerlab/openswitch2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ ovs-vsctl set interface ovsp5 lldp:enable=true
# port from R2_CMTS to R2_PE1
ovs-vsctl set interface ovsp6 lldp:enable=true

# delete mappings
ovs-vsctl del-aa-mapping R1_OLT 1 1
ovs-vsctl del-aa-mapping R2_CMTS 2 2

# add mapping to bridges
ovs-vsctl add-aa-mapping R1_OLT 0 0
ovs-vsctl add-aa-mapping R2_CMTS 0 0
ovs-vsctl add-aa-mapping R1_OLT 1 1
ovs-vsctl add-aa-mapping R2_CMTS 2 2

# add name visible in LLDP table
ovs-vsctl set AutoAttach R1_OLT system_name="R1_OLT"
Expand Down Expand Up @@ -53,3 +57,7 @@ ovs-vsctl set port ovsp6 trunks=10,20

ovs-vsctl set port ovsp3 vlan_mode=trunk
ovs-vsctl set port ovsp6 vlan_mode=trunk

# clear automatically created trunk ports
sudo ovs-vsctl clear port R2_CMTS trunks
sudo ovs-vsctl clear port R1_OLT trunks
Loading