From 8c208af292c6db5e2171df24a7d95b383068fe44 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Fri, 9 Jun 2023 16:22:29 +0200
Subject: [PATCH] update deprecated fields in clab files and venv manager that
maps those to a struct
---
applications/venv-manager/containerlab/containerlab.go | 4 ++--
cli/test/containerlab/integrationtest.clab.tmpl.yml | 2 +-
cli/test/containerlab/integrationtest_branch.clab.tmpl.yml | 2 +-
controller/test/containerlab/complex-1.0.clab.tmpl.yml | 2 +-
controller/test/containerlab/dev.clab.tmpl.yml | 2 +-
controller/test/containerlab/int01.clab.tmpl.yml | 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 ++--
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/applications/venv-manager/containerlab/containerlab.go b/applications/venv-manager/containerlab/containerlab.go
index 42635a6cf..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.
diff --git a/cli/test/containerlab/integrationtest.clab.tmpl.yml b/cli/test/containerlab/integrationtest.clab.tmpl.yml
index edc8cb659..e94143c5e 100644
--- a/cli/test/containerlab/integrationtest.clab.tmpl.yml
+++ b/cli/test/containerlab/integrationtest.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
mgmt:
network: @@CLAB_NAME@@
- ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+ ipv4-subnet: @@CLAB_MGMT_SUBNET@@
topology:
kinds:
diff --git a/cli/test/containerlab/integrationtest_branch.clab.tmpl.yml b/cli/test/containerlab/integrationtest_branch.clab.tmpl.yml
index 140b6bb0f..40c1e3e21 100644
--- a/cli/test/containerlab/integrationtest_branch.clab.tmpl.yml
+++ b/cli/test/containerlab/integrationtest_branch.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
mgmt:
network: @@CLAB_NAME@@
- ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+ ipv4-subnet: @@CLAB_MGMT_SUBNET@@
topology:
kinds:
diff --git a/controller/test/containerlab/complex-1.0.clab.tmpl.yml b/controller/test/containerlab/complex-1.0.clab.tmpl.yml
index cdec98b88..470f399a8 100644
--- a/controller/test/containerlab/complex-1.0.clab.tmpl.yml
+++ b/controller/test/containerlab/complex-1.0.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
mgmt:
network: @@CLAB_NAME@@
- ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+ ipv4-subnet: @@CLAB_MGMT_SUBNET@@
topology:
nodes:
diff --git a/controller/test/containerlab/dev.clab.tmpl.yml b/controller/test/containerlab/dev.clab.tmpl.yml
index 985bd7539..97602dd09 100644
--- a/controller/test/containerlab/dev.clab.tmpl.yml
+++ b/controller/test/containerlab/dev.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
mgmt:
network: clab-@@CLAB_NAME@@
- ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+ ipv4-subnet: @@CLAB_MGMT_SUBNET@@
topology:
kinds:
diff --git a/controller/test/containerlab/int01.clab.tmpl.yml b/controller/test/containerlab/int01.clab.tmpl.yml
index 10512cce1..89f5900f9 100644
--- a/controller/test/containerlab/int01.clab.tmpl.yml
+++ b/controller/test/containerlab/int01.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
mgmt:
network: @@CLAB_NAME@@
- ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+ ipv4-subnet: @@CLAB_MGMT_SUBNET@@
topology:
kinds:
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:
--
GitLab