diff --git a/docs/labs/clab.md b/docs/labs/clab.md index 69cc1ace03..341c80a69e 100644 --- a/docs/labs/clab.md +++ b/docs/labs/clab.md @@ -17,7 +17,7 @@ ## Supported Versions -The latest _netlab_ release was tested with _containerlab_ version 0.71.1. That's also the version the **netlab install containerlab** command installs. +The latest _netlab_ release was tested with _containerlab_ version 0.72. That's also the version the **netlab install containerlab** command installs. If needed, use ```sudo containerlab version upgrade``` to upgrade to the latest _containerlab_ version. @@ -32,6 +32,7 @@ Lab topology file created by **[netlab up](../netlab/up.md)** or **[netlab creat | Aruba CX | vrnetlab/aruba_arubaos-cx:20240731173624 | | BIRD | netlab/bird:latest | | Cisco 8000v | cisco/cisco-8201-32fh:24.4.1 | +| Cisco ASAv | vrnetlab/cisco_asav:9-16-4-57 | | Cisco Catalyst 8000v | vrnetlab/vr-c8000v:17.13.01a | | Cisco CSR 1000v | vrnetlab/vr-csr:17.03.04 | | Cisco IOL [❗](caveats-iol) | vrnetlab/cisco_iol:17.12.01 | diff --git a/docs/platforms.md b/docs/platforms.md index 29a98a4e99..2212d9663f 100644 --- a/docs/platforms.md +++ b/docs/platforms.md @@ -109,7 +109,7 @@ You cannot use all supported network devices with all virtualization providers. | Arista vEOS | [✅](build-eos) | ✅ | [✅](build-ceos) | | Aruba AOS-CX | [✅](build-arubacx) | ❌ | ✅[❗](clab-vrnetlab) | | Cisco 8000v | ❌ | ❌ | ✅ | -| Cisco ASAv | [✅](build-asav) | ❌ | ❌ | +| Cisco ASAv | [✅](build-asav) | ❌ | ✅ [❗](clab-vrnetlab) | | Cisco Catalyst 8000v | [✅](build-cat8000v) | ❌ | ✅[❗](clab-vrnetlab) | | Cisco CSR 1000v | [✅](build-csr) | ✅ | ✅[❗](clab-vrnetlab) | | Cisco IOL | ❌ | ❌ | ✅[❗](clab-vrnetlab) | diff --git a/netsim/ansible/tasks/deploy-config/asa.yml b/netsim/ansible/tasks/deploy-config/asa.yml index a6e7be3c08..6910d2bcaa 100644 --- a/netsim/ansible/tasks/deploy-config/asa.yml +++ b/netsim/ansible/tasks/deploy-config/asa.yml @@ -2,3 +2,4 @@ asa_config: src: "{{ config_template }}" tags: [print_action, always] + become: yes diff --git a/netsim/devices/asav.yml b/netsim/devices/asav.yml index baf618e063..2e56ef8fc8 100644 --- a/netsim/devices/asav.yml +++ b/netsim/devices/asav.yml @@ -14,6 +14,7 @@ group_vars: ansible_connection: network_cli # yamllint disable-line rule:line-length netlab_ssh_args: "-o KexAlgorithms=+diffie-hellman-group14-sha1 -o PubkeyAcceptedKeyTypes=+ssh-rsa -o HostKeyAlgorithms=+ssh-rsa" + netlab_check_retries: 50 external: image: none features: @@ -31,3 +32,16 @@ libvirt: # --disk path=vm.qcow2,format=qcow2,device=disk,bus=virtio,cache=writethrough # --disk path=bootstrap.iso,format=iso,device=cdrom --graphics none --import create_iso: asav +clab: + image: vrnetlab/cisco_asav:9-16-4-57 + node: + kind: cisco_asav +# interface.name: eth{ifindex} + build: https://containerlab.dev/manual/kinds/cisco_asav/ + group_vars: + ansible_ssh_pass: CiscoAsa1! + ansible_become_password: CiscoAsa1! + ansible_user: admin + netlab_ready: [ ssh ] + netlab_check_command: | + exit diff --git a/netsim/devices/iosv.yml b/netsim/devices/iosv.yml index e87cf2e704..f77593ad80 100644 --- a/netsim/devices/iosv.yml +++ b/netsim/devices/iosv.yml @@ -20,6 +20,6 @@ features: clab: image: vrnetlab/cisco_vios:15.9.3 node: - kind: linux + kind: cisco_vios interface.name: eth{ifindex} build: https://github.com/srl-labs/vrnetlab/tree/master/vios diff --git a/netsim/devices/iosvl2.yml b/netsim/devices/iosvl2.yml index 9daf0543ae..749bf56d5f 100644 --- a/netsim/devices/iosvl2.yml +++ b/netsim/devices/iosvl2.yml @@ -30,6 +30,6 @@ libvirt: clab: image: vrnetlab/cisco_viosl2:15.2 node: - kind: linux + kind: cisco_vios interface.name: eth{ifindex} build: https://github.com/srl-labs/vrnetlab/tree/master/viosl2 diff --git a/netsim/install/containerlab.sh b/netsim/install/containerlab.sh index 10ec4b8584..8a73b9a01e 100755 --- a/netsim/install/containerlab.sh +++ b/netsim/install/containerlab.sh @@ -1,7 +1,6 @@ #!/bin/bash # # Install a specific version of Containerlab -- it's now set in 'netlab install' before calling this script -# CONTAINERLAB_VERSION="0.62.2" # set -e REPLACE="--upgrade" diff --git a/netsim/providers/clab.yml b/netsim/providers/clab.yml index c287fc8226..bc32d04b14 100644 --- a/netsim/providers/clab.yml +++ b/netsim/providers/clab.yml @@ -6,7 +6,7 @@ config: clab.yml lab_prefix: "clab" # Containerlab default, set to "" to remove prefix node_config_special: [ binds, config_templates, image, kind, startup-config, srl-agents, runtime ] template: clab.j2 -version: 0.71.1 +version: 0.72 # Preserve env to allow user to configure PATH start: sudo -E containerlab deploy --reconfigure -t clab.yml stop: sudo -E containerlab destroy --cleanup -t clab.yml @@ -15,8 +15,8 @@ act_title: "Running containers" probe: - cmd: "containerlab version" err: "Containerlab is not installed" -- cmd: [ bash, '-c', "[[ `containerlab version|awk '/version/ {print $2}'` > '0.69.2' ]] && echo OK" ] - err: "Containerlab version is too old, please upgrade to 0.69.3 or later with 'sudo containerlab version upgrade'" +- cmd: [ bash, '-c', "[[ `containerlab version|awk '/version/ {print $2}'` > '0.71.999' ]] && echo OK" ] + err: "Containerlab version is too old, please upgrade to 0.72 or later with 'sudo containerlab version upgrade'" cleanup: [ clab.yml, clab_files ] bridge_type: bridge # Use 'ovs-bridge' to create Openvswitch bridges