From 9a2edcdcdb6db6f29c204c047954be106a0d5946 Mon Sep 17 00:00:00 2001
From: Malte Bauch <malte.bauch@stud.h-da.de>
Date: Fri, 9 Oct 2020 16:41:55 +0200
Subject: [PATCH] refactored core of gosdn
---
{cliInterface => api/proto}/gosdnCLI.pb.go | 0
{cliInterface => api/proto}/gosdnCLI.proto | 0
{cliInterface => api/proto}/gosdnCLI_grpc.pb.go | 0
gosdn-cli/gosdn-cli.go => cmd/gosdn-cli/main.go | 4 ++--
main.go => cmd/gosdn/main.go | 4 ++--
clients.toml => configs/clients.toml | 0
gosdn.toml => configs/gosdn.toml | 2 +-
database/database.go => internal/database/client.go | 2 +-
{log => internal/log}/logger.go | 0
{log => internal/log}/loglevel.go | 0
{nucleus => internal/nucleus}/cli-handling.go | 6 +++---
{nucleus => internal/nucleus}/controller.go | 12 ++++++------
{nucleus => internal/nucleus}/interfaces/client.go | 0
.../nucleus}/interfaces/clientConfig.go | 0
{nucleus => internal/nucleus}/nucleus-core.go | 6 +++---
.../restconf}/client/ciena/client.go | 8 ++++----
{restconf => internal/restconf}/util/unmarshal.go | 0
17 files changed, 22 insertions(+), 22 deletions(-)
rename {cliInterface => api/proto}/gosdnCLI.pb.go (100%)
rename {cliInterface => api/proto}/gosdnCLI.proto (100%)
rename {cliInterface => api/proto}/gosdnCLI_grpc.pb.go (100%)
rename gosdn-cli/gosdn-cli.go => cmd/gosdn-cli/main.go (98%)
rename main.go => cmd/gosdn/main.go (90%)
rename clients.toml => configs/clients.toml (100%)
rename gosdn.toml => configs/gosdn.toml (71%)
rename database/database.go => internal/database/client.go (99%)
rename {log => internal/log}/logger.go (100%)
rename {log => internal/log}/loglevel.go (100%)
rename {nucleus => internal/nucleus}/cli-handling.go (93%)
rename {nucleus => internal/nucleus}/controller.go (89%)
rename {nucleus => internal/nucleus}/interfaces/client.go (100%)
rename {nucleus => internal/nucleus}/interfaces/clientConfig.go (100%)
rename {nucleus => internal/nucleus}/nucleus-core.go (81%)
rename {restconf => internal/restconf}/client/ciena/client.go (93%)
rename {restconf => internal/restconf}/util/unmarshal.go (100%)
diff --git a/cliInterface/gosdnCLI.pb.go b/api/proto/gosdnCLI.pb.go
similarity index 100%
rename from cliInterface/gosdnCLI.pb.go
rename to api/proto/gosdnCLI.pb.go
diff --git a/cliInterface/gosdnCLI.proto b/api/proto/gosdnCLI.proto
similarity index 100%
rename from cliInterface/gosdnCLI.proto
rename to api/proto/gosdnCLI.proto
diff --git a/cliInterface/gosdnCLI_grpc.pb.go b/api/proto/gosdnCLI_grpc.pb.go
similarity index 100%
rename from cliInterface/gosdnCLI_grpc.pb.go
rename to api/proto/gosdnCLI_grpc.pb.go
diff --git a/gosdn-cli/gosdn-cli.go b/cmd/gosdn-cli/main.go
similarity index 98%
rename from gosdn-cli/gosdn-cli.go
rename to cmd/gosdn-cli/main.go
index bc6763c5b..9c8875cc6 100644
--- a/gosdn-cli/gosdn-cli.go
+++ b/cmd/gosdn-cli/main.go
@@ -1,8 +1,8 @@
package main
import (
- pb "code.fbi.h-da.de/cocsn/gosdn/cliInterface"
- "code.fbi.h-da.de/cocsn/gosdn/log"
+ pb "code.fbi.h-da.de/cocsn/gosdn/api/proto"
+ "code.fbi.h-da.de/cocsn/gosdn/internal/log"
"context"
"flag"
"fmt"
diff --git a/main.go b/cmd/gosdn/main.go
similarity index 90%
rename from main.go
rename to cmd/gosdn/main.go
index 800252d80..e80e9b0ae 100644
--- a/main.go
+++ b/cmd/gosdn/main.go
@@ -1,8 +1,8 @@
package main
import (
- "code.fbi.h-da.de/cocsn/gosdn/log"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ "code.fbi.h-da.de/cocsn/gosdn/internal/log"
+ "code.fbi.h-da.de/cocsn/gosdn/internal/nucleus"
"flag"
"log/syslog"
)
diff --git a/clients.toml b/configs/clients.toml
similarity index 100%
rename from clients.toml
rename to configs/clients.toml
diff --git a/gosdn.toml b/configs/gosdn.toml
similarity index 71%
rename from gosdn.toml
rename to configs/gosdn.toml
index 7fe3795e7..26d755b34 100644
--- a/gosdn.toml
+++ b/configs/gosdn.toml
@@ -1,4 +1,4 @@
#example gosdn.toml
CliSocket = "localhost:55055"
DatabaseSocket = "bolt://141.100.70.170:7687"
-ConfigPath = "./gosdn.toml"
\ No newline at end of file
+ConfigPath = "./configs/gosdn.toml"
diff --git a/database/database.go b/internal/database/client.go
similarity index 99%
rename from database/database.go
rename to internal/database/client.go
index 69efde8c3..35ed1bd39 100644
--- a/database/database.go
+++ b/internal/database/client.go
@@ -1,7 +1,7 @@
package database
import (
- "code.fbi.h-da.de/cocsn/gosdn/log"
+ "code.fbi.h-da.de/cocsn/gosdn/internal/log"
"errors"
"github.com/neo4j/neo4j-go-driver/neo4j"
)
diff --git a/log/logger.go b/internal/log/logger.go
similarity index 100%
rename from log/logger.go
rename to internal/log/logger.go
diff --git a/log/loglevel.go b/internal/log/loglevel.go
similarity index 100%
rename from log/loglevel.go
rename to internal/log/loglevel.go
diff --git a/nucleus/cli-handling.go b/internal/nucleus/cli-handling.go
similarity index 93%
rename from nucleus/cli-handling.go
rename to internal/nucleus/cli-handling.go
index 9c5886980..7e4c4824b 100644
--- a/nucleus/cli-handling.go
+++ b/internal/nucleus/cli-handling.go
@@ -7,9 +7,9 @@
package nucleus
import (
- pb "code.fbi.h-da.de/cocsn/gosdn/cliInterface"
- "code.fbi.h-da.de/cocsn/gosdn/log"
- "code.fbi.h-da.de/cocsn/gosdn/restconf/client/ciena"
+ 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"
"context"
"google.golang.org/grpc"
"net"
diff --git a/nucleus/controller.go b/internal/nucleus/controller.go
similarity index 89%
rename from nucleus/controller.go
rename to internal/nucleus/controller.go
index f5f0997ef..594c3782d 100644
--- a/nucleus/controller.go
+++ b/internal/nucleus/controller.go
@@ -1,10 +1,10 @@
package nucleus
import (
- "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/restconf/client/ciena"
+ "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"
"github.com/BurntSushi/toml"
"os"
)
@@ -74,7 +74,7 @@ func (c *Core) Shutdown() {
func (c *Core) readControllerConfig(configFileController string) error {
if configFileController == "" {
- configFileController = "gosdn.toml"
+ configFileController = "configs/gosdn.toml"
}
if _, err := os.Stat(configFileController); err != nil {
return err
@@ -93,7 +93,7 @@ func (c *Core) readControllerConfig(configFileController string) error {
func (c *Core) readClientConfig(configFileClient string) error {
if configFileClient == "" {
- configFileClient = "clients.toml"
+ configFileClient = "configs/clients.toml"
}
if _, err := os.Stat(configFileClient); err != nil {
return err
diff --git a/nucleus/interfaces/client.go b/internal/nucleus/interfaces/client.go
similarity index 100%
rename from nucleus/interfaces/client.go
rename to internal/nucleus/interfaces/client.go
diff --git a/nucleus/interfaces/clientConfig.go b/internal/nucleus/interfaces/clientConfig.go
similarity index 100%
rename from nucleus/interfaces/clientConfig.go
rename to internal/nucleus/interfaces/clientConfig.go
diff --git a/nucleus/nucleus-core.go b/internal/nucleus/nucleus-core.go
similarity index 81%
rename from nucleus/nucleus-core.go
rename to internal/nucleus/nucleus-core.go
index 0276a4ad8..4d0839d6e 100644
--- a/nucleus/nucleus-core.go
+++ b/internal/nucleus/nucleus-core.go
@@ -1,9 +1,9 @@
package nucleus
import (
- "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/internal/database"
+ "code.fbi.h-da.de/cocsn/gosdn/internal/log"
+ "code.fbi.h-da.de/cocsn/gosdn/internal/nucleus/interfaces"
"time"
)
diff --git a/restconf/client/ciena/client.go b/internal/restconf/client/ciena/client.go
similarity index 93%
rename from restconf/client/ciena/client.go
rename to internal/restconf/client/ciena/client.go
index 072413d14..9d7aa3e31 100644
--- a/restconf/client/ciena/client.go
+++ b/internal/restconf/client/ciena/client.go
@@ -2,10 +2,10 @@ package ciena
import (
"bytes"
- "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/restconf/util"
+ "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"
apiclient "code.fbi.h-da.de/cocsn/swagger/apis/mcp/client"
"crypto/tls"
"github.com/go-openapi/runtime"
diff --git a/restconf/util/unmarshal.go b/internal/restconf/util/unmarshal.go
similarity index 100%
rename from restconf/util/unmarshal.go
rename to internal/restconf/util/unmarshal.go
--
GitLab