From d47b4ec01953e4c77ab410d2ba4ed0f40cb5fe7f Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <mail@manuelkieweg.de>
Date: Wed, 3 Mar 2021 18:22:14 +0000
Subject: [PATCH] temp move because of import loop
---
cmd/gosdn/main.go | 3 +--
{test => nucleus}/integration.go | 13 ++++++-------
2 files changed, 7 insertions(+), 9 deletions(-)
rename {test => nucleus}/integration.go (79%)
diff --git a/cmd/gosdn/main.go b/cmd/gosdn/main.go
index a50c2b2d3..f6f6c8ee2 100644
--- a/cmd/gosdn/main.go
+++ b/cmd/gosdn/main.go
@@ -2,7 +2,6 @@ package main
import (
"code.fbi.h-da.de/cocsn/gosdn/nucleus"
- "code.fbi.h-da.de/cocsn/gosdn/test"
log "github.com/sirupsen/logrus"
"os"
)
@@ -21,6 +20,6 @@ func main() {
if !integrationTest {
nucleus.StartAndRun(IsRunningChannel)
} else {
- test.IntegrationTests()
+ nucleus.IntegrationTests()
}
}
diff --git a/test/integration.go b/nucleus/integration.go
similarity index 79%
rename from test/integration.go
rename to nucleus/integration.go
index 84dc96b6c..90763e683 100644
--- a/test/integration.go
+++ b/nucleus/integration.go
@@ -1,8 +1,7 @@
-package test
+package nucleus
import (
"code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
"context"
"github.com/google/uuid"
gpb "github.com/openconfig/gnmi/proto/gnmi"
@@ -11,15 +10,15 @@ import (
)
func IntegrationTests() {
- sbi := &nucleus.OpenConfig{}
- device := &nucleus.Device{
+ sbi := &OpenConfig{}
+ device := &Device{
GoStruct: sbi.Schema().Root,
SBI: sbi,
- Config: nucleus.DeviceConfig{
+ Config: DeviceConfig{
Uuid: uuid.New(),
},
}
- pnd, err := nucleus.NewPND("openconfig", "test description", sbi)
+ pnd, err := NewPND("openconfig", "test description", sbi)
if err != nil {
log.Fatal(err)
}
@@ -33,7 +32,7 @@ func IntegrationTests() {
Password: "admin",
Encoding: gpb.Encoding_JSON_IETF,
}
- transport, err := nucleus.NewGnmiTransport(cfg)
+ transport, err := NewGnmiTransport(cfg)
if err != nil {
log.Fatal(err)
}
--
GitLab