Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
goSDN
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
danet
goSDN
Commits
23a26621
Commit
23a26621
authored
4 years ago
by
Malte Bauch
Browse files
Options
Downloads
Patches
Plain Diff
fixed linting errors
parent
b81f1dfe
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!23
Resolve "CI/CD"
,
!18
Develop
Pipeline
#52108
passed
4 years ago
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
database/database.go
+15
-8
15 additions, 8 deletions
database/database.go
log/logger.go
+6
-6
6 additions, 6 deletions
log/logger.go
nucleus/controller.go
+1
-1
1 addition, 1 deletion
nucleus/controller.go
nucleus/nucleus-core.go
+5
-4
5 additions, 4 deletions
nucleus/nucleus-core.go
with
27 additions
and
19 deletions
database/database.go
+
15
−
8
View file @
23a26621
...
@@ -35,7 +35,9 @@ func createDriver(uri, username, password string, encrypted bool) neo4j.Driver {
...
@@ -35,7 +35,9 @@ func createDriver(uri, username, password string, encrypted bool) neo4j.Driver {
},
},
)
)
logError
(
"failed creating database Driver"
,
err
)
if
err
!=
nil
{
log
.
Info
(
"failed creating database Driver:"
,
err
)
}
return
driver
return
driver
}
}
...
@@ -45,7 +47,9 @@ func createSession(driver neo4j.Driver) neo4j.Session {
...
@@ -45,7 +47,9 @@ func createSession(driver neo4j.Driver) neo4j.Session {
sessionConfig
:=
neo4j
.
SessionConfig
{
AccessMode
:
neo4j
.
AccessModeWrite
}
sessionConfig
:=
neo4j
.
SessionConfig
{
AccessMode
:
neo4j
.
AccessModeWrite
}
session
,
err
:=
driver
.
NewSession
(
sessionConfig
)
session
,
err
:=
driver
.
NewSession
(
sessionConfig
)
logError
(
"failed creating database session"
,
err
)
if
err
!=
nil
{
log
.
Info
(
"failed creating database session:"
,
err
)
}
return
session
return
session
}
}
...
@@ -71,7 +75,9 @@ func (d Database) StoreNodes(json string) {
...
@@ -71,7 +75,9 @@ func (d Database) StoreNodes(json string) {
"stringToAdd"
:
json
,
"stringToAdd"
:
json
,
})
})
logError
(
"failed storing Nodes into database"
,
err
)
if
err
!=
nil
{
log
.
Info
(
"failed storing Nodes into database:"
,
err
)
}
log
.
Info
(
"successfully added Nodes into database"
)
log
.
Info
(
"successfully added Nodes into database"
)
}
}
...
@@ -96,7 +102,9 @@ func (d Database) StoreNodeEdgePoints(json string) {
...
@@ -96,7 +102,9 @@ func (d Database) StoreNodeEdgePoints(json string) {
"stringToAdd"
:
json
,
"stringToAdd"
:
json
,
})
})
logError
(
"failed storing NodeEdgePoints into database"
,
err
)
if
err
!=
nil
{
log
.
Info
(
"failed storing NodeEdgePoints into database:"
,
err
)
}
setNodeNodeEdgePointsRelation
(
session
)
setNodeNodeEdgePointsRelation
(
session
)
...
@@ -118,14 +126,13 @@ func setNodeNodeEdgePointsRelation(session neo4j.Session) {
...
@@ -118,14 +126,13 @@ func setNodeNodeEdgePointsRelation(session neo4j.Session) {
_
,
err
:=
session
.
Run
(
_
,
err
:=
session
.
Run
(
query
,
map
[
string
]
interface
{}{})
query
,
map
[
string
]
interface
{}{})
logError
(
"failed storing NodeNodeEdgePointsRelation into database"
,
err
)
if
err
!=
nil
{
log
.
Info
(
"failed storing NodeNodeEdgePointsRelation into database:"
,
err
)
}
log
.
Info
(
"successfully stored NodeNodeEdgePointsRelation into database"
)
log
.
Info
(
"successfully stored NodeNodeEdgePointsRelation into database"
)
}
}
//logError logs error with custom and error message
//logError logs error with custom and error message
func
logError
(
message
string
,
err
error
)
{
func
logError
(
message
string
,
err
error
)
{
if
err
!=
nil
{
log
.
Info
(
"%v: %v"
,
message
,
err
)
}
}
}
This diff is collapsed.
Click to expand it.
log/logger.go
+
6
−
6
View file @
23a26621
...
@@ -45,27 +45,27 @@ func Output(out io.Writer) {
...
@@ -45,27 +45,27 @@ func Output(out io.Writer) {
}
}
func
Debug
(
args
...
interface
{})
{
func
Debug
(
args
...
interface
{})
{
log
(
DEBUG
,
args
)
log
(
DEBUG
,
args
...
)
}
}
func
Info
(
args
...
interface
{})
{
func
Info
(
args
...
interface
{})
{
log
(
INFO
,
args
)
log
(
INFO
,
args
...
)
}
}
func
Warn
(
args
...
interface
{})
{
func
Warn
(
args
...
interface
{})
{
log
(
WARNING
,
args
)
log
(
WARNING
,
args
...
)
}
}
func
Error
(
args
...
interface
{})
{
func
Error
(
args
...
interface
{})
{
log
(
ERROR
,
args
)
log
(
ERROR
,
args
...
)
}
}
func
Fatal
(
args
...
interface
{})
{
func
Fatal
(
args
...
interface
{})
{
log
(
FATAL
,
args
)
log
(
FATAL
,
args
...
)
}
}
func
Panic
(
args
...
interface
{})
{
func
Panic
(
args
...
interface
{})
{
log
(
PANIC
,
args
)
log
(
PANIC
,
args
...
)
}
}
func
log
(
level
Level
,
args
...
interface
{})
{
func
log
(
level
Level
,
args
...
interface
{})
{
...
...
This diff is collapsed.
Click to expand it.
nucleus/controller.go
+
1
−
1
View file @
23a26621
...
@@ -48,7 +48,7 @@ func (c *Core) Init(socket, configfile string) {
...
@@ -48,7 +48,7 @@ func (c *Core) Init(socket, configfile string) {
c
.
AttachDatabase
()
c
.
AttachDatabase
()
//TODO: Create client config/CLI adapter
//TODO: Create client config/CLI adapter
c
.
clients
[
"ciena-mcp"
]
=
ciena
.
NewMCPClient
(
"141.100.70.170"
,
""
,
""
,
&
c
.
database
)
c
.
clients
[
"ciena-mcp"
]
=
ciena
.
NewMCPClient
(
"141.100.70.170"
,
""
,
""
,
&
c
.
database
)
}
}
func
(
c
*
Core
)
AttachDatabase
()
{
func
(
c
*
Core
)
AttachDatabase
()
{
...
...
This diff is collapsed.
Click to expand it.
nucleus/nucleus-core.go
+
5
−
4
View file @
23a26621
...
@@ -6,6 +6,7 @@ import (
...
@@ -6,6 +6,7 @@ import (
"code.fbi.h-da.de/cocsn/gosdn/log"
"code.fbi.h-da.de/cocsn/gosdn/log"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces"
"context"
"context"
// TODO: justify the blank import - do we need it?
_
"github.com/mattn/go-sqlite3"
_
"github.com/mattn/go-sqlite3"
"google.golang.org/grpc"
"google.golang.org/grpc"
"net"
"net"
...
@@ -20,12 +21,12 @@ type server struct {
...
@@ -20,12 +21,12 @@ type server struct {
// SayHello implements helloworld.GreeterServer
// SayHello implements helloworld.GreeterServer
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
.
Debug
(
"Received:
%v
"
,
in
.
GetName
())
log
.
Debug
(
"Received:"
,
in
.
GetName
())
return
&
pb
.
HelloReply
{
Message
:
"Hello "
+
in
.
GetName
()},
nil
return
&
pb
.
HelloReply
{
Message
:
"Hello "
+
in
.
GetName
()},
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
.
Debug
(
"Received:
%v
"
,
in
.
GetName
())
log
.
Debug
(
"Received:"
,
in
.
GetName
())
isRunning
=
false
isRunning
=
false
return
&
pb
.
ShutdownReply
{
Message
:
"Shutdown "
+
in
.
GetName
()},
nil
return
&
pb
.
ShutdownReply
{
Message
:
"Shutdown "
+
in
.
GetName
()},
nil
}
}
...
@@ -35,14 +36,14 @@ func getCLIGoing(core *Core) {
...
@@ -35,14 +36,14 @@ func getCLIGoing(core *Core) {
// 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
.
Fatal
(
"failed to listen:
%v
"
,
err
)
log
.
Fatal
(
"failed to listen:"
,
err
)
}
}
cliControlServer
:=
grpc
.
NewServer
()
cliControlServer
:=
grpc
.
NewServer
()
pb
.
RegisterGreeterServer
(
cliControlServer
,
&
server
{
core
:
core
})
pb
.
RegisterGreeterServer
(
cliControlServer
,
&
server
{
core
:
core
})
if
err
:=
cliControlServer
.
Serve
(
cliControlListener
);
err
!=
nil
{
if
err
:=
cliControlServer
.
Serve
(
cliControlListener
);
err
!=
nil
{
log
.
Fatal
(
"failed to serve:
%v
"
,
err
)
log
.
Fatal
(
"failed to serve:"
,
err
)
}
}
log
.
Info
(
"Started: GetCLIGoing"
)
log
.
Info
(
"Started: GetCLIGoing"
)
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment