Update deprecated fields in clab along other parameters

See merge request !477

.gitlab-ci.yml

@@ -2,7 +2,7 @@ variables:
     GOSDN_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
     GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}"
     CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F"
-    GOLANG_VERSION: "1.20.4"
+    GOLANG_VERSION: "1.20.5"
 
 workflow:
   rules:

.gitlab/ci/.code-quality-ci.yml

 variables:
-    GOLANG_VERSION: "1.20.4"
+    GOLANG_VERSION: "1.20.5"
 code-quality:
     image: golangci/golangci-lint:v1.52.2-alpine
     stage: analyze

.golangci.yml

 variables:
-    GOLANG_VERSION: "1.20.4"
+    GOLANG_VERSION: "1.20.5"
 run:
     go: $GOLANG_VERSION
     concurrency: 4

applications/arista-routing-engine/arista-routing-engine.Dockerfile

-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
 ARG BUILDARGS
 ARG $GITLAB_PROXY
 

applications/venv-manager/containerlab/containerlab.go

@@ -3,8 +3,8 @@ package containerlab
 // Management represents the management part for containerlab.
 type Management struct {
 	Network    string `yaml:"network,omitempty"`
-	Ipv4Subnet string `yaml:"ipv4_subnet,omitempty"`
-	Ipv6Subnet string `yaml:"ipv6_subnet,omitempty"`
+	Ipv4Subnet string `yaml:"ipv4-subnet,omitempty"`
+	Ipv6Subnet string `yaml:"ipv6-subnet,omitempty"`
 }
 
 // Link represents a link for containerlab.
@@ -16,7 +16,7 @@ type Link struct {
 type Node struct {
 	Kind     string `yaml:"kind"`
 	Image    string `yaml:"image"`
-	MgmtIpv4 string `yaml:"mgmt_ipv4"`
+	MgmtIpv4 string `yaml:"mgmt-ipv4"`
 }
 
 // Topology represent a topology for containerlab.

applications/venv-manager/venv-manager.Dockerfile

-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
 ARG BUILDARGS
 ARG $GITLAB_PROXY=code.fbi.h-da.de:443/danet/dependency_proxy/containers
 

cli/build/ci/.test.yml

 variables:
-    GOLANG_VERSION: "1.20.4"
+    GOLANG_VERSION: "1.20.5"
 test:
     image: golang:$GOLANG_VERSION
     stage: test

cli/cli.Dockerfile

-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
 ARG BUILDARGS
 ARG $GITLAB_PROXY
 

controller/Dockerfile.debug

 # syntax = docker/dockerfile:1.2
-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
 FROM golang:$GOLANG_VERSION-alpine AS builder
 ARG GITLAB_USER
 ARG GITLAB_TOKEN

controller/controller.Dockerfile

-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
 ARG BUILDARGS
 ARG $GITLAB_PROXY
 

csbi/gnmi-target/gnmitarget.Dockerfile

-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
 FROM golang:$GOLANG_VERSION-alpine
 RUN go install github.com/google/gnxi/gnmi_target@latest
 RUN wget https://raw.githubusercontent.com/google/gnxi/master/gnmi_target/openconfig-openflow.json

csbi/resources/Dockerfile

 # syntax = docker/dockerfile:1.2
-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
 FROM golang:$GOLANG_VERSION-alpine AS installer
 ARG GITLAB_USER
 ARG GITLAB_TOKEN

csbi/test.clab.yml

@@ -2,8 +2,8 @@ name: thesis
 
 mgmt:
   network: testbed
-  ipv4_subnet: 172.100.0.0/16       # ipv4 range
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16       # ipv4 range
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   nodes:
@@ -33,4 +33,4 @@ topology:
       cmd: --csbi-orchestrator clab-thesis-orchestrator:55056
     ceos:
       kind: ceos
-      image: registry.code.fbi.h-da.de/danet/gosdn/controller/ceos
\ No newline at end of file
+      image: registry.code.fbi.h-da.de/danet/gosdn/controller/ceos

dev_env_data/clab/basic_two_aristas.yaml

@@ -2,8 +2,8 @@ name: gosdn_sts_demo_basic
 
 mgmt:
   network: gosdn-net
-  ipv4_subnet: 172.100.0.0/16
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   kinds:

dev_env_data/clab/demo.clab.yaml

@@ -2,8 +2,8 @@ name: gosdn_sts_demo
 
 mgmt:
   network: gosdn-net
-  ipv4_subnet: 172.100.0.0/16
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   kinds:

dev_env_data/clab/gosdn.clab.yaml

@@ -2,8 +2,8 @@ name: gosdn_csbi_arista_base
 
 mgmt:
   network: gosdn-csbi-arista-base-net
-  ipv4_subnet: 172.100.0.0/16
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   kinds:

dev_env_data/clab/gosdn_slim.clab.yaml

@@ -2,8 +2,8 @@ name: gosdn_csbi_arista_base
 
 mgmt:
   network: gosdn-csbi-arista-base-net
-  ipv4_subnet: 172.100.0.0/16
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   nodes:

lab-vm/vm-with-packer/scripts/setup.sh

@@ -5,9 +5,9 @@ sudo apt update
 sudo apt upgrade -y
 
 # Install go
-wget https://go.dev/dl/go1.20.4.linux-amd64.tar.gz
-sudo tar -C /usr/local/ -xzf go1.20.4.linux-amd64.tar.gz
-rm go1.20.4.linux-amd64.tar.gz
+wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz
+sudo tar -C /usr/local/ -xzf go1.20.5.linux-amd64.tar.gz
+rm go1.20.5.linux-amd64.tar.gz
 echo "export PATH=$PATH:/usr/local/go/bin" >>/home/gosdn/.profile
 echo "export GOPATH=$HOME/go " >>/home/gosdn/.profile
 source /home/gosdn/.profile

lab-vm/vm-with-vagrant/Vagrantfile

@@ -37,9 +37,9 @@ Vagrant.configure(2) do |config|
     zip
     apt-get autoremove -y
     ####### installing go #######
-    wget https://go.dev/dl/go1.20.4.linux-amd64.tar.gz
-    rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.4.linux-amd64.tar.gz
-    rm go1.20.4.linux-amd64.tar.gz
+    wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz
+    rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.5.linux-amd64.tar.gz
+    rm go1.20.5.linux-amd64.tar.gz
     echo 'export PATH=$PATH:/usr/local/go/bin' >> /home/vagrant/.profile
     echo 'export GOPATH=$HOME/go' >> /home/vagrant/.profile
     source /home/vagrant/.profile
@@ -67,4 +67,4 @@ Vagrant.configure(2) do |config|
     su - vagrant -c "cd gnmi-target && docker build -f target.Dockerfile ."
     su - vagrant -c "cd gnmi-target && make container"
   SHELL
-end
\ No newline at end of file
+end