diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b9929324c10a391907551904a0f8c6ad9922fc0..d274a58b03af6558d428456cc6119aa15ef2b48f 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 341bcb6aaab77f08ef51d918a651db8edf86a63a..bce2d382edbe388c9a3bb020602a6aa1af5b2991 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 7f01e42a804106dbec27ca2a5847d09ebd993cbd..6951bf00f310987c08dd7bdd6ad9206219b0a1ee 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 a634745fc632acc973d54eb6536be48d07aabded..dcbb7f9629454212b68773874e6b460ebe7e68b1 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 714acbdc53e257d4a9d724acf20ca10118be9994..573df9ea929c2ca8e8364705cbb27b3be40ece85 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 20f5356185b2d9bf570dc409c696a18a8baaeb60..a0e41399c56f7355af2469cc4f7e9f7b9735b665 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 58d5a5a6f456c28e38038268af85a79919563611..efad0a38837d1b054298c53a4ab2264a52f7869b 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 4083d0ef6ea708d77aa5f9313a1d00c7d511b917..545506e5ea67489f8b4cf6f78b6a6abfcff2d888 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 ded7ae21192dd8d06a48d458ff6c05e7432d7155..a95924d916b03eff06f4d3389000c9afb3311fd8 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 090d1fd41e23aa00bb6b0f2b82c198a1d2cd0e02..85a92dc86baac1547e73fa2585cb7f5ae957d7ae 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 ffd050e646d20eccf2149f359ed30816633dbddd..5d8f760f94d41f5765433834ff18540d0d6b15f2 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 fb855579fd25aaf03a809418aab2bffa89884c56..4e3437e331dac15580fcddd066e8cc6103bee4a4 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 54dc72f33533b2d0d7e5f3f9294e713c8fbd88e7..8d85447e503c8730be197d22629934a1558fb8e1 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 36d828adce376ec571f19d5caa5b4a7920cabc7e..690e3a89ddaddaaa3d794c2d6151ca40a98842bc 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 3916a01d7dc5f79922fe1c7cf6367676ea51cc84..79bd08fc50ad1421008f9191633e4a57ee1bc444 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 58c3f25849ca510f9c11877e3d3037cbdc24a5dc..7d2f7c33ec3160921c6f4ffbbf6190f1c7ae7590 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 6b4b63398013252d8047e532369c8082e67170b1..d31f6cd6c2bf3d2f25960818c6c0c70fb2e0c7ee 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 0cd154094f405bdddc31bfdf1c0ff69d08b4da36..39018105e9e0053baabe8a42a44e8df81a2e3531 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 2b19abf5c4f2a0abfbe16260d96b86d1b11ccd3f..61d1f9ecea7812008bf94202bf347ece36bd883d 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