refactored core of gosdn

gosdn-cli/gosdn-cli.go → cmd/gosdn-cli/main.go

 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"

main.go → cmd/gosdn/main.go

 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"
 )

gosdn.toml → configs/gosdn.toml

 #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"

database/database.go → internal/database/client.go

 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"
 )

nucleus/cli-handling.go → 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"

nucleus/controller.go → internal/nucleus/controller.go

 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

nucleus/nucleus-core.go → internal/nucleus/nucleus-core.go

 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"
 )
 

restconf/client/ciena/client.go → 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"