Merge pull request #524 from srl-labs/rn-0.15.1

Rn 0.15.1
srl-labs · Jul 17, 2021 · aa29d73 · aa29d73
2 parents 6fffae3 + 7eec683
commit aa29d73
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 33 deletions.
diff --git a/cmd/version.go b/cmd/version.go
@@ -44,11 +44,12 @@ var versionCmd = &cobra.Command{
 
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println(slug)
+		verSlug := docsLinkFromVer(version)
 		fmt.Printf("    version: %s\n", version)
 		fmt.Printf("     commit: %s\n", commit)
 		fmt.Printf("       date: %s\n", date)
 		fmt.Printf("     source: %s\n", repoUrl)
-		fmt.Printf(" rel. notes: https://containerlab.srlinux.dev/rn/%s\n", version)
+		fmt.Printf(" rel. notes: https://containerlab.srlinux.dev/rn/%s\n", verSlug)
 	},
 }
 
@@ -85,22 +86,27 @@ func newVerNotification(vc chan string) {
 	select {
 	case ver, ok := <-vc:
 		if ok {
-			v, _ := gover.NewVersion(ver)
-			segments := v.Segments()
-			maj := segments[0]
-			min := segments[1]
-			patch := segments[2]
-
-			// relSlug is the URI path attribute of a given rel version
-			// for 0.15.0 version, the relSlug will be 0.15/
-			// for 0.15.1 - 0.15/#0.15.1
-			relSlug := fmt.Sprintf("%d.%d/", maj, min)
-			if patch != 0 {
-				relSlug = relSlug + fmt.Sprintf("#%d.%d.%d", maj, min, patch)
-			}
-			log.Infof("🎉 New containerlab version %s is available! Release notes: https://containerlab.srlinux.dev/rn/%s\nRun 'containerlab version upgrade' to upgrade or go check other installation options at https://containerlab.srlinux.dev/install/\n", v.String(), relSlug)
+			relSlug := docsLinkFromVer(ver)
+			log.Infof("🎉 New containerlab version %s is available! Release notes: https://containerlab.srlinux.dev/rn/%s\nRun 'containerlab version upgrade' to upgrade or go check other installation options at https://containerlab.srlinux.dev/install/\n", ver, relSlug)
 		}
 	default:
 		return
 	}
 }
+
+// docsLinkFromVer creates a documentation path attribute for a given version
+// for 0.15.0 version, the it returns 0.15/
+// for 0.15.1 - 0.15/#0.15.1
+func docsLinkFromVer(ver string) string {
+	v, _ := gover.NewVersion(ver)
+	segments := v.Segments()
+	maj := segments[0]
+	min := segments[1]
+	patch := segments[2]
+
+	relSlug := fmt.Sprintf("%d.%d/", maj, min)
+	if patch != 0 {
+		relSlug = relSlug + fmt.Sprintf("#%d.%d.%d", maj, min, patch)
+	}
+	return relSlug
+}
diff --git a/docs/lab-examples/cvx03.md b/docs/lab-examples/cvx03.md
@@ -1,16 +1,16 @@
-|                               |                                                                                          |
-| ----------------------------- | ---------------------------------------------------------------------------------------- |
-| **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.clab.yml][topofile] <br/>[lab-final.clab.yml][finalfile]                                                                     |
-| **Name**                      | cvx03                                                                                    |
-| **Version information**[^2]   | `cvx:4.3.0` `docker-ce:19.03.13`                                                         |
+|                               |                                                                      |
+| ----------------------------- | -------------------------------------------------------------------- |
+| **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.clab.yml][topofile] <br/>[lab-final.clab.yml][finalfile]  |
+| **Name**                      | cvx03                                                                |
+| **Version information**[^2]   | `cvx:4.3.0` `docker-ce:19.03.13`                                     |
 
 ## Description
 The lab is a 5-node topology with 2 servers attached to a pair of leaf switches and a single spine switch. 
 
-<div class="mxgraph" style="max-width:100%;border:1px solid transparent;margin:0 auto; display:block;" data-mxgraph="{&quot;page&quot;:1,&quot;zoom&quot;:1.5,&quot;highlight&quot;:&quot;#0000ff&quot;,&quot;nav&quot;:true,&quot;check-visible-state&quot;:true,&quot;resize&quot;:true,&quot;url&quot;:&quot;https://raw.githubusercontent.com/srl-labs/containerlab/diagrams/cvx.drawio&quot;}"></div>
+<div class="mxgraph" style="max-width:100%;border:1px solid transparent;margin:0 auto; display:block;" data-mxgraph="{&quot;page&quot;:0,&quot;zoom&quot;:1.5,&quot;highlight&quot;:&quot;#0000ff&quot;,&quot;nav&quot;:true,&quot;check-visible-state&quot;:true,&quot;resize&quot;:true,&quot;url&quot;:&quot;https://raw.githubusercontent.com/srl-labs/containerlab/diagrams/cvx.drawio&quot;}"></div>
 
 ## Use cases
 This is a "Cumulus Test Drive" topology designed to provide an overview of NVIDIA Cumulus Linux. It can be used together with a series of [self-paced hands-on labs](https://resource.nvidia.com/en-us-linux-lab-guide/linux-lab-guide):

diff --git a/docs/lab-examples/cvx04.md b/docs/lab-examples/cvx04.md
@@ -1,17 +1,17 @@
-|                               |                                                                                          |
-| ----------------------------- | ---------------------------------------------------------------------------------------- |
-| **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.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`                                                         |
+|                               |                                                                      |
+| ----------------------------- | -------------------------------------------------------------------- |
+| **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.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`                                     |
 
 ## Description
 The lab is a multi-node topology that consists of two racks with two dual-homed servers connected with a leaf-spine network.
 
 
-<div class="mxgraph" style="max-width:100%;border:1px solid transparent;margin:0 auto; display:block;" data-mxgraph="{&quot;page&quot;:2,&quot;zoom&quot;:1.5,&quot;highlight&quot;:&quot;#0000ff&quot;,&quot;nav&quot;:true,&quot;check-visible-state&quot;:true,&quot;resize&quot;:true,&quot;url&quot;:&quot;https://raw.githubusercontent.com/srl-labs/containerlab/diagrams/cvx.drawio&quot;}"></div>
+<div class="mxgraph" style="max-width:100%;border:1px solid transparent;margin:0 auto; display:block;" data-mxgraph="{&quot;page&quot;:1,&quot;zoom&quot;:1.5,&quot;highlight&quot;:&quot;#0000ff&quot;,&quot;nav&quot;:true,&quot;check-visible-state&quot;:true,&quot;resize&quot;:true,&quot;url&quot;:&quot;https://raw.githubusercontent.com/srl-labs/containerlab/diagrams/cvx.drawio&quot;}"></div>
 
 ## Use cases
 This is a "Cumulus In The Cloud" topology designed to demonstrate some of the advanced features of Cumulus Linux. It is based on the [original CITC demo environment](https://www.nvidia.com/en-gb/networking/network-simulation/) with the only exception being the reduced number of spine switches (2 instead of 4). The topology can be spun up fully provisioned with the following two configuration options:

diff --git a/docs/rn/0.15.md b/docs/rn/0.15.md
@@ -37,7 +37,11 @@ With that in mind we launched the containerlab's own [discord server](https://di
 * a new [`--keep-mgmt-net`](../cmd/destroy.md#keep-mgmt-net) flag has been added to `destroy` command to prevent the management network deletion attempt
 * the MTU on the veth links created between the containers has been lowered to 9500 from its original 65000 value
 
+## Patches
 
+### 0.15.1
+* Fixed directories creation for `ignite` runtimes
+* Fixed release notes links in `containerlab version` command
 
 [^1]: as opposed to a VM-way by running Cumulus with [vrnetlab](../manual/vrnetlab.md)
 [^2]: both with `ignite` runtime or `docker` runtime