From 9f2dd0b82c09516c5c57b5b991208de727cf8c27 Mon Sep 17 00:00:00 2001 From: Ivan Pepelnjak Date: Tue, 4 Jul 2023 11:47:04 +0200 Subject: [PATCH] Migrate CSR 1000v module support into device features --- netsim/devices/csr.yml | 42 ++++++++++++++++++++++---------------- netsim/modules/bfd.yml | 2 +- netsim/modules/bgp.yml | 2 +- netsim/modules/eigrp.yml | 2 +- netsim/modules/gateway.yml | 2 +- netsim/modules/isis.yml | 2 +- netsim/modules/mpls.yml | 2 +- netsim/modules/ospf.yml | 2 +- netsim/modules/sr.yml | 2 +- netsim/modules/vlan.yml | 2 +- netsim/modules/vrf.yml | 2 +- netsim/modules/vxlan.yml | 2 +- 12 files changed, 35 insertions(+), 29 deletions(-) diff --git a/netsim/devices/csr.yml b/netsim/devices/csr.yml index a6096b61c..763683259 100644 --- a/netsim/devices/csr.yml +++ b/netsim/devices/csr.yml @@ -16,33 +16,39 @@ group_vars: node: min_mtu: 1500 features: - bgp: - local_as: True - vrf_local_as: True - local_as_ibgp: True - activate_af: True initial: ipv4: - unnumbered: True + unnumbered: true ipv6: - lla: True - ospf: - unnumbered: True + lla: true + bfd: true + bgp: + activate_af: true + local_as: true + local_as_ibgp: true + vrf_local_as: true + eigrp: true + gateway: + protocol: + - vrrp isis: unnumbered: - ipv4: True - ipv6: True - network: True + ipv4: true + ipv6: true + network: true mpls: - ldp: True - bgp: True - vpn: True - 6pe: True + 6pe: true + bgp: true + ldp: true + vpn: true + ospf: + unnumbered: true + sr: true vlan: model: switch svi_interface_name: BDI{vlan} - gateway: - protocol: [ vrrp ] + vrf: true + vxlan: true libvirt: image: cisco/csr1000v create: diff --git a/netsim/modules/bfd.yml b/netsim/modules/bfd.yml index 89db2b43d..b8b4c1f8e 100644 --- a/netsim/modules/bfd.yml +++ b/netsim/modules/bfd.yml @@ -1,6 +1,6 @@ # BFD (RFC 5880) default settings and attributes # -supported_on: [ srlinux, sros, iosv, csr, nxos, eos, vyos, arubacx, none ] +supported_on: [ srlinux, sros, nxos, eos, vyos, arubacx, none ] min_echo_rx: 0 # Echo function, 0=disabled by default multiplier: 3 # Detection time multiplier, number of packets lost before down attributes: diff --git a/netsim/modules/bgp.yml b/netsim/modules/bgp.yml index 9478e97d3..5c17ab3af 100644 --- a/netsim/modules/bgp.yml +++ b/netsim/modules/bgp.yml @@ -1,6 +1,6 @@ # BGP default settings and attributes # -supported_on: [ cumulus, cumulus_nvue, eos, frr, csr, nxos, asav, vsrx, vyos, routeros, +supported_on: [ cumulus, cumulus_nvue, eos, frr, nxos, asav, vsrx, vyos, routeros, srlinux, sros, none, dellos10, routeros7, vmx, iosxr, arubacx, vptx, none ] ebgp_role: external advertise_roles: [ stub ] diff --git a/netsim/modules/eigrp.yml b/netsim/modules/eigrp.yml index 56e48564a..5df98ab33 100644 --- a/netsim/modules/eigrp.yml +++ b/netsim/modules/eigrp.yml @@ -1,6 +1,6 @@ # EIGRP default settings and attributes # -supported_on: [ csr, nxos, none ] +supported_on: [ nxos, none ] transform_after: [ vlan,vrf ] config_after: [ vlan ] as: 1 diff --git a/netsim/modules/gateway.yml b/netsim/modules/gateway.yml index 6319d8ffa..a76ef15ae 100644 --- a/netsim/modules/gateway.yml +++ b/netsim/modules/gateway.yml @@ -1,6 +1,6 @@ # Gateway (FHRP) default settings and attributes # -supported_on: [ none, eos, cumulus, csr, nxos, sros, srlinux, vyos, dellos10, arubacx ] +supported_on: [ none, eos, cumulus, nxos, sros, srlinux, vyos, dellos10, arubacx ] transform_after: [ vlan, vrf, ospf, isis, eigrp ] config_after: [ vlan,vrf ] id: -2 diff --git a/netsim/modules/isis.yml b/netsim/modules/isis.yml index 8785d255e..9adeceb17 100644 --- a/netsim/modules/isis.yml +++ b/netsim/modules/isis.yml @@ -1,6 +1,6 @@ # ISIS default settings and attributes # -supported_on: [ eos, frr, csr, nxos, asav, vsrx, srlinux, sros, vyos, vmx, iosxr, vptx, none ] +supported_on: [ eos, frr, nxos, asav, vsrx, srlinux, sros, vyos, vmx, iosxr, vptx, none ] area: "49.0001" type: level-2 transform_after: [ vlan,vrf ] diff --git a/netsim/modules/mpls.yml b/netsim/modules/mpls.yml index 03d01916e..750f5f9b3 100644 --- a/netsim/modules/mpls.yml +++ b/netsim/modules/mpls.yml @@ -1,6 +1,6 @@ # MPLS (LDP, BGP LU, L3VPN, 6PE) default settings and attributes # -supported_on: [ eos, csr, routeros, vyos, routeros7, sros, vmx, vsrx, frr, none, vptx, arubacx ] +supported_on: [ eos, routeros, vyos, routeros7, sros, vmx, vsrx, frr, none, vptx, arubacx ] config_after: [ vlan, ospf, isis, bgp ] transform_after: [ vlan, bgp ] ldp: True diff --git a/netsim/modules/ospf.yml b/netsim/modules/ospf.yml index 299cd534e..8cc7a6bba 100644 --- a/netsim/modules/ospf.yml +++ b/netsim/modules/ospf.yml @@ -2,7 +2,7 @@ # area: 0.0.0.0 supported_on: [ - arcos, cumulus, cumulus_nvue, eos, fortios, frr, csr, nxos, vsrx, vyos, routeros, + arcos, cumulus, cumulus_nvue, eos, fortios, frr, nxos, vsrx, vyos, routeros, srlinux, sros, dellos10, routeros7, vmx, iosxr, arubacx, vptx, none ] transform_after: [ vlan,vrf ] config_after: [ vlan ] diff --git a/netsim/modules/sr.yml b/netsim/modules/sr.yml index b68ca56ef..2ab50f8cd 100644 --- a/netsim/modules/sr.yml +++ b/netsim/modules/sr.yml @@ -1,7 +1,7 @@ # SR-MPLS default settings and attributes # requires: [ isis ] -supported_on: [ csr, eos, srlinux, sros, vsrx, vmx, vptx, none ] +supported_on: [ eos, srlinux, sros, vsrx, vmx, vptx, none ] transform_after: [ vlan ] attributes: global: diff --git a/netsim/modules/vlan.yml b/netsim/modules/vlan.yml index fdc2f950b..025eab28e 100644 --- a/netsim/modules/vlan.yml +++ b/netsim/modules/vlan.yml @@ -1,6 +1,6 @@ # VLAN default settings and attributes # -supported_on: [ eos, csr, vyos, dellos10, srlinux, none, routeros, nxos, frr, cumulus, sros, routeros7, vmx, vsrx, arubacx, vptx, none ] +supported_on: [ eos, vyos, dellos10, srlinux, none, routeros, nxos, frr, cumulus, sros, routeros7, vmx, vsrx, arubacx, vptx, none ] no_propagate: [ start_vlan_id, mode ] start_vlan_id: 1000 mode: irb diff --git a/netsim/modules/vrf.yml b/netsim/modules/vrf.yml index 6b6b534f5..30ab19dcf 100644 --- a/netsim/modules/vrf.yml +++ b/netsim/modules/vrf.yml @@ -1,6 +1,6 @@ # VRF default settings and attributes # -supported_on: [ eos, iosv, csr, routeros, dellos10, vyos, cumulus_nvue, nxos, srlinux, frr, cumulus, sros, routeros7, vmx, vsrx, arubacx, vptx, none ] +supported_on: [ eos, routeros, dellos10, vyos, cumulus_nvue, nxos, srlinux, frr, cumulus, sros, routeros7, vmx, vsrx, arubacx, vptx, none ] config_after: [ vlan, ospf, isis, bgp, mpls ] transform_after: [ vlan, bgp ] as: 65000 diff --git a/netsim/modules/vxlan.yml b/netsim/modules/vxlan.yml index ee788f50c..ed89375b5 100644 --- a/netsim/modules/vxlan.yml +++ b/netsim/modules/vxlan.yml @@ -1,6 +1,6 @@ # VXLAN default settings and attributes # -supported_on: [ eos, nxos, vyos, csr, dellos10, srlinux, frr, cumulus, sros, arubacx, vptx, none ] +supported_on: [ eos, nxos, vyos, dellos10, srlinux, frr, cumulus, sros, arubacx, vptx, none ] requires: [ vlan ] config_after: [ vrf ] # For platforms that suppport L3 VXLAN, vrfs must be created first transform_after: [ vlan, vrf ]