Skip to content
Snippets Groups Projects
Commit 79048453 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

new logger, error handling, new GetLink() call

parent be5abea2
No related branches found
No related tags found
2 merge requests!30Gosdn cli features flow,!18Develop
Pipeline #52137 failed
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"code.fbi.h-da.de/cocsn/gosdn/restconf/client/ciena" "code.fbi.h-da.de/cocsn/gosdn/restconf/client/ciena"
"context" "context"
"google.golang.org/grpc" "google.golang.org/grpc"
"log" "code.fbi.h-da.de/cocsn/gosdn/log"
"net" "net"
) )
...@@ -23,48 +23,54 @@ type server struct { ...@@ -23,48 +23,54 @@ type server struct {
} }
func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) { func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
log.Printf("Received: %v", in.GetName()) log.Info("Received: %v", in.GetName())
return &pb.HelloReply{Message: "Hello " + in.GetName(), GoSDNInfo: "goSDN in version: DEVELOP"}, nil return &pb.HelloReply{Message: "Hello " + in.GetName(), GoSDNInfo: "goSDN in version: DEVELOP"}, nil
} }
func (s *server) Shutdown(ctx context.Context, in *pb.ShutdownRequest) (*pb.ShutdownReply, error) { func (s *server) Shutdown(ctx context.Context, in *pb.ShutdownRequest) (*pb.ShutdownReply, error) {
log.Printf("Received: %v", in.GetName()) log.Info("Received: %v", in.GetName())
isRunning = false isRunning = false
return &pb.ShutdownReply{Message: "Shutdown " + in.GetName()}, nil return &pb.ShutdownReply{Message: "Shutdown " + in.GetName()}, nil
} }
func getCLIGoing(core *Core) { func getCLIGoing(core *Core) {
log.Println("Starting: GetCLIGoing") log.Info("Starting: GetCLIGoing")
// Boot-up the control interface for the cli // Boot-up the control interface for the cli
cliControlListener, err := net.Listen("tcp", core.config.CliSocket) cliControlListener, err := net.Listen("tcp", core.config.CliSocket)
if err != nil { if err != nil {
log.Fatalf("failed to listen: %v", err) log.Fatal("failed to listen: %v", err)
} }
cliControlServer := grpc.NewServer() cliControlServer := grpc.NewServer()
pb.RegisterGrpcCliServer(cliControlServer, &server{core: core}) pb.RegisterGrpcCliServer(cliControlServer, &server{core: core})
if err := cliControlServer.Serve(cliControlListener); err != nil { if err := cliControlServer.Serve(cliControlListener); err != nil {
log.Fatalf("failed to serve: %v", err) log.Fatal("failed to serve: %v", err)
} }
log.Println("Started: GetCLIGoing") log.Info("Started: GetCLIGoing")
} }
// SBI specific calls, by now TAPI only // SBI specific calls, by now TAPI only
func (s *server) TAPIGetEdge(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) { func (s *server) TAPIGetEdge(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) {
log.Printf("Received: %v", in.GetName()) log.Info("Received: %v", in.GetName())
s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetNodes() if err := s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetNodes(); err != nil {
log.Error(err)
}
return &pb.TAPIReply{Message: "Done"}, nil return &pb.TAPIReply{Message: "Done"}, nil
} }
func (s *server) TAPIGetEdgeNode(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) { func (s *server) TAPIGetEdgeNode(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) {
log.Printf("Received: %v", in.GetName()) log.Info("Received: %v", in.GetName())
s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetNodeEdgePoints() if err := s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetNodeEdgePoints(); err != nil {
log.Error(err)
}
return &pb.TAPIReply{Message: "Done"}, nil return &pb.TAPIReply{Message: "Done"}, nil
} }
func (s *server) TAPIGetLink(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) { func (s *server) TAPIGetLink(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) {
log.Printf("Received: %v", in.GetName()) log.Info("Received: %v", in.GetName())
s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetConnections() if err := s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetLinks(); err != nil {
log.Error(err)
}
return &pb.TAPIReply{Message: "Done"}, nil return &pb.TAPIReply{Message: "Done"}, nil
} }
...@@ -57,6 +57,14 @@ func (c *MCPClient) GetConnections() error { ...@@ -57,6 +57,14 @@ func (c *MCPClient) GetConnections() error {
return err return err
} }
func (c *MCPClient) GetLinks() error {
defer c.buffer.Reset()
_, err := c.client.TapiTopologyCore.GetTapiCoreContextTopologyMcpBaseTopologyLink(nil)
c.database.StoreConnections(c.buffer.String())
log.Debug(c.buffer.Next(25))
return err
}
func (c *MCPClient) GetNodes() error { func (c *MCPClient) GetNodes() error {
defer c.buffer.Reset() defer c.buffer.Reset()
_, err := c.client.TapiTopologyCore.GetTapiCoreContextTopologyMcpBaseTopologyNode(nil) _, err := c.client.TapiTopologyCore.GetTapiCoreContextTopologyMcpBaseTopologyNode(nil)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment