From 3242db18ac91d1c673e627dba2df24634695ab81 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Mon, 12 Jun 2023 08:15:13 +0000
Subject: [PATCH] Update deprecated fields in clab along other parameters
See merge request danet/gosdn!477
---
.gitlab-ci.yml | 2 +-
.gitlab/ci/.code-quality-ci.yml | 2 +-
.golangci.yml | 2 +-
.../arista-routing-engine.Dockerfile | 2 +-
applications/venv-manager/containerlab/containerlab.go | 6 +++---
applications/venv-manager/venv-manager.Dockerfile | 2 +-
cli/build/ci/.test.yml | 2 +-
cli/cli.Dockerfile | 2 +-
controller/Dockerfile.debug | 2 +-
controller/controller.Dockerfile | 2 +-
csbi/gnmi-target/gnmitarget.Dockerfile | 2 +-
csbi/resources/Dockerfile | 2 +-
csbi/test.clab.yml | 6 +++---
dev_env_data/clab/basic_two_aristas.yaml | 4 ++--
dev_env_data/clab/demo.clab.yaml | 4 ++--
dev_env_data/clab/gosdn.clab.yaml | 4 ++--
dev_env_data/clab/gosdn_slim.clab.yaml | 4 ++--
lab-vm/vm-with-packer/scripts/setup.sh | 6 +++---
lab-vm/vm-with-vagrant/Vagrantfile | 8 ++++----
19 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b9929324..d274a58b0 100644
--- a/.gitlab-ci.yml
+++ b/.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:
diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index 341bcb6aa..bce2d382e 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -1,5 +1,5 @@
variables:
- GOLANG_VERSION: "1.20.4"
+ GOLANG_VERSION: "1.20.5"
code-quality:
image: golangci/golangci-lint:v1.52.2-alpine
stage: analyze
diff --git a/.golangci.yml b/.golangci.yml
index 7f01e42a8..6951bf00f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,5 @@
variables:
- GOLANG_VERSION: "1.20.4"
+ GOLANG_VERSION: "1.20.5"
run:
go: $GOLANG_VERSION
concurrency: 4
diff --git a/applications/arista-routing-engine/arista-routing-engine.Dockerfile b/applications/arista-routing-engine/arista-routing-engine.Dockerfile
index a634745fc..dcbb7f962 100644
--- a/applications/arista-routing-engine/arista-routing-engine.Dockerfile
+++ b/applications/arista-routing-engine/arista-routing-engine.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/applications/venv-manager/containerlab/containerlab.go b/applications/venv-manager/containerlab/containerlab.go
index 714acbdc5..573df9ea9 100644
--- a/applications/venv-manager/containerlab/containerlab.go
+++ b/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.
diff --git a/applications/venv-manager/venv-manager.Dockerfile b/applications/venv-manager/venv-manager.Dockerfile
index 20f535618..a0e41399c 100644
--- a/applications/venv-manager/venv-manager.Dockerfile
+++ b/applications/venv-manager/venv-manager.Dockerfile
@@ -1,4 +1,4 @@
-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
diff --git a/cli/build/ci/.test.yml b/cli/build/ci/.test.yml
index 58d5a5a6f..efad0a388 100644
--- a/cli/build/ci/.test.yml
+++ b/cli/build/ci/.test.yml
@@ -1,5 +1,5 @@
variables:
- GOLANG_VERSION: "1.20.4"
+ GOLANG_VERSION: "1.20.5"
test:
image: golang:$GOLANG_VERSION
stage: test
diff --git a/cli/cli.Dockerfile b/cli/cli.Dockerfile
index 4083d0ef6..545506e5e 100644
--- a/cli/cli.Dockerfile
+++ b/cli/cli.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/controller/Dockerfile.debug b/controller/Dockerfile.debug
index ded7ae211..a95924d91 100644
--- a/controller/Dockerfile.debug
+++ b/controller/Dockerfile.debug
@@ -1,5 +1,5 @@
# 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
diff --git a/controller/controller.Dockerfile b/controller/controller.Dockerfile
index 090d1fd41..85a92dc86 100644
--- a/controller/controller.Dockerfile
+++ b/controller/controller.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.20.4
+ARG GOLANG_VERSION=1.20.5
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/csbi/gnmi-target/gnmitarget.Dockerfile b/csbi/gnmi-target/gnmitarget.Dockerfile
index ffd050e64..5d8f760f9 100644
--- a/csbi/gnmi-target/gnmitarget.Dockerfile
+++ b/csbi/gnmi-target/gnmitarget.Dockerfile
@@ -1,4 +1,4 @@
-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
diff --git a/csbi/resources/Dockerfile b/csbi/resources/Dockerfile
index fb855579f..4e3437e33 100644
--- a/csbi/resources/Dockerfile
+++ b/csbi/resources/Dockerfile
@@ -1,5 +1,5 @@
# 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
diff --git a/csbi/test.clab.yml b/csbi/test.clab.yml
index 54dc72f33..8d85447e5 100644
--- a/csbi/test.clab.yml
+++ b/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
diff --git a/dev_env_data/clab/basic_two_aristas.yaml b/dev_env_data/clab/basic_two_aristas.yaml
index 36d828adc..690e3a89d 100644
--- a/dev_env_data/clab/basic_two_aristas.yaml
+++ b/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:
diff --git a/dev_env_data/clab/demo.clab.yaml b/dev_env_data/clab/demo.clab.yaml
index 3916a01d7..79bd08fc5 100644
--- a/dev_env_data/clab/demo.clab.yaml
+++ b/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:
diff --git a/dev_env_data/clab/gosdn.clab.yaml b/dev_env_data/clab/gosdn.clab.yaml
index 58c3f2584..7d2f7c33e 100644
--- a/dev_env_data/clab/gosdn.clab.yaml
+++ b/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:
diff --git a/dev_env_data/clab/gosdn_slim.clab.yaml b/dev_env_data/clab/gosdn_slim.clab.yaml
index 6b4b63398..d31f6cd6c 100644
--- a/dev_env_data/clab/gosdn_slim.clab.yaml
+++ b/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:
diff --git a/lab-vm/vm-with-packer/scripts/setup.sh b/lab-vm/vm-with-packer/scripts/setup.sh
index 0cd154094..39018105e 100644
--- a/lab-vm/vm-with-packer/scripts/setup.sh
+++ b/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
diff --git a/lab-vm/vm-with-vagrant/Vagrantfile b/lab-vm/vm-with-vagrant/Vagrantfile
index 2b19abf5c..61d1f9ece 100644
--- a/lab-vm/vm-with-vagrant/Vagrantfile
+++ b/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
--
GitLab