diff --git a/controller.go b/controller.go index e1b724abb527794272e4eb533bfe3282a35fee05..70c3b96ef4e023d8cdbbdf1740e9f872e7f10272 100644 --- a/controller.go +++ b/controller.go @@ -9,8 +9,6 @@ import ( "sync" "time" - "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound" - "github.com/google/uuid" log "github.com/sirupsen/logrus" "github.com/spf13/viper" @@ -20,6 +18,7 @@ import ( cpb "code.fbi.h-da.de/cocsn/api/go/gosdn/csbi" ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd" spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound" + "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound" nbi "code.fbi.h-da.de/cocsn/gosdn/northbound/server" "code.fbi.h-da.de/cocsn/gosdn/database" diff --git a/northbound/server/csbi.go b/northbound/server/csbi.go index 3c61d9077cc8a387b61afe6f97a42fed2c202f0f..85e3dd926d9437f6261e8c8a57ea78e5ab6f66f0 100644 --- a/northbound/server/csbi.go +++ b/northbound/server/csbi.go @@ -2,9 +2,10 @@ package server import ( "context" - log "github.com/sirupsen/logrus" "time" + log "github.com/sirupsen/logrus" + cpb "code.fbi.h-da.de/cocsn/api/go/gosdn/csbi" "code.fbi.h-da.de/cocsn/gosdn/nucleus" "google.golang.org/grpc/codes" @@ -25,10 +26,10 @@ func (s csbi) Hello(ctx context.Context, syn *cpb.Syn) (*cpb.Ack, error) { ID: syn.Id, Address: syn.Address, } - details := <- ch + details := <-ch log.Infof("ack to csbi %v", syn.Id) return &cpb.Ack{ - Timestamp: time.Now().UnixNano(), + Timestamp: time.Now().UnixNano(), TransportOption: details.TransportOption, }, nil } diff --git a/nucleus/device.go b/nucleus/device.go index ac7910d0a7040863c6f9a360e247de14534d56ed..4c828772fdc9f56e9837b786301c6c4b58b93a3a 100644 --- a/nucleus/device.go +++ b/nucleus/device.go @@ -96,31 +96,31 @@ func (d *CommonDevice) ProcessResponse(resp proto.Message) error { return d.transport.ProcessResponse(resp, d.GoStruct, d.sbi.Schema()) } -type csbiDevice struct { +type CsbiDevice struct { CommonDevice } // ID returns the UUID of the Device -func (d *csbiDevice) ID() uuid.UUID { +func (d *CsbiDevice) ID() uuid.UUID { return d.UUID } -func (d *csbiDevice) Model() ygot.GoStruct { +func (d *CsbiDevice) Model() ygot.GoStruct { return d.GoStruct } -func (d *csbiDevice) Transport() transport.Transport { +func (d *CsbiDevice) Transport() transport.Transport { return d.transport } -func (d *csbiDevice) Name() string { +func (d *CsbiDevice) Name() string { return d.name } -func (d *csbiDevice) SBI() southbound.SouthboundInterface { +func (d *CsbiDevice) SBI() southbound.SouthboundInterface { return d.sbi } -func (d *csbiDevice) ProcessResponse(resp proto.Message) error { +func (d *CsbiDevice) ProcessResponse(resp proto.Message) error { return &errors.ErrNotYetImplemented{} } diff --git a/nucleus/principalNetworkDomain.go b/nucleus/principalNetworkDomain.go index 7a0c791c63cd8681bc1a0321cca4736934316c4a..f56c52d8fccfbac05fe9c29a5bc8380fed2c9afe 100644 --- a/nucleus/principalNetworkDomain.go +++ b/nucleus/principalNetworkDomain.go @@ -412,11 +412,11 @@ func (pnd *pndImplementation) createCsbiDevice(name string, d *cpb.Deployment, o panic(err) } opt.Address = deviceDetails.Address - t, err := NewGnmiTransport(opt, &Csbi{}) + t, err := NewTransport(opt, &Csbi{}) if err != nil { panic(err) } - d := &csbiDevice{ + d := &CsbiDevice{ CommonDevice: CommonDevice{ name: name, UUID: id,