From e77187f5b83a2f4298bae6cb1a143305862ec711 Mon Sep 17 00:00:00 2001
From: Martin Stiemerling <mls.ietf@gmail.com>
Date: Mon, 28 Sep 2020 14:03:39 +0200
Subject: [PATCH] moved cli grpc calls to seprate file
---
nucleus/cli-handling.go | 44 +++++++++++++++++++++++++++++++++++++++++
nucleus/nucleus-core.go | 39 ------------------------------------
2 files changed, 44 insertions(+), 39 deletions(-)
create mode 100644 nucleus/cli-handling.go
diff --git a/nucleus/cli-handling.go b/nucleus/cli-handling.go
new file mode 100644
index 000000000..eb9005ef0
--- /dev/null
+++ b/nucleus/cli-handling.go
@@ -0,0 +1,44 @@
+package nucleus
+
+import (
+ pb "code.fbi.h-da.de/cocsn/gosdn/cliInterface"
+ "context"
+ "google.golang.org/grpc"
+ "log"
+ "net"
+)
+
+// server is used to implement helloworld.GreeterServer.
+type server struct {
+ pb.UnimplementedGreeterServer
+ core *Core
+}
+
+// SayHello implements helloworld.GreeterServer
+func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
+ log.Printf("Received: %v", in.GetName())
+ return &pb.HelloReply{Message: "Hello " + in.GetName()}, nil
+}
+
+func (s *server) Shutdown(ctx context.Context, in *pb.ShutdownRequest) (*pb.ShutdownReply, error) {
+ log.Printf("Received: %v", in.GetName())
+ isRunning = false
+ return &pb.ShutdownReply{Message: "Shutdown " + in.GetName()}, nil
+}
+
+func getCLIGoing(core *Core) {
+ log.Println("Starting: GetCLIGoing")
+ // Boot-up the control interface for the cli
+ cliControlListener, err := net.Listen("tcp", core.config.CliSocket)
+ if err != nil {
+ log.Fatalf("failed to listen: %v", err)
+ }
+
+ cliControlServer := grpc.NewServer()
+
+ pb.RegisterGreeterServer(cliControlServer, &server{core: core})
+ if err := cliControlServer.Serve(cliControlListener); err != nil {
+ log.Fatalf("failed to serve: %v", err)
+ }
+ log.Println("Started: GetCLIGoing")
+}
\ No newline at end of file
diff --git a/nucleus/nucleus-core.go b/nucleus/nucleus-core.go
index 6479643b5..c10f8a356 100644
--- a/nucleus/nucleus-core.go
+++ b/nucleus/nucleus-core.go
@@ -1,51 +1,12 @@
package nucleus
import (
- pb "code.fbi.h-da.de/cocsn/gosdn/cliInterface"
"code.fbi.h-da.de/cocsn/gosdn/database"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces"
- "context"
- _ "github.com/mattn/go-sqlite3"
- "google.golang.org/grpc"
"log"
- "net"
"time"
)
-// server is used to implement helloworld.GreeterServer.
-type server struct {
- pb.UnimplementedGreeterServer
- core *Core
-}
-
-// SayHello implements helloworld.GreeterServer
-func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
- log.Printf("Received: %v", in.GetName())
- return &pb.HelloReply{Message: "Hello " + in.GetName()}, nil
-}
-
-func (s *server) Shutdown(ctx context.Context, in *pb.ShutdownRequest) (*pb.ShutdownReply, error) {
- log.Printf("Received: %v", in.GetName())
- isRunning = false
- return &pb.ShutdownReply{Message: "Shutdown " + in.GetName()}, nil
-}
-
-func getCLIGoing(core *Core) {
- log.Println("Starting: GetCLIGoing")
- // Boot-up the control interface for the cli
- cliControlListener, err := net.Listen("tcp", core.config.CliSocket)
- if err != nil {
- log.Fatalf("failed to listen: %v", err)
- }
-
- cliControlServer := grpc.NewServer()
-
- pb.RegisterGreeterServer(cliControlServer, &server{core: core})
- if err := cliControlServer.Serve(cliControlListener); err != nil {
- log.Fatalf("failed to serve: %v", err)
- }
- log.Println("Started: GetCLIGoing")
-}
/*
* This function is used to start the core of the controller and any auxiliary services.
--
GitLab