From a9c223b692b449481f7f80c3dedd99c82ac3c4ce Mon Sep 17 00:00:00 2001
From: Andre Sterba <andre.sterba@stud.h-da.de>
Date: Tue, 23 May 2023 17:41:34 +0000
Subject: [PATCH] Feedback for getting started (again)
See merge request danet/gosdn!473
---
README.md | 2 +-
dev_env_data/clab/basic_two_aristas.yaml | 4 ++--
dev_env_data/clab/demo.clab.yaml | 8 ++++----
dev_env_data/clab/gosdn.clab.yaml | 26 ++++++++++++------------
dev_env_data/clab/gosdn_slim.clab.yaml | 24 +++++++++++-----------
5 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/README.md b/README.md
index 17426aa69..e49610ff6 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Any network element directly configured by `goSDN`
make build
# build the Dockerfiles for goSDN, cSBI orchestrator, gosdnc (CLI).
-make container
+make containerize-all
```
Now you can start `goSDN` locally by moving to the `artifacts` folder and
diff --git a/dev_env_data/clab/basic_two_aristas.yaml b/dev_env_data/clab/basic_two_aristas.yaml
index 642698c61..36d828adc 100644
--- a/dev_env_data/clab/basic_two_aristas.yaml
+++ b/dev_env_data/clab/basic_two_aristas.yaml
@@ -13,11 +13,11 @@ topology:
nodes:
ceos0:
kind: ceos
- mgmt_ipv4: 172.100.0.11
+ mgmt-ipv4: 172.100.0.11
ceos1:
kind: ceos
- mgmt_ipv4: 172.100.0.12
+ mgmt-ipv4: 172.100.0.12
links:
- endpoints: ["ceos0:eth1","ceos1:eth1"]
diff --git a/dev_env_data/clab/demo.clab.yaml b/dev_env_data/clab/demo.clab.yaml
index e69976c56..3916a01d7 100644
--- a/dev_env_data/clab/demo.clab.yaml
+++ b/dev_env_data/clab/demo.clab.yaml
@@ -13,25 +13,25 @@ topology:
nodes:
ceos0:
kind: ceos
- mgmt_ipv4: 172.100.0.11
+ mgmt-ipv4: 172.100.0.11
group: spine
client0:
kind: linux
image: registry.code.fbi.h-da.de/danet/gnmi-target/ubuntu:develop
- mgmt_ipv4: 172.100.0.3
+ mgmt-ipv4: 172.100.0.3
group: server
client1:
kind: linux
image: registry.code.fbi.h-da.de/danet/gnmi-target/ubuntu:develop
- mgmt_ipv4: 172.100.0.4
+ mgmt-ipv4: 172.100.0.4
group: server
client2:
kind: linux
image: registry.code.fbi.h-da.de/danet/gnmi-target/debian:develop
- mgmt_ipv4: 172.100.0.5
+ mgmt-ipv4: 172.100.0.5
group: server
links:
diff --git a/dev_env_data/clab/gosdn.clab.yaml b/dev_env_data/clab/gosdn.clab.yaml
index a6381f0ba..58c3f2584 100644
--- a/dev_env_data/clab/gosdn.clab.yaml
+++ b/dev_env_data/clab/gosdn.clab.yaml
@@ -12,24 +12,24 @@ topology:
nodes:
ceos0:
kind: ceos
- mgmt_ipv4: 172.100.0.11
+ mgmt-ipv4: 172.100.0.11
group: spine
ceos1:
kind: ceos
- mgmt_ipv4: 172.100.0.12
+ mgmt-ipv4: 172.100.0.12
group: spine
centos0:
kind: linux
image: centos:8
- mgmt_ipv4: 172.100.0.3
+ mgmt-ipv4: 172.100.0.3
group: server
centos1:
kind: linux
image: centos:8
- mgmt_ipv4: 172.100.0.4
+ mgmt-ipv4: 172.100.0.4
group: server
gosdn:
@@ -41,7 +41,7 @@ topology:
- 40000:40000
cmd:
--config /app/configs/containerlab-gosdn.toml
- mgmt_ipv4: 172.100.0.5
+ mgmt-ipv4: 172.100.0.5
env:
GOSDN_ADMIN_PASSWORD: TestPassword
@@ -50,12 +50,12 @@ topology:
image: gnmi-target
ports:
- 7030:7030
- mgmt_ipv4: 172.100.0.6
+ mgmt-ipv4: 172.100.0.6
plugin-registry:
kind: linux
image: plugin-registry
- mgmt_ipv4: 172.100.0.16
+ mgmt-ipv4: 172.100.0.16
#csbi-orchestrator:
# kind: linux
@@ -67,7 +67,7 @@ topology:
# - /var/run/docker.sock:/var/run/docker.sock
# - ./csbi/.csbi.yaml:/etc/.csbi.yml
# cmd: --log-level trace --config /etc/.csbi.yml
- # mgmt_ipv4: 172.100.0.7
+ # mgmt-ipv4: 172.100.0.7
grafana:
kind: linux
@@ -76,7 +76,7 @@ topology:
- ../../csbi/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
ports:
- 3000:3000
- mgmt_ipv4: 172.100.0.8
+ mgmt-ipv4: 172.100.0.8
prometheus:
kind: linux
@@ -86,7 +86,7 @@ topology:
binds:
- ../../csbi/prometheus:/etc/prometheus
cmd: --web.enable-lifecycle --config.file=/etc/prometheus/prometheus.yml
- mgmt_ipv4: 172.100.0.9
+ mgmt-ipv4: 172.100.0.9
mongodb:
kind: linux
@@ -96,7 +96,7 @@ topology:
env:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: example
- mgmt_ipv4: 172.100.0.13
+ mgmt-ipv4: 172.100.0.13
mongodb-express:
kind: linux
@@ -107,7 +107,7 @@ topology:
ME_CONFIG_MONGODB_ADMINUSERNAME: root
ME_CONFIG_MONGODB_ADMINPASSWORD: example
ME_CONFIG_MONGODB_SERVER: mongodb
- mgmt_ipv4: 172.100.0.14
+ mgmt-ipv4: 172.100.0.14
rabbitmq:
kind: linux
@@ -115,7 +115,7 @@ topology:
ports:
- 127.0.0.1:5672:5672
- 127.0.0.1:15672:15672
- mgmt_ipv4: 172.100.0.15
+ mgmt-ipv4: 172.100.0.15
links:
- endpoints: ["ceos0:eth1","ceos1:eth1"]
diff --git a/dev_env_data/clab/gosdn_slim.clab.yaml b/dev_env_data/clab/gosdn_slim.clab.yaml
index 8e881bb36..6b4b63398 100644
--- a/dev_env_data/clab/gosdn_slim.clab.yaml
+++ b/dev_env_data/clab/gosdn_slim.clab.yaml
@@ -7,11 +7,11 @@ mgmt:
topology:
nodes:
-
+
plugin-registry:
kind: linux
image: plugin-registry
- mgmt_ipv4: 172.100.0.16
+ mgmt-ipv4: 172.100.0.16
gosdn:
kind: linux
@@ -22,7 +22,7 @@ topology:
- 40000:40000
cmd:
--config /app/configs/containerlab-gosdn.toml
- mgmt_ipv4: 172.100.0.5
+ mgmt-ipv4: 172.100.0.5
env:
GOSDN_ADMIN_PASSWORD: TestPassword
@@ -31,28 +31,28 @@ topology:
image: gnmi-target
ports:
- 7030:7030
- mgmt_ipv4: 172.100.0.11
+ mgmt-ipv4: 172.100.0.11
startup-delay: 5
-
+
gnmi-target-switch1:
kind: linux
image: gnmi-target
ports:
- 7031:7030
- mgmt_ipv4: 172.100.0.12
+ mgmt-ipv4: 172.100.0.12
startup-delay: 5
centos0:
kind: linux
image: centos:8
- mgmt_ipv4: 172.100.0.3
+ mgmt-ipv4: 172.100.0.3
group: server
centos1:
kind: linux
image: centos:8
- mgmt_ipv4: 172.100.0.4
- group: server
+ mgmt-ipv4: 172.100.0.4
+ group: server
mongodb:
kind: linux
@@ -62,7 +62,7 @@ topology:
env:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: example
- mgmt_ipv4: 172.100.0.13
+ mgmt-ipv4: 172.100.0.13
mongodb-express:
kind: linux
@@ -73,7 +73,7 @@ topology:
ME_CONFIG_MONGODB_ADMINUSERNAME: root
ME_CONFIG_MONGODB_ADMINPASSWORD: example
ME_CONFIG_MONGODB_SERVER: mongodb
- mgmt_ipv4: 172.100.0.14
+ mgmt-ipv4: 172.100.0.14
rabbitmq:
kind: linux
@@ -81,7 +81,7 @@ topology:
ports:
- 127.0.0.1:5672:5672
- 127.0.0.1:15672:15672
- mgmt_ipv4: 172.100.0.15
+ mgmt-ipv4: 172.100.0.15
links:
- endpoints: ["gnmi-target-switch0:eth1","gnmi-target-switch1:eth1"]
--
GitLab