Skip to content

Commit

Permalink
Merge pull request #518 from networkop/fix-cvx-lab-suffix
Browse files Browse the repository at this point in the history
fixing cvx lab suffixes
  • Loading branch information
hellt committed Jul 16, 2021
2 parents 8224680 + 93b1b15 commit c6ab761
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 15 deletions.
10 changes: 5 additions & 5 deletions docs/lab-examples/cvx03.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
| **Description** | Cumulus Linux Test Drive |
| **Components** | [Cumulus Linux][cvx] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 2 <br/>:fontawesome-solid-memory: 2 GB |
| **Topology file** | [lab-start.yml][topofile] <br/>[lab-final.yml][finalfile] |
| **Topology file** | [lab-start.clab.yml][topofile] <br/>[lab-final.clab.yml][finalfile] |
| **Name** | cvx03 |
| **Version information**[^2] | `cvx:4.3.0` `docker-ce:19.03.13` |

Expand All @@ -19,13 +19,13 @@ This is a "Cumulus Test Drive" topology designed to provide an overview of NVIDI
2. BGP Unnumbered (Lab3) -- learn how to configure BGP unnumbered between leaf and spine switches and advertise locally connected interfaces.

!!!note
Everything from Lab1 is already pre-configured when the topology is created with [lab-start.yml][topofile].
Everything from Lab1 is already pre-configured when the topology is created with [lab-start.clab.yml][topofile].

Additionally, the lab directory contains a [lab-final.yml][finalfile] which will load final configurations as they appear at the end of Lab3.
Additionally, the lab directory contains a [lab-final.clab.yml][finalfile] which will load final configurations as they appear at the end of Lab3.

[cvx]: https://www.nvidia.com/en-gb/networking/ethernet-switching/cumulus-vx/
[topofile]: https://github.com/srl-labs/containerlab/tree/master/lab-examples/cvx03/lab-start.yml
[finalfile]: https://github.com/srl-labs/containerlab/tree/master/lab-examples/cvx03/lab-final.yml
[topofile]: https://github.com/srl-labs/containerlab/tree/master/lab-examples/cvx03/lab-start.clab.yml
[finalfile]: https://github.com/srl-labs/containerlab/tree/master/lab-examples/cvx03/lab-final.clab.yml

[^1]: Resource requirements are provisional. Consult with the installation guides for additional information.
[^2]: The lab has been validated using these versions of the required tools/components. Using versions other than stated might lead to a non-operational setup process.
Expand Down
11 changes: 4 additions & 7 deletions docs/lab-examples/cvx04.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
| **Description** | Cumulus In The Cloud |
| **Components** | [Cumulus Linux][cvx] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 2 <br/>:fontawesome-solid-memory: 4 GB |
| **Topology file** | [symm-mh.yml][topo-mh] <br/>[symm-mlag.yml][topo-mlag] |
| **Topology file** | [symm-mh.clab.yml][topo-mh] <br/>[symm-mlag.clab.yml][topo-mlag] |
| **Name** | cvx04 |
| **Version information**[^2] | `cvx:4.3.0` `docker-ce:19.03.13` |

Expand All @@ -21,7 +21,7 @@ This is a "Cumulus In The Cloud" topology designed to demonstrate some of the ad

## Instructions

Each configuration option is provided in its own configuration file -- [`symm-mh.yml`][topo-mh] or [`symm-mlag.yml`][topo-mlag]. See [instructions](/lab-examples/lab-examples/#how-to-deploy-a-lab-from-the-lab-catalog) for how to deploy a topology.
Each configuration option is provided in its own configuration file -- [`symm-mh.clab.yml`][topo-mh] or [`symm-mlag.clab.yml`][topo-mlag]. See [instructions](/lab-examples/lab-examples/#how-to-deploy-a-lab-from-the-lab-catalog) for how to deploy a topology.

Once up, each node can be accessed via ssh using its hostname (automatically populated in your `/etc/hosts` file) and the default credentials `root/root`:

Expand All @@ -34,13 +34,10 @@ Last login: Fri Jul 9 13:35:48 2021 from 192.168.223.1
root@94992c82719f1172:mgmt:~#
```

!!!note
Due to the different boot order inside a container, BGPd may come up stuck waiting for IPv6 LLA of the peer. This issue only appears on the initial boot and can be fixed with the `vtysh -c 'clear ip bgp *` command.


[cvx]: https://www.nvidia.com/en-gb/networking/ethernet-switching/cumulus-vx/
[topo-mh]: https://github.com/srl-labs/containerlab/tree/master/lab-examples/cvx04/symm-mh.yml
[topo-mlag]: https://github.com/srl-labs/containerlab/tree/master/lab-examples/cvx04/symm-mlag.yml
[topo-mh]: https://github.com/srl-labs/containerlab/tree/master/lab-examples/cvx04/symm-mh.clab.yml
[topo-mlag]: https://github.com/srl-labs/containerlab/tree/master/lab-examples/cvx04/symm-mlag.clab.yml

[^1]: Resource requirements are provisional. Consult with the installation guides for additional information.
[^2]: The lab has been validated using these versions of the required tools/components. Using versions other than stated might lead to a non-operational setup process.
Expand Down
6 changes: 3 additions & 3 deletions docs/manual/kinds/cvx.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CVX nodes launched with containerlab comes up with:
CVX supports two modes of operation:

* Using Firecracker micro-VMs -- this mode runs Cumulus VX inside a micro-VM on top of the native Cumulus kernel. This is the default way of running CVX nodes.
* Using only the container runtime -- this mode runs Cumulus VX container image directly inside the container runtime (e.g. Docker). Due to the lack of Cumulus VX kernel modules, some features are not supported, most notable one being MLAG. In order to use this mode add `runtime: docker` under the cvx node definition (see also [this example](https://github.com/srl-labs/containerlab/blob/master/lab-examples/cvx02/topo.yml)).
* Using only the container runtime -- this mode runs Cumulus VX container image directly inside the container runtime (e.g. Docker). Due to the lack of Cumulus VX kernel modules, some features are not supported, most notable one being MLAG. In order to use this mode add `runtime: docker` under the cvx node definition (see also [this example](https://github.com/srl-labs/containerlab/blob/master/lab-examples/cvx02/topo.clab.yml)).


## Managing cvx nodes
Expand Down Expand Up @@ -63,8 +63,8 @@ This will be addressed in the future releases.
## Lab examples
The following labs feature CVX node:

- [Cumulus Linux Test Drive](https://github.com/srl-labs/containerlab/blob/master/lab-examples/cvx03/lab-start.yml)
- [Cumulus and FRR](https://github.com/srl-labs/containerlab/blob/master/lab-examples/cvx01/topo.yml)
- [Cumulus Linux Test Drive](https://github.com/srl-labs/containerlab/blob/master/lab-examples/cvx03/lab-start.clab.yml)
- [Cumulus and FRR](https://github.com/srl-labs/containerlab/blob/master/lab-examples/cvx01/topo.clab.yml)


## Known issues or limitations
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit c6ab761

Please sign in to comment.