From 1ac2ee7b0e310512548f5367e466425aad8f8756 Mon Sep 17 00:00:00 2001 From: Joe Clarke Date: Tue, 21 Nov 2023 14:46:38 -0500 Subject: [PATCH] Update SD-WAN node definitions. Switch to the new Catalyst brand and update requirements and interface names to match reality. Since the Cat8Kv is the new "cEdge" leverage the existing Cat8Kv that already ships with CML and remove the legacy iosxe-sdwan node definition here. --- node-definitions/cisco/sd-wan/README.md | 17 ++-- ...la-bond.yaml => cat-sdwan-controller.yaml} | 54 +++++++------ ...ela-manage.yaml => cat-sdwan-manager.yaml} | 60 ++++++++------ ...la-smart.yaml => cat-sdwan-validator.yaml} | 41 ++++++---- ...viptela-edge.yaml => cat-sdwan-vedge.yaml} | 45 ++++++----- .../cisco/sd-wan/iosxe-sdwan.yaml | 80 ------------------- 6 files changed, 121 insertions(+), 176 deletions(-) rename node-definitions/cisco/sd-wan/{viptela-bond.yaml => cat-sdwan-controller.yaml} (53%) rename node-definitions/cisco/sd-wan/{viptela-manage.yaml => cat-sdwan-manager.yaml} (51%) rename node-definitions/cisco/sd-wan/{viptela-smart.yaml => cat-sdwan-validator.yaml} (59%) rename node-definitions/cisco/sd-wan/{viptela-edge.yaml => cat-sdwan-vedge.yaml} (63%) delete mode 100644 node-definitions/cisco/sd-wan/iosxe-sdwan.yaml diff --git a/node-definitions/cisco/sd-wan/README.md b/node-definitions/cisco/sd-wan/README.md index 134528a..0b789a1 100644 --- a/node-definitions/cisco/sd-wan/README.md +++ b/node-definitions/cisco/sd-wan/README.md @@ -1,21 +1,16 @@ -# Cisco SD-WAN Node Definitions +# Cisco Catalyst SD-WAN Node Definitions This directory contains the following node definitions: -* `iosxe-sdwan.yaml` - Cisco cEdge CSR1000v node definition -* `viptela-bond.yaml` - Cisco vBond node definition -* `viptela-edge.yaml` - Cisco vEdge node definition -* `viptela-manage.yaml` - Cisco vManage node definition -* `viptela-smart.yaml` - Cisco vSmart node definition - - +* `cat-sdwan-validator.yaml` - Cisco Catalyst SD-WAN Validator (formerly vBond) node definition +* `cat-sdwan-vedge.yaml` - Cisco Catalyst SD-WAN vEdge node definition +* `cat-sdwan-manager.yaml` - Cisco Catalyst SD-WAN Manager (formerly vManage) node definition +* `cat-sdwan-controller.yaml` - Cisco Catalyst SD-WAN Controller (formerly vSmart) node definition ### Image Availability Images can be downloaded from https://software.cisco.com/download/home/286320995/type with a proper Cisco.com account and entitlement. - - ### Known Issues -While the `viptela-*` nodes support cloud-init day 0 configuration, the config extraction does not re-generate the cloud-init config. Therefore, config extraction will not work correctly on the `viptela-*` nodes. \ No newline at end of file +While the `cat-sdwan-*` nodes support cloud-init day 0 configuration, the config extraction does not re-generate the cloud-init config. Therefore, config extraction will not work correctly on the `cat-sdwan-*` nodes. diff --git a/node-definitions/cisco/sd-wan/viptela-bond.yaml b/node-definitions/cisco/sd-wan/cat-sdwan-controller.yaml similarity index 53% rename from node-definitions/cisco/sd-wan/viptela-bond.yaml rename to node-definitions/cisco/sd-wan/cat-sdwan-controller.yaml index 0626268..55444a7 100644 --- a/node-definitions/cisco/sd-wan/viptela-bond.yaml +++ b/node-definitions/cisco/sd-wan/cat-sdwan-controller.yaml @@ -1,4 +1,4 @@ -id: viptela-bond +id: cat-sdwan-controller configuration: generator: driver: null @@ -8,27 +8,31 @@ configuration: files: - name: meta-data content: |- - instance-id: vbond - local-hostname: vbond + instance-id: Controller + local-hostname: Controller editable: false - name: user-data content: |- #cloud-config - ssh_authorized_keys: - - your-ssh-pub-key-line-goes-here + vinitparam: + - vbond : + - host-name: Controller + - org: + - rcc : true editable: true device: interfaces: has_loopback_zero: false + default_count: 4 physical: - eth0 - - ge0/0 - - ge0/1 - - ge0/2 - - ge0/3 - - ge0/4 - - ge0/5 - - ge0/6 + - eth1 + - eth2 + - eth3 + - eth4 + - eth5 + - eth6 + - eth7 serial_ports: 1 inherited: image: @@ -36,15 +40,18 @@ inherited: cpus: true data_volume: false boot_disk_size: false + cpu_limit: true node: ram: true cpus: true data_volume: false boot_disk_size: false + cpu_limit: true general: - description: Viptela vBond System + description: Cisco Catalyst SD-WAN Controller nature: server - read_only: true + read_only: false +schema_version: 0.0.1 boot: timeout: 300 completed: @@ -57,17 +64,18 @@ sim: libvirt_domain_driver: kvm nic_driver: virtio ram: 4096 + cpu_limit: 100 pyats: - os: linux + os: sdwan + series: viptela + config_extract_command: show running + username: admin + password: admin + use_in_testbed: true ui: - description: |- - Viptela vBond System - - 4 GB DRAM, 2 vCPU - - [CCO Link](https://sdwan-docs.cisco.com/Product_Documentation) + description: Cisco Catalyst SD-WAN Controller group: Others icon: server - label: vBond - label_prefix: vbond- + label: Catalyst SD-WAN Controller + label_prefix: cat-sdwan-controller- visible: true diff --git a/node-definitions/cisco/sd-wan/viptela-manage.yaml b/node-definitions/cisco/sd-wan/cat-sdwan-manager.yaml similarity index 51% rename from node-definitions/cisco/sd-wan/viptela-manage.yaml rename to node-definitions/cisco/sd-wan/cat-sdwan-manager.yaml index 49c132e..af5879d 100644 --- a/node-definitions/cisco/sd-wan/viptela-manage.yaml +++ b/node-definitions/cisco/sd-wan/cat-sdwan-manager.yaml @@ -1,4 +1,4 @@ -id: viptela-manage +id: cat-sdwan-manager configuration: generator: driver: null @@ -8,27 +8,33 @@ configuration: files: - name: meta-data content: |- - instance-id: vmanage - local-hostname: vmanage + instance-id: Manager + local-hostname: Manager editable: false - name: user-data content: |- #cloud-config - ssh_authorized_keys: - - your-ssh-pub-key-line-goes-here + vinitparam: + - format-partition: 1 + - vbond : + - host-name: Manager + - org: + - rcc : true editable: true device: interfaces: has_loopback_zero: false + default_count: 2 physical: - eth0 - - ge0/0 - - ge0/1 - - ge0/2 - - ge0/3 - - ge0/4 - - ge0/5 - - ge0/6 + - eth1 + - eth2 + - eth3 + - eth4 + - eth5 + - eth6 + - eth7 + - eth8 serial_ports: 1 inherited: image: @@ -36,15 +42,18 @@ inherited: cpus: true data_volume: true boot_disk_size: false + cpu_limit: true node: ram: true cpus: true data_volume: true boot_disk_size: false + cpu_limit: true general: - description: Viptela vManage System + description: Cisco Catalyst SD-WAN Manager nature: server - read_only: true + read_only: false +schema_version: 0.0.1 boot: timeout: 300 completed: @@ -56,19 +65,20 @@ sim: driver: server libvirt_domain_driver: kvm nic_driver: virtio - ram: 32768 - data_volume: 512 + ram: 16384 + data_volume: 256 + cpu_limit: 100 pyats: - os: linux + os: sdwan + series: viptela + config_extract_command: show running + username: admin + password: admin + use_in_testbed: true ui: - description: |- - Viptela vManage System - - 32 GB DRAM, 8 vCPU, 512GB data disk - - [CCO Link](https://sdwan-docs.cisco.com/Product_Documentation) + description: Cisco Catalyst SD-WAN Manager group: Others icon: server - label: vManage - label_prefix: vmanage- + label: Catalyst SD-WAN Manager + label_prefix: sdwan-manager- visible: true diff --git a/node-definitions/cisco/sd-wan/viptela-smart.yaml b/node-definitions/cisco/sd-wan/cat-sdwan-validator.yaml similarity index 59% rename from node-definitions/cisco/sd-wan/viptela-smart.yaml rename to node-definitions/cisco/sd-wan/cat-sdwan-validator.yaml index 5cc991d..bea95f7 100644 --- a/node-definitions/cisco/sd-wan/viptela-smart.yaml +++ b/node-definitions/cisco/sd-wan/cat-sdwan-validator.yaml @@ -1,4 +1,4 @@ -id: viptela-smart +id: cat-sdwan-validator configuration: generator: driver: null @@ -8,18 +8,22 @@ configuration: files: - name: meta-data content: |- - instance-id: vsmart - local-hostname: vsmart + instance-id: Validator + local-hostname: Validator editable: false - name: user-data content: |- #cloud-config - ssh_authorized_keys: - - your-ssh-pub-key-line-goes-here + vinitparam: + - Validator : + - host-name: Validator + - org: + - rcc : true editable: true device: interfaces: has_loopback_zero: false + default_count: 2 physical: - eth0 - ge0/0 @@ -29,6 +33,7 @@ device: - ge0/4 - ge0/5 - ge0/6 + - ge0/7 serial_ports: 1 inherited: image: @@ -36,15 +41,18 @@ inherited: cpus: true data_volume: false boot_disk_size: false + cpu_limit: true node: ram: true cpus: true data_volume: false boot_disk_size: false + cpu_limit: true general: - description: Viptela vSmart System + description: Cisco Catalyst SD-WAN Validator nature: server - read_only: true + read_only: false +schema_version: 0.0.1 boot: timeout: 300 completed: @@ -57,17 +65,18 @@ sim: libvirt_domain_driver: kvm nic_driver: virtio ram: 4096 + cpu_limit: 100 pyats: - os: linux + os: sdwan + series: viptela + config_extract_command: show running + username: admin + password: admin + use_in_testbed: true ui: - description: |- - Viptela vSmart System - - 4 GB DRAM, 2 vCPU - - [CCO Link](https://sdwan-docs.cisco.com/Product_Documentation) + description: Cisco Catalyst SD-WAN Validator group: Others icon: server - label: vSmart - label_prefix: vsmart- + label: Catalyst SD-WAN Validator + label_prefix: sdwan-validator- visible: true diff --git a/node-definitions/cisco/sd-wan/viptela-edge.yaml b/node-definitions/cisco/sd-wan/cat-sdwan-vedge.yaml similarity index 63% rename from node-definitions/cisco/sd-wan/viptela-edge.yaml rename to node-definitions/cisco/sd-wan/cat-sdwan-vedge.yaml index fe078c0..031a36d 100644 --- a/node-definitions/cisco/sd-wan/viptela-edge.yaml +++ b/node-definitions/cisco/sd-wan/cat-sdwan-vedge.yaml @@ -1,4 +1,4 @@ -id: viptela-edge +id: vEdge configuration: generator: driver: null @@ -8,23 +8,22 @@ configuration: files: - name: meta-data content: |- - instance-id: ubuntu - local-hostname: ubuntu + instance-id: vEdge + local-hostname: vEdge editable: false - name: user-data content: |- #cloud-config vinitparam: - - otp: 00000000000000000000000000000000 - - vbond: 1.2.3.4 - - uuid: 12345678-dead-beef-cafe-1234567890ab - - org: some-org-string - ssh_authorized_keys: - - your-ssh-pub-key-line-goes-here + - otp: + - vbond: + - uuid: + - org: editable: true device: interfaces: has_loopback_zero: false + default_count: 2 physical: - eth0 - ge0/0 @@ -34,6 +33,7 @@ device: - ge0/4 - ge0/5 - ge0/6 + - ge0/7 serial_ports: 1 inherited: image: @@ -41,15 +41,18 @@ inherited: cpus: true data_volume: false boot_disk_size: false + cpu_limit: true node: ram: true cpus: true data_volume: false boot_disk_size: false + cpu_limit: true general: - description: Viptela vEdge System + description: Catalyst SD-WAN vEdge nature: server read_only: false +schema_version: 0.0.1 boot: timeout: 120 completed: @@ -62,18 +65,18 @@ sim: libvirt_domain_driver: kvm nic_driver: virtio ram: 2048 + cpu_limit: 100 pyats: - os: linux + os: sdwan + series: viptela + config_extract_command: show running + username: admin + password: admin + use_in_testbed: true ui: - description: |- - Viptela vEdge System - - 2 GB DRAM, 2 vCPU - - [CCO Link](https://sdwan-docs.cisco.com/Product_Documentation) + description: Catalyst SD-WAN vEdge group: Others - icon: server - label: vEdge - label_prefix: vedge- + icon: router + label: Catalyst SD-WAN vEdge + label_prefix: vEdge- visible: true -schema_version: 0.0.1 diff --git a/node-definitions/cisco/sd-wan/iosxe-sdwan.yaml b/node-definitions/cisco/sd-wan/iosxe-sdwan.yaml deleted file mode 100644 index 7ff13fc..0000000 --- a/node-definitions/cisco/sd-wan/iosxe-sdwan.yaml +++ /dev/null @@ -1,80 +0,0 @@ -id: iosxe-sdwan -configuration: - generator: - driver: csr1000v - provisioning: - volume_name: disk - media_type: iso - files: - - name: ciscosdwan_cloud_init.cfg - content: hostname inserthostname_here - editable: true -inherited: - image: - ram: true - cpus: true - data_volume: false - boot_disk_size: false - node: - ram: true - cpus: true - data_volume: false - boot_disk_size: false -device: - interfaces: - has_loopback_zero: true - loopback: - - Loopback0 - physical: - - GigabitEthernet1 - - GigabitEthernet2 - - GigabitEthernet3 - - GigabitEthernet4 - - GigabitEthernet5 - - GigabitEthernet6 - - GigabitEthernet7 - - GigabitEthernet8 - - GigabitEthernet9 - - GigabitEthernet10 - - GigabitEthernet11 - - GigabitEthernet12 - - GigabitEthernet13 - - GigabitEthernet14 - - GigabitEthernet15 - - GigabitEthernet16 - serial_ports: 2 -general: - description: Cisco IOS XE SD-WAN - nature: router - read_only: false -sim: - linux_native: - cpus: 1 - disk_driver: virtio - driver: csr1000v - libvirt_domain_driver: kvm - nic_driver: virtio - ram: 3072 -boot: - timeout: 250 - completed: - - Would you like to enter the initial configuration dialog? - - 'INFO: Press RETURN to get started!' - - '%CVAC-4-CONFIG_DONE:' -pyats: - os: iosxe - config_extract_command: show run -ui: - description: |- - Cisco IOS XE SD-WAN - - 3 GB DRAM, 1 vCPU - - [CCO Link](https://www.cisco.com/c/en/us/support/routers/csr-1000v-series-ios-xe-sd-wan/model.html) - [Release Notes](https://www.cisco.com/c/en/us/td/docs/routers/sdwan/release/notes/xe-16-11/sd-wan-rel-notes-19-1.html) - group: Cisco - icon: router - label: XE-SDWAN - label_prefix: xe-sdwan- - visible: true -schema_version: 0.0.1