From 1a89f4c1216455fa7db1029971c740f75caf103b Mon Sep 17 00:00:00 2001
From: Malte Bauch <malte.bauch@stud.h-da.de>
Date: Mon, 12 Oct 2020 12:58:15 +0200
Subject: [PATCH] moved internal libraries back into root
---
cmd/gosdn-cli/main.go | 2 +-
cmd/gosdn/main.go | 4 ++--
{internal/database => database}/client.go | 2 +-
{internal/log => log}/logger.go | 0
{internal/log => log}/loglevel.go | 0
{internal/nucleus => nucleus}/cli-handling.go | 4 ++--
{internal/nucleus => nucleus}/controller.go | 8 ++++----
{internal/nucleus => nucleus}/interfaces/client.go | 0
{internal/nucleus => nucleus}/interfaces/clientConfig.go | 0
{internal/nucleus => nucleus}/nucleus-core.go | 6 +++---
{internal => sbi}/restconf/client/ciena/client.go | 8 ++++----
{internal => sbi}/restconf/util/unmarshal.go | 0
12 files changed, 17 insertions(+), 17 deletions(-)
rename {internal/database => database}/client.go (99%)
rename {internal/log => log}/logger.go (100%)
rename {internal/log => log}/loglevel.go (100%)
rename {internal/nucleus => nucleus}/cli-handling.go (95%)
rename {internal/nucleus => nucleus}/controller.go (92%)
rename {internal/nucleus => nucleus}/interfaces/client.go (100%)
rename {internal/nucleus => nucleus}/interfaces/clientConfig.go (100%)
rename {internal/nucleus => nucleus}/nucleus-core.go (81%)
rename {internal => sbi}/restconf/client/ciena/client.go (93%)
rename {internal => sbi}/restconf/util/unmarshal.go (100%)
diff --git a/cmd/gosdn-cli/main.go b/cmd/gosdn-cli/main.go
index 9c8875cc6..7d5fba138 100644
--- a/cmd/gosdn-cli/main.go
+++ b/cmd/gosdn-cli/main.go
@@ -2,7 +2,7 @@ package main
import (
pb "code.fbi.h-da.de/cocsn/gosdn/api/proto"
- "code.fbi.h-da.de/cocsn/gosdn/internal/log"
+ "code.fbi.h-da.de/cocsn/gosdn/log"
"context"
"flag"
"fmt"
diff --git a/cmd/gosdn/main.go b/cmd/gosdn/main.go
index e80e9b0ae..800252d80 100644
--- a/cmd/gosdn/main.go
+++ b/cmd/gosdn/main.go
@@ -1,8 +1,8 @@
package main
import (
- "code.fbi.h-da.de/cocsn/gosdn/internal/log"
- "code.fbi.h-da.de/cocsn/gosdn/internal/nucleus"
+ "code.fbi.h-da.de/cocsn/gosdn/log"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus"
"flag"
"log/syslog"
)
diff --git a/internal/database/client.go b/database/client.go
similarity index 99%
rename from internal/database/client.go
rename to database/client.go
index 35ed1bd39..69efde8c3 100644
--- a/internal/database/client.go
+++ b/database/client.go
@@ -1,7 +1,7 @@
package database
import (
- "code.fbi.h-da.de/cocsn/gosdn/internal/log"
+ "code.fbi.h-da.de/cocsn/gosdn/log"
"errors"
"github.com/neo4j/neo4j-go-driver/neo4j"
)
diff --git a/internal/log/logger.go b/log/logger.go
similarity index 100%
rename from internal/log/logger.go
rename to log/logger.go
diff --git a/internal/log/loglevel.go b/log/loglevel.go
similarity index 100%
rename from internal/log/loglevel.go
rename to log/loglevel.go
diff --git a/internal/nucleus/cli-handling.go b/nucleus/cli-handling.go
similarity index 95%
rename from internal/nucleus/cli-handling.go
rename to nucleus/cli-handling.go
index 7e4c4824b..5296e0e00 100644
--- a/internal/nucleus/cli-handling.go
+++ b/nucleus/cli-handling.go
@@ -8,8 +8,8 @@ package nucleus
import (
pb "code.fbi.h-da.de/cocsn/gosdn/api/proto"
- "code.fbi.h-da.de/cocsn/gosdn/internal/log"
- "code.fbi.h-da.de/cocsn/gosdn/internal/restconf/client/ciena"
+ "code.fbi.h-da.de/cocsn/gosdn/log"
+ "code.fbi.h-da.de/cocsn/gosdn/sbi/restconf/client/ciena"
"context"
"google.golang.org/grpc"
"net"
diff --git a/internal/nucleus/controller.go b/nucleus/controller.go
similarity index 92%
rename from internal/nucleus/controller.go
rename to nucleus/controller.go
index 594c3782d..5072dfbbd 100644
--- a/internal/nucleus/controller.go
+++ b/nucleus/controller.go
@@ -1,10 +1,10 @@
package nucleus
import (
- "code.fbi.h-da.de/cocsn/gosdn/internal/database"
- "code.fbi.h-da.de/cocsn/gosdn/internal/log"
- "code.fbi.h-da.de/cocsn/gosdn/internal/nucleus/interfaces"
- "code.fbi.h-da.de/cocsn/gosdn/internal/restconf/client/ciena"
+ "code.fbi.h-da.de/cocsn/gosdn/database"
+ "code.fbi.h-da.de/cocsn/gosdn/log"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces"
+ "code.fbi.h-da.de/cocsn/gosdn/sbi/restconf/client/ciena"
"github.com/BurntSushi/toml"
"os"
)
diff --git a/internal/nucleus/interfaces/client.go b/nucleus/interfaces/client.go
similarity index 100%
rename from internal/nucleus/interfaces/client.go
rename to nucleus/interfaces/client.go
diff --git a/internal/nucleus/interfaces/clientConfig.go b/nucleus/interfaces/clientConfig.go
similarity index 100%
rename from internal/nucleus/interfaces/clientConfig.go
rename to nucleus/interfaces/clientConfig.go
diff --git a/internal/nucleus/nucleus-core.go b/nucleus/nucleus-core.go
similarity index 81%
rename from internal/nucleus/nucleus-core.go
rename to nucleus/nucleus-core.go
index 4d0839d6e..0276a4ad8 100644
--- a/internal/nucleus/nucleus-core.go
+++ b/nucleus/nucleus-core.go
@@ -1,9 +1,9 @@
package nucleus
import (
- "code.fbi.h-da.de/cocsn/gosdn/internal/database"
- "code.fbi.h-da.de/cocsn/gosdn/internal/log"
- "code.fbi.h-da.de/cocsn/gosdn/internal/nucleus/interfaces"
+ "code.fbi.h-da.de/cocsn/gosdn/database"
+ "code.fbi.h-da.de/cocsn/gosdn/log"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces"
"time"
)
diff --git a/internal/restconf/client/ciena/client.go b/sbi/restconf/client/ciena/client.go
similarity index 93%
rename from internal/restconf/client/ciena/client.go
rename to sbi/restconf/client/ciena/client.go
index 9d7aa3e31..6e9a772c9 100644
--- a/internal/restconf/client/ciena/client.go
+++ b/sbi/restconf/client/ciena/client.go
@@ -2,10 +2,10 @@ package ciena
import (
"bytes"
- "code.fbi.h-da.de/cocsn/gosdn/internal/database"
- "code.fbi.h-da.de/cocsn/gosdn/internal/log"
- "code.fbi.h-da.de/cocsn/gosdn/internal/nucleus/interfaces"
- "code.fbi.h-da.de/cocsn/gosdn/internal/restconf/util"
+ "code.fbi.h-da.de/cocsn/gosdn/database"
+ "code.fbi.h-da.de/cocsn/gosdn/log"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces"
+ "code.fbi.h-da.de/cocsn/gosdn/sbi/restconf/util"
apiclient "code.fbi.h-da.de/cocsn/swagger/apis/mcp/client"
"crypto/tls"
"github.com/go-openapi/runtime"
diff --git a/internal/restconf/util/unmarshal.go b/sbi/restconf/util/unmarshal.go
similarity index 100%
rename from internal/restconf/util/unmarshal.go
rename to sbi/restconf/util/unmarshal.go
--
GitLab