Skip to content
Snippets Groups Projects
Commit ca348cc0 authored by David Schmitz's avatar David Schmitz
Browse files

testing: update inst/testing/nemo1/: update: workaround for new issues with... 

testing: update inst/testing/nemo1/: update: workaround for new issues with new freertr + ubuntu24 issues
parent d3d3a129
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 440 additions and 0 deletions
inst/testing/nemo1/frnet/docker-compose/Dockerfile_FREERTR
+ 2
− 0
View file @ ca348cc0
......@@ -39,6 +39,8 @@ RUN mkdir -p /rtr && \
chmod +x /rtr/*
COPY freertr-hw-add.cfg /rtr/rtr-hw-add.txt
COPY freertr_fixup_for_nondetected_interfaces.sh /usr/local/bin/
COPY freertr.cfg /rtr/rtr-sw.txt
COPY freertr_setup_environment.sh /usr/local/bin/setup_environment.sh
......
inst/testing/nemo1/frnet/docker-compose/freertr-hw-add.cfg 0 → 100644
+ 37
− 0
View file @ ca348cc0
#hwid xxx
#proc ifc1.sh /rtr/run/conf/pcapInt.bin eth1 20002 127.0.0.1 20001 127.0.0.1
#int ether1 eth 02:42:0a:01:0a:03 127.0.0.1 20001 127.0.0.1 20002
#proc ifc2.sh /rtr/run/conf/pcapInt.bin eth2 20012 127.0.0.1 20011 127.0.0.1
#int ether2 eth 02:42:0a:02:0a:03 127.0.0.1 20011 127.0.0.1 20012
#proc ifc3.sh /rtr/run/conf/pcapInt.bin eth3 20022 127.0.0.1 20021 127.0.0.1
#int ether3 eth 02:42:0a:03:0a:03 127.0.0.1 20021 127.0.0.1 20022
#proc ifc4.sh /rtr/run/conf/pcapInt.bin eth4 20032 127.0.0.1 20031 127.0.0.1
#int ether4 eth 02:42:0a:c5:24:03 127.0.0.1 20031 127.0.0.1 20032
#proc ifc5.sh /rtr/run/conf/pcapInt.bin eth5 20042 127.0.0.1 20041 127.0.0.1
#int ether5 eth 02:42:0a:c5:25:03 127.0.0.1 20041 127.0.0.1 20042
#proc ifc6.sh /rtr/run/conf/pcapInt.bin eth6 20052 127.0.0.1 20051 127.0.0.1
#int ether6 eth 02:42:0a:c5:26:03 127.0.0.1 20051 127.0.0.1 20052
#proc ifc7.sh /rtr/run/conf/pcapInt.bin veth1 20062 127.0.0.1 20061 127.0.0.1
#int ether7 eth 02:01:01:01:01:01 127.0.0.1 20061 127.0.0.1 20062
#proc ifc8.sh /rtr/run/conf/pcapInt.bin veth2 20072 127.0.0.1 20071 127.0.0.1
#int ether8 eth 02:68:0d:e7:69:b9 127.0.0.1 20071 127.0.0.1 20072
#proc ifc255.sh /rtr/run/conf/pcapInt.bin eth0 22552 127.0.0.1 22551 127.0.0.1
#int eth255 eth 02:42:0b:0b:0b:05 127.0.0.1 22551 127.0.0.1 22552
tcp2vrf 2323 OOB 23
tcp2vrf 801 CORE 801
tcp2vrf 802 CORE2 802
#proc veth1.sh /rtr/run/conf/pcapInt.bin veth1 21002 127.0.0.1 21001 127.0.0.1
#int ether10 eth 05:42:0a:01:0a:03 127.0.0.1 21001 127.0.0.1 21002
#proc veth2.sh /rtr/run/conf/pcapInt.bin veth2 21004 127.0.0.1 21003 127.0.0.1
#int ether11 eth 06:42:0a:01:0a:03 127.0.0.1 21003 127.0.0.1 21004
inst/testing/nemo1/frnet/docker-compose/freertr-hw-working1.cfg 0 → 100644
+ 33
− 0
View file @ ca348cc0
hwid xxx
proc ifc1.sh /rtr/run/conf/pcapInt.bin eth1 20002 127.0.0.1 20001 127.0.0.1
int ether1 eth 02:42:0a:01:0a:03 127.0.0.1 20001 127.0.0.1 20002
proc ifc2.sh /rtr/run/conf/pcapInt.bin eth2 20012 127.0.0.1 20011 127.0.0.1
int ether2 eth 02:42:0a:02:0a:03 127.0.0.1 20011 127.0.0.1 20012
proc ifc3.sh /rtr/run/conf/pcapInt.bin eth3 20022 127.0.0.1 20021 127.0.0.1
int ether3 eth 02:42:0a:03:0a:03 127.0.0.1 20021 127.0.0.1 20022
proc ifc4.sh /rtr/run/conf/pcapInt.bin eth4 20032 127.0.0.1 20031 127.0.0.1
int ether4 eth 02:42:0a:c5:24:03 127.0.0.1 20031 127.0.0.1 20032
proc ifc5.sh /rtr/run/conf/pcapInt.bin eth5 20042 127.0.0.1 20041 127.0.0.1
int ether5 eth 02:42:0a:c5:25:03 127.0.0.1 20041 127.0.0.1 20042
proc ifc6.sh /rtr/run/conf/pcapInt.bin eth6 20052 127.0.0.1 20051 127.0.0.1
int ether6 eth 02:42:0a:c5:26:03 127.0.0.1 20051 127.0.0.1 20052
proc ifc7.sh /rtr/run/conf/pcapInt.bin veth1 20062 127.0.0.1 20061 127.0.0.1
int ether7 eth 02:01:01:01:01:01 127.0.0.1 20061 127.0.0.1 20062
proc ifc8.sh /rtr/run/conf/pcapInt.bin veth2 20072 127.0.0.1 20071 127.0.0.1
int ether8 eth 02:68:0d:e7:69:b9 127.0.0.1 20071 127.0.0.1 20072
proc ifc255.sh /rtr/run/conf/pcapInt.bin eth0 22552 127.0.0.1 22551 127.0.0.1
int eth255 eth 02:42:0b:0b:0b:05 127.0.0.1 22551 127.0.0.1 22552
tcp2vrf 2323 OOB 23
tcp2vrf 801 CORE 801
tcp2vrf 802 CORE2 802
#proc veth1.sh /rtr/run/conf/pcapInt.bin veth1 21002 127.0.0.1 21001 127.0.0.1
#int ether10 eth 05:42:0a:01:0a:03 127.0.0.1 21001 127.0.0.1 21002
#proc veth2.sh /rtr/run/conf/pcapInt.bin veth2 21004 127.0.0.1 21003 127.0.0.1
#int ether11 eth 06:42:0a:01:0a:03 127.0.0.1 21003 127.0.0.1 21004
inst/testing/nemo1/frnet/docker-compose/freertr-sw-working1.cfg 0 → 100644
+ 312
− 0
View file @ ca348cc0
hostname freertr
buggy
!
!
crypto rsakey rsa import $v10$TUlJRW9nSUJBQUtDQVFCNUcxQjJGd216Ly9rTDJKN0xjdTZHckxmVGdjOEJ6aHpnNHVteEhJaVFrdFZ4U2xnQmFFSDBlQmhFdlhJMzA4d2ZNaUVvcWEzNnBMdFlKN3pmK0pGekIrRWJtdDJNZUc2ZURxc3IreGhsSmMzYkozTzhvNVRjZEIxblhKbEV2T0RlOTdycTJnT0xPSjJGaFdwbVBBd3dYTStLVXMxR05iL1hWR09tQUJrMzhlNXpYMU9XU01Oa0dEUXV1MEt3WUNub2pvbXBQdnMvZktVNW13b3ZCeXk3MjNTakdOQ3BYTEQweGRnTUord1ZSQ2NkV1huejk4bUNzRVBtKzJlbTJQbDMrVWU0WnNSVFJQb1JWTHdmVWdNcnViZ21BdFE1QWJtSTdDejdWZmQzRHVpbkVuZFJLSzl0N3dWeEVpcUZkN2Z2c2pYc0hoNVQrK2hqSnJ3TVc3UWxBZ01CQUFFQ2dnRUFSVWlvRm5jRm1SR204KzBBbzVuajllNFgySXZaMXNtSTRldFBFSUVuYTdabEg4UU5adml6U3QzdDNGMlpXM0R5eFNJVHNFU3FnTXIvVnVhYytuRWxITzcwREt2amRYcHNwa1gwRFZ4QVQ1VjZHSmVRY2VvUHZyTTdJeWZwazFhUE8xLzBjbWs1UDh1cTZua3lMcnpKcUYxZ2FsMEdqTlV4SkVwbUc5RFFuSjBrbkw1Vkp4WmQzSTMvOStPZFVtOWJWM3NrdTVBTXk2YnhQOCtSOTJ5QzVFdThvTFoxMUxUVXk2TXNBb3FsalhIcWhIOVlTQ2RLaEtpenFKVEpOSVI3WVVQK0FOb0E0aWwrZXlzSFFQaS94L3dEVGdRY2czZ1N5SFpNYXNIRW51d1VCV2pGOWdYZ2R1VEVtc3VQVGdKdCtZZG4zcXJIMWkxamcxbDlGSGUxWVFLQmdRREJNNjBNUFNkL1pqZU9nQW5MUS94VlBnN2V6NnlnOENweHdsbWNwL25YbWM2TDdJa3dVUXJ0OGlMREN2clZ2dUZYVS9jell1Q2ZYVUc2MVVnNENMQldSM05LcXFuYVJSQ2hNdTBNV2JGd01wVHRHcjN3NXFlbXVtdU1VYWp5Z0pmK2Y2RFNtU01nbG5sR1E3M2FsVkx4bHl6TlE3RGVNdGd6eThyV1lhSytpUUtCZ1FDZ2VKblFuVDN2dkVhT3RzWUdKQVFYUXBFNk5ocjl0OW9TSjJ5dGMyWGpoL0pDbGhSMTBjYndnRzJ0SWhHVHE2WnQxSWNzNCtxVWxsdUxkUDBrRWRjQTErTXBKa3FLand1UE9MTjVUL1JaQ2pxSUJVL3lGR2xkeDlaN29tNGVLUFBPRDROdGZTKzdHRmdqTHB5ajFEOGFldDZ4OFJRVXV6bGRvNksycnlLQnZRS0JnUUNidmVwN2VUakR6RVJ3ek9vWVB6L0QvM2pCU0N2aXVIZWVxSXJRYStCTldxRlR6bU53M1lPditJYnBMNHF3ajJUYm5zWWhXRTIyYWRpNG9ZSE1HY1Q4YURDYU9pVWQzSnJoTjBvN3NIb0c5ZDl6bXlFT2R3RWl1QmhHVHZXZ051VlB0TmFScmZ6UklqdTAxcHJPLzV5VFA4aFAxNGRXTnlwdDVwUW1hU0psOFFLQmdFbVlCYkxPNm1EUUQrdlRsdTJxQnRaRUNTYVJPYit5V2FpSnZDV3dEc0pTenFBTEJFY2tkZ0JHWmdaSTRaYS8yZ3YwdENtNlBSTDRBZlBySzAwbmdWczVwMHh2Nnkrd2VyU3NaR0wyY0RHRnAySktUV2ZRUktKbHk4L1hwbmplZnpHNW02VFRETmpaU1ZLWlJlMDhvZFFiRlphMTRXZkFsWWFFVFZOSzdxQmhBb0dBVmIyZmduRlM1ZWJjZUx5cXY1ZHFwYU9iUVljZC9vV0FaWVJBQ1BGNGNHZHk0cE85QWV2ejd5UHN4OXB6SUNsS0hNNU9DQmtXMHNLNkt2ZHI3TUR1NFVVenR5SnNXOURMUmFuSUg4OCtaZ0hYZnk3TThyNmJzTklrVlMyQml6SExXRmVZNW5kOWt2WFZMOHNQY3dVN2dvM29VUEZlVkRFdm1ZanpsVkZFcm1NPQ==
!
crypto dsakey dsa import $v10$TUlJQnVRSUJBQUtCZ0Rxa3VCZldzSW5TdW8zMkJ1N1FIS1lrSUczQ1pnS1BvT2NXK0NqNUY5ODNXNkFmV1h3RUpMZnNPWVM0OWpKUVh2RW9HUzJHM1lOb01tQm9kM3NEbUUrZFhCQjNTbjloTWdjdGhFS3FhOWNuR054ZG5nLzdwejBQYXJUbHdmYXpxeVNwL3RHeE9FTDNrNWFBRk91MUxNbXpEY1dlTTk3cEU0c2tVTnFyRmUrckFoVUF1YVMzdi8yWGpsMDM3U3VMZWFOR21POVNqQ0VDZ1lBTjU1dHlaNi9tL05VMHdWdy95ZnM2N3QxcWJ5dkp3MHFnZWRST2RSZEYyUzlXdjZmK3VRb0hzWEZDZVJibXIxdXZtUXFINVZTVEcrUzc3cDB4SEEraVR0cm1KU0JaREZLR2lLYzJDYWVzakNPZHJ4a2NVeEJTeG9jT0FUVVJId1UvSXJXbkxxSVlXTkFDcEJlQjJBTmVVcW9xaXdUMjVqQWhlM3lXTGZtTGFRS0JnQ25YNC9tdzZZUDArY1l4Q3RhbnJPcWNZeDR6bDlXSmtmSjJ6NENhL0lGSmxxeVJIUUhMNmxEWnprSTJBWmlMUmUzNksxUHVYT3E0NXlibkM3RlJKVGRvUSs3RWxydmdlUTlvT2M1blRzckk5UXRGdmJLVjVTa3RleFNtS0Z3RXRNbk9nUkdZems1VzIwb3lWOU5lU1lsNi9ZRkdFdGZKa0pzdHpkU3Y1YWI5QWhRM0ZFaW5XdFNnM2Y2S0pNSHN3WlZvd3IrRjZRPT0=
!
crypto ecdsakey ecdsa import $v10$TUhRQ0FRRUVJQURQR2VsOVU5ZndGNFRGOXNja1JoYWFFWUVYSHJEem5VV1lxVHh5ZHJNNW9BY0dCU3VCQkFBS29VUURRZ0FFdTN3TENSVVVzekFEWTlXOG0wbXhDMTJhQWMxUnpOWGh4bUFwRE9PUVlEWGFzRUtDNmdnVFYvUzNZUHFYdGd1Z3BEZ013WVpack5oNFVMQ1hTUTFhYVE9PQ==
!
aaa list auth1
exit
!
aaa userlist netadmin
username admin
username admin password $v10$bmV0Y29uZg==
exit
!
aaa userlist netconfusr
username netconf
username netconf password $v10$bmV0Y29uZg==
exit
!
access-list access-all
sequence 10 permit all any all any all
exit
!
access-list rule1
exit
!
policy-map flowspec-v4
sequence 1 action drop
sequence 1 match access-group rule1
!
exit
!
vrf definition CORE
rd 1:1
exit
!
vrf definition CORE2
rd 2:2
exit
!
vrf definition inet
exit
!
vrf definition OOB
exit
!
router uni2flow4 1
vrf CORE
distance 10
exit
!
router uni2flow6 1
vrf CORE
distance 10
exit
!
interface loopback0
vrf forwarding CORE
ipv4 address 2.2.2.1 255.255.255.255
ipv6 address 4321::1 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
no shutdown
no log-link-change
exit
!
interface ethernet1
description link to host1
vrf forwarding CORE
ipv4 address 10.1.10.3 255.255.255.0
ipv4 netflow-tx
no shutdown
no log-link-change
exit
!
interface ethernet2
description link to host2
vrf forwarding CORE
ipv4 address 10.2.10.3 255.255.255.0
ipv4 netflow-tx
no shutdown
no log-link-change
exit
!
interface ethernet255
vrf forwarding OOB
ipv4 address 11.11.11.5 255.255.255.0
no shutdown
no log-link-change
exit
!
interface ethernet3
description link to host3
vrf forwarding CORE
ipv4 address 10.3.10.3 255.255.255.0
ipv4 netflow-tx
no shutdown
no log-link-change
exit
!
interface ethernet4
no shutdown
no log-link-change
exit
!
interface ethernet5
no shutdown
no log-link-change
exit
!
interface ethernet6
no shutdown
no log-link-change
exit
!
interface ethernet7
vrf forwarding CORE
ipv4 address 13.1.1.1 255.255.255.0
no shutdown
no log-link-change
exit
!
interface ethernet8
vrf forwarding CORE2
ipv4 address 13.1.1.2 255.255.255.0
no shutdown
no log-link-change
exit
!
router bgp4 1
vrf CORE
local-as 1
router-id 4.4.4.1
no safe-ebgp
address-family unicast flowspec
flowspec-install
flowspec-advert flowspec-v4
!
neighbor 10.197.36.2 remote-as 1001
neighbor 10.197.36.2 local-as 2001
neighbor 10.197.36.2 address-family unicast flowspec
neighbor 10.197.36.2 distance 30
neighbor 10.197.36.2 send-community standard extended
!
!
redistribute connected
redistribute uni2flow4 1
exit
!
router bgp4 2
vrf CORE2
local-as 1
router-id 4.4.4.1
no safe-ebgp
address-family unicast flowspec
flowspec-install
flowspec-advert flowspec-v4
!
neighbor 10.197.37.2 remote-as 1011
neighbor 10.197.37.2 local-as 2011
neighbor 10.197.37.2 address-family unicast flowspec
neighbor 10.197.37.2 distance 30
neighbor 10.197.37.2 send-community standard extended
!
neighbor 10.197.38.2 remote-as 1021
neighbor 10.197.38.2 local-as 2021
neighbor 10.197.38.2 address-family unicast flowspec
neighbor 10.197.38.2 distance 30
neighbor 10.197.38.2 send-community standard extended
!
!
redistribute connected
redistribute uni2flow4 1
exit
!
router bgp6 1
vrf CORE
local-as 1
router-id 6.6.6.1
no safe-ebgp
address-family unicast flowspec
!
neighbor 1234:1::2 remote-as 2
neighbor 1234:1::2 local-as 1
neighbor 1234:1::2 address-family unicast flowspec
neighbor 1234:1::2 distance 20
neighbor 1234:1::2 send-community standard extended
!
!
redistribute connected
redistribute uni2flow6 1
exit
!
console0
no exec authorization
no login authentication
exit
!
proxy-profile inet
vrf CORE
source ethernet4
exit
!
proxy-profile OOB
vrf CORE
exit
!
!
ipv4 route CORE 10.0.3.1 255.255.255.0 14.0.0.1
ipv4 route CORE 10.3.0.1 255.255.255.255 14.0.0.1
!
!
!
!
!
!
!
!
!
!
ipv4 flow CORE export inet 10.197.36.2 9995
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
server telnet netconf1
security protocol ssh
security authentication netconfusr
security rsakey rsa
security dsakey dsa
security ecdsakey ecdsa
port 830
second-port 829
exec autocommand netconf
no exec authorization
no login authentication
vrf CORE
exit
!
server telnet netssh
security protocol ssh
security authentication netadmin
security rsakey rsa
security dsakey dsa
security ecdsakey ecdsa
port 22
second-port 2022
no exec authorization
no login authentication
vrf CORE
exit
!
server telnet tel1
security protocol telnet
exec height -1
exec monitor
no exec authorization
no login authentication
vrf CORE
exit
!
server telnet teloob
security protocol telnet
exec height -1
exec monitor
no exec authorization
no login authentication
vrf OOB
exit
!
client capture-path /rtr/run/pcap/
!
end
inst/testing/nemo1/frnet/docker-compose/freertr_fixup_for_nondetected_interfaces.sh 0 → 100755
+ 44
− 0
View file @ ca348cc0
#!/bin/bash
#
#proc ifc1.sh /rtr/run/conf/pcapInt.bin eth1 20002 127.0.0.1 20001 127.0.0.1
#int ether1 eth 02:42:0a:01:0a:03 127.0.0.1 20001 127.0.0.1 20002
#proc ifc2.sh /rtr/run/conf/pcapInt.bin eth2 20012 127.0.0.1 20011 127.0.0.1
#int ether2 eth 02:42:0a:02:0a:03 127.0.0.1 20011 127.0.0.1 20012
#proc ifc3.sh /rtr/run/conf/pcapInt.bin eth3 20022 127.0.0.1 20021 127.0.0.1
#int ether3 eth 02:42:0a:03:0a:03 127.0.0.1 20021 127.0.0.1 20022
##proc ifc4.sh /rtr/run/conf/pcapInt.bin eth4 20032 127.0.0.1 20031 127.0.0.1
##int ether4 eth 02:42:0a:c5:24:03 127.0.0.1 20031 127.0.0.1 20032
##proc ifc5.sh /rtr/run/conf/pcapInt.bin eth5 20042 127.0.0.1 20041 127.0.0.1
##int ether5 eth 02:42:0a:c5:25:03 127.0.0.1 20041 127.0.0.1 20042
##proc ifc6.sh /rtr/run/conf/pcapInt.bin eth6 20052 127.0.0.1 20051 127.0.0.1
##int ether6 eth 02:42:0a:c5:26:03 127.0.0.1 20051 127.0.0.1 20052
##proc ifc7.sh /rtr/run/conf/pcapInt.bin veth1 20062 127.0.0.1 20061 127.0.0.1
##int ether7 eth 02:01:01:01:01:01 127.0.0.1 20061 127.0.0.1 20062
##proc ifc8.sh /rtr/run/conf/pcapInt.bin veth2 20072 127.0.0.1 20071 127.0.0.1
##int ether8 eth 02:68:0d:e7:69:b9 127.0.0.1 20071 127.0.0.1 20072
hwfile="/rtr/run/conf/rtr-hw.txt"
if ! grep -q "^proc ifc1.sh" "$hwfile"; then
cat <<EOF
proc ifc1.sh /rtr/run/conf/pcapInt.bin eth1 20002 127.0.0.1 20001 127.0.0.1
int ether1 eth 02:42:0a:01:0a:03 127.0.0.1 20001 127.0.0.1 20002
EOF
fi
if ! grep -q "^proc ifc2.sh" "$hwfile"; then
cat <<EOF
proc ifc2.sh /rtr/run/conf/pcapInt.bin eth2 20012 127.0.0.1 20011 127.0.0.1
int ether2 eth 02:42:0a:02:0a:03 127.0.0.1 20011 127.0.0.1 20012
EOF
fi
if ! grep -q "^proc ifc3.sh" "$hwfile"; then
cat <<EOF
proc ifc3.sh /rtr/run/conf/pcapInt.bin eth3 20022 127.0.0.1 20021 127.0.0.1
int ether3 eth 02:42:0a:03:0a:03 127.0.0.1 20021 127.0.0.1 20022
EOF
fi
inst/testing/nemo1/frnet/docker-compose/freertr_setup_environment.sh
+ 12
− 0
View file @ ca348cc0
......@@ -22,8 +22,20 @@ ethtool -k veth2 | awk '$2=="on" { sub(/:$/, "", $1); print $1; }' | while read
/rtr/hwdet-mgmt.sh
#
# fix for some issues having arised in 2024:
cat /rtr/rtr-hw-add.txt >> /rtr/run/conf/rtr-hw.txt
# fix new issues since 2025-07 (Ubuntu24):
grep -v ^line /rtr/run/conf/rtr-hw.txt > /rtr/run/conf/rtr-hw.txt.new && mv /rtr/run/conf/rtr-hw.txt.new /rtr/run/conf/rtr-hw.txt
/usr/local/bin/freertr_fixup_for_nondetected_interfaces.sh >> /rtr/run/conf/rtr-hw.txt
# debug:
cat /rtr/run/conf/rtr-hw.txt | nl 1>&2
#
ip addr flush dev eth1
ip addr flush dev eth2
ip addr flush dev eth3
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment