From 54ee1486b7145058c33f35d8e8993517e1409c48 Mon Sep 17 00:00:00 2001 From: Dennis Fanshaw <64549250+hyposcaler-bot@users.noreply.github.com> Date: Sat, 2 Nov 2024 20:44:55 +0000 Subject: [PATCH 1/3] updates for configure.sh used in templated labs --- docs/lab-examples/templated02.md | 5 +++++ lab-examples/templated01/configure.sh | 2 +- lab-examples/templated02/configure.sh | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/lab-examples/templated02.md b/docs/lab-examples/templated02.md index fdfd42911..6020b3ce1 100644 --- a/docs/lab-examples/templated02.md +++ b/docs/lab-examples/templated02.md @@ -57,6 +57,11 @@ Run `configure.sh` script to configure the lab bash configure.sh ``` +The `configure.sh` script relies on [gomplate](https://docs.gomplate.ca) and [gnmic](https://gnmic.kmrd.dev). + +- [gomplate](https://docs.gomplate.ca) is used to generate the necessary configuration variables based on the number of spines and leaves, their type and prefix. +- [gnmic](https://gnmic.kmrd.dev) is used to generate configuration payloads per node and push it using a gNMI Set RPC. + [srl]: https://www.nokia.com/networks/products/service-router-linux-NOS/ [topofile]: https://github.com/srl-labs/containerlab/tree/main/lab-examples/templated01/templated01.clab.gotmpl [topovarfile]: https://github.com/srl-labs/containerlab/tree/main/lab-examples/templated01/templated01.clab_vars.yaml diff --git a/lab-examples/templated01/configure.sh b/lab-examples/templated01/configure.sh index 616b19638..e737d13ad 100755 --- a/lab-examples/templated01/configure.sh +++ b/lab-examples/templated01/configure.sh @@ -13,7 +13,7 @@ curl --help >/dev/null gomplate -f topology_config.gotmpl -d templated01.clab_vars.yaml >vars.yaml # build targets string -targets=$(docker ps -f label=clab-node-kind=srl -f label=containerlab=templated01 --format {{.Names}} | paste -s -d, -) +targets=$(docker ps -f label=clab-node-kind=nokia_srlinux -f label=containerlab=templated01 --format {{.Names}} | paste -s -d, -) # base gnmic command gnmic_cmd="gnmic --log -a ${targets} --skip-verify -u admin -p NokiaSrl1!" diff --git a/lab-examples/templated02/configure.sh b/lab-examples/templated02/configure.sh index 14dc9037c..065831909 100755 --- a/lab-examples/templated02/configure.sh +++ b/lab-examples/templated02/configure.sh @@ -13,9 +13,9 @@ curl --help >/dev/null gomplate -f topology_config.gotmpl -d templated02.clab_vars.yaml >vars.yaml # build targets string -targets=$(docker ps -f label=clab-node-kind=srl -f label=containerlab=templated02 --format {{.Names}} | paste -s -d, -) +targets=$(docker ps -f label=clab-node-kind=nokia_srlinux -f label=containerlab=templated02 --format {{.Names}} | paste -s -d, -) # base gnmic command -gnmic_cmd="gnmic --log -a ${targets} --skip-verify -u admin -p admin" +gnmic_cmd="gnmic --log -a ${targets} --skip-verify -u admin -p NokiaSrl1!" curl -sLO https://raw.githubusercontent.com/karimra/gnmic/main/examples/set-request-templates/Nokia/SRL/1.interfaces/interfaces_template.gotmpl curl -sLO https://raw.githubusercontent.com/karimra/gnmic/main/examples/set-request-templates/Nokia/SRL/1.interfaces/subinterfaces_template.gotmpl From 537911ae39b847569e1679cfe487e9b0d6ccc73d Mon Sep 17 00:00:00 2001 From: Roman Dodin Date: Sun, 3 Nov 2024 06:16:15 +0100 Subject: [PATCH 2/3] fix gnmic url --- docs/lab-examples/templated02.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/lab-examples/templated02.md b/docs/lab-examples/templated02.md index 6020b3ce1..c56f974a3 100644 --- a/docs/lab-examples/templated02.md +++ b/docs/lab-examples/templated02.md @@ -57,10 +57,10 @@ Run `configure.sh` script to configure the lab bash configure.sh ``` -The `configure.sh` script relies on [gomplate](https://docs.gomplate.ca) and [gnmic](https://gnmic.kmrd.dev). +The `configure.sh` script relies on [gomplate](https://docs.gomplate.ca) and [gnmic](https://gnmic.openconfig.dev). - [gomplate](https://docs.gomplate.ca) is used to generate the necessary configuration variables based on the number of spines and leaves, their type and prefix. -- [gnmic](https://gnmic.kmrd.dev) is used to generate configuration payloads per node and push it using a gNMI Set RPC. +- [gnmic](https://gnmic.openconfig.dev) is used to generate configuration payloads per node and push it using a gNMI Set RPC. [srl]: https://www.nokia.com/networks/products/service-router-linux-NOS/ [topofile]: https://github.com/srl-labs/containerlab/tree/main/lab-examples/templated01/templated01.clab.gotmpl From 78f22920bdaee023e3c2efce3f2983f020183d5f Mon Sep 17 00:00:00 2001 From: Roman Dodin Date: Sun, 3 Nov 2024 06:16:51 +0100 Subject: [PATCH 3/3] Update templated02.md --- docs/lab-examples/templated02.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/lab-examples/templated02.md b/docs/lab-examples/templated02.md index c56f974a3..ab75344e5 100644 --- a/docs/lab-examples/templated02.md +++ b/docs/lab-examples/templated02.md @@ -57,10 +57,10 @@ Run `configure.sh` script to configure the lab bash configure.sh ``` -The `configure.sh` script relies on [gomplate](https://docs.gomplate.ca) and [gnmic](https://gnmic.openconfig.dev). +The `configure.sh` script relies on [gomplate](https://docs.gomplate.ca) and [gnmic](https://gnmic.openconfig.net). - [gomplate](https://docs.gomplate.ca) is used to generate the necessary configuration variables based on the number of spines and leaves, their type and prefix. -- [gnmic](https://gnmic.openconfig.dev) is used to generate configuration payloads per node and push it using a gNMI Set RPC. +- [gnmic](https://gnmic.openconfig.net) is used to generate configuration payloads per node and push it using a gNMI Set RPC. [srl]: https://www.nokia.com/networks/products/service-router-linux-NOS/ [topofile]: https://github.com/srl-labs/containerlab/tree/main/lab-examples/templated01/templated01.clab.gotmpl