From ceef13c5fa6b2987b09bac950321d21eff3bf1c4 Mon Sep 17 00:00:00 2001 From: Fabian Seidl <fabian.seidl@h-da.de> Date: Wed, 9 Aug 2023 14:55:48 +0000 Subject: [PATCH] Resolve "Some of the example config files contain old or unusable values" See merge request danet/gosdn!504 --- controller/config/config.go | 6 ------ controller/configs/containerlab-gosdn.toml.example | 1 - controller/configs/development-gosdn.toml.example | 6 +----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/controller/config/config.go b/controller/config/config.go index 44414b3de..27cb224ff 100644 --- a/controller/config/config.go +++ b/controller/config/config.go @@ -32,12 +32,6 @@ const ( // BasePndUUID is an uuid for the base PND. var BasePndUUID uuid.UUID -// BaseSouthBoundType is the type of the base SBI. -var BaseSouthBoundType int32 - -// BaseSouthBoundUUID is an uuid for the base SBI. -var BaseSouthBoundUUID uuid.UUID - // ChangeTimeout is the default timeout for a change. var ChangeTimeout time.Duration diff --git a/controller/configs/containerlab-gosdn.toml.example b/controller/configs/containerlab-gosdn.toml.example index 0148c1442..1bd7c9fb9 100644 --- a/controller/configs/containerlab-gosdn.toml.example +++ b/controller/configs/containerlab-gosdn.toml.example @@ -1,5 +1,4 @@ basepnduuid = "5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d" -csbi-orchestrator = "clab-gosdn_csbi_arista_base-csbi-orchestrator:55056" plugin-registry = "clab-gosdn_csbi_arista_base-plugin-registry:55057" help = false plugin-folder = "plugins" diff --git a/controller/configs/development-gosdn.toml.example b/controller/configs/development-gosdn.toml.example index beaf1b2c0..2d9dc2ec1 100644 --- a/controller/configs/development-gosdn.toml.example +++ b/controller/configs/development-gosdn.toml.example @@ -4,10 +4,7 @@ amqpport = '5672' amqpprefix = 'amqp://' amqpuser = 'guest' basepnduuid = '5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d' -cli_pnd = '0455b241-5863-4660-ad15-dfde7617738e' -cli_sbi = 'a249f2d2-f7da-481d-8a99-b7f11471e0af' -config = '/home/neil/code/gosdn/controller/configs/development-gosdn.toml' -csbi-orchestrator = 'localhost:55056' +config = './gosdn/controller/configs/development-gosdn.toml' databaseconnection = 'mongodb://root:example@localhost:27017' defaultjwtduration = 24 filesystempathtostores = 'stores' @@ -16,6 +13,5 @@ plugin-registry = "localhost:55057" help = false log-level = 'debug' plugin-folder = 'plugins' -pnduuid = 'bf8160d4-4659-4a1b-98fd-f409a04111ec' security = 'insecure' socket = ':55055' -- GitLab