From cb7ac6891b12814ef189bb5ad309a792c04e69a9 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.b.seidl@stud.h-da.de>
Date: Thu, 2 Jun 2022 07:20:55 +0000
Subject: [PATCH] Resolve "Config files get changed when running the whole test
set"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
See merge request danet/gosdn!321
Co-authored-by: André Sterba <andre.sterba@stud.h-da.de>
---
.gitignore | 25 ++++++++++++++----
api/.gitignore | 0
controller/.gitignore | 33 ------------------------
controller/config/config_test.toml | 5 ----
controller/configs/ci-testing-gosdn.toml | 3 ---
controller/controller_test.go | 15 +++++++++++
6 files changed, 35 insertions(+), 46 deletions(-)
delete mode 100644 api/.gitignore
delete mode 100644 controller/.gitignore
delete mode 100644 controller/config/config_test.toml
delete mode 100644 controller/configs/ci-testing-gosdn.toml
diff --git a/.gitignore b/.gitignore
index 65899b422..3783bfbc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
# tooling
-build-tools/
+**/build-tools/
artifacts/
# containerlab
@@ -9,6 +9,9 @@ clab-gosdn_csbi_arista_base/
# non vimmers
.vscode/
+# MacOS
+.DS_Store
+
# test artifacts
coverage.out
report.xml
@@ -18,10 +21,22 @@ controller/gosdn
cli/gosdnc
csbi/resources/csbi
-# testing and configs
+# controller
controller/configs/testing-gosdn.toml
controller/configs/development-gosdn.toml
controller/configs/containerlab-gosdn.toml
-**/stores_testing
-
-config/.gosdnc.toml
+controller/config/*_test.toml
+controller/configs/ci-testing-gosdn.toml
+controller/stores_testing
+controller/stores/**
+controller/plugins
+controller/config/.gosdnc.toml
+controller/debug.test
+controller/api/api_test.toml
+controller/report.xml
+controller/test/plugin/**/*.so
+controller/nucleus/util/proto/*_test
+controller/api/stores_testing/**
+controller/northbound/server/stores_testing/**
+controller/nucleus/stores_testing/**
+controller/nucleus/**/gostructs.go
diff --git a/api/.gitignore b/api/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/controller/.gitignore b/controller/.gitignore
deleted file mode 100644
index 2546ae5da..000000000
--- a/controller/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-.vscode/
-.vscode/launch.json
-.DS_Store
-documentation/design-documentation/
-documentation/design/*.pdf
-*.aux
-*.bbl
-*.blg
-*.lof
-*.log
-*.out
-.idea/gosdn.iml
-.idea/modules.xml
-.idea/vcs.xml
-.idea/workspace.xml
-restconf/bin/bin
-test/.terraform.local/
-configs/gosdn.toml
-api/api_test.toml
-debug.test
-
-# developer tools
-build-tools/
-
-# test files
-report.xml
-test/plugin/**/*.so
-nucleus/util/proto/*_test
-
-# persistent data
-**/stores/**
-plugins
-documentation/figures/~$goSDN-Net-Environment.drawio.dtmp
diff --git a/controller/config/config_test.toml b/controller/config/config_test.toml
deleted file mode 100644
index fa96c7490..000000000
--- a/controller/config/config_test.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-basepnduuid = "bf8160d4-4659-4a1b-98fd-f409a04111ec"
-basesouthboundtype = 1
-basesouthbounduuid = "bf8160d4-4659-4a1b-98fd-f409a04111eb"
-databaseconnection = "test@test:test"
-gosdn_change_timeout = "10m"
diff --git a/controller/configs/ci-testing-gosdn.toml b/controller/configs/ci-testing-gosdn.toml
deleted file mode 100644
index d9f542748..000000000
--- a/controller/configs/ci-testing-gosdn.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-basepnduuid = "e3a04432-a5de-4c6a-9d06-cacc0a349b77"
-basesouthboundtype = 1
-basesouthbounduuid = "94f48ae8-6028-4da0-b495-4c554f886366"
diff --git a/controller/controller_test.go b/controller/controller_test.go
index ce8794bb6..5c68530f9 100644
--- a/controller/controller_test.go
+++ b/controller/controller_test.go
@@ -7,6 +7,7 @@ import (
"testing"
"time"
+ "code.fbi.h-da.de/danet/gosdn/controller/config"
"github.com/spf13/viper"
)
@@ -16,7 +17,21 @@ const (
configType string = "toml"
)
+func TestInit(t *testing.T) {
+ viper.SetConfigFile("./configs/ci-testing-gosdn.toml")
+ viper.Set("basePNDUUID", "3e58372e-b53d-41d8-a06e-4131810c8e70")
+ viper.Set("baseSouthBoundType", 1)
+ viper.Set("baseSouthBoundUUID", "73b30205-7ad9-48fb-8251-0dbef649ce01")
+}
+
func TestRun(t *testing.T) {
+ TestInit(t)
+ err := config.InitializeConfig()
+ if err != nil {
+ t.Error(err)
+ return
+ }
+
type args struct {
request string
}
--
GitLab