Skip to content
Snippets Groups Projects
Commit b075e0c6 authored by André Sterba's avatar André Sterba
Browse files

Adjust apps

parent bf06a27e
No related branches found
No related tags found
1 merge request!383Resolve "Refactor OND name and create consistent naming state"
Pipeline #116918 passed
This commit is part of merge request !383. Comments created here will be created in the context of that merge request.
...@@ -17,7 +17,7 @@ func main() { ...@@ -17,7 +17,7 @@ func main() {
eventServiceLinks, err := event.NewEventService( eventServiceLinks, err := event.NewEventService(
queueCredentials, queueCredentials,
[]event.Topic{event.Link, event.RoutingTable}, []event.Topic{event.Link, event.Link},
) )
if err != nil { if err != nil {
logrus.Errorf("failed to create event service. %v", err) logrus.Errorf("failed to create event service. %v", err)
......
...@@ -8,11 +8,11 @@ import ( ...@@ -8,11 +8,11 @@ import (
"syscall" "syscall"
"time" "time"
"code.fbi.h-da.de/danet/gosdn/api/go/gosdn/device"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/openconfig/ygot/ygot" "github.com/openconfig/ygot/ygot"
"code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement"
"code.fbi.h-da.de/danet/gosdn/application-framework/event" "code.fbi.h-da.de/danet/gosdn/application-framework/event"
"code.fbi.h-da.de/danet/gosdn/application-framework/models" "code.fbi.h-da.de/danet/gosdn/application-framework/models"
"google.golang.org/grpc" "google.golang.org/grpc"
...@@ -61,22 +61,22 @@ func (a *Application) Run() { ...@@ -61,22 +61,22 @@ func (a *Application) Run() {
func (a *Application) callback(event *event.Event) { func (a *Application) callback(event *event.Event) {
ctx := context.Background() ctx := context.Background()
deviceServer := device.NewDeviceServiceClient(a.grpcClientConn) networkElementServer := networkelement.NewNetworkElementServiceClient(a.grpcClientConn)
request := &device.GetDeviceRequest{ request := &networkelement.GetNetworkElementRequest{
Timestamp: time.Now().UnixNano(), Timestamp: time.Now().UnixNano(),
DeviceID: event.EntityID.String(), NetworkElementId: event.EntityID.String(),
} }
response, err := deviceServer.Get(ctx, request) response, err := networkElementServer.Get(ctx, request)
if err != nil { if err != nil {
fmt.Printf("Error %+v\n ", err) fmt.Printf("Error %+v\n ", err)
return return
} }
fmt.Printf("\n[APP] Device-ID: %v, Device-Name: %+v \n", response.Device.Id, response.Device.Name) fmt.Printf("\n[APP] Device-ID: %v, NetworkElement-Name: %+v \n", response.NetworkElement.Id, response.NetworkElement.Name)
d := NewDevice(uuid.MustParse(response.Device.Id), response.Device.Name) d := NewDevice(uuid.MustParse(response.NetworkElement.Id), response.NetworkElement.Name)
// Create 'root' path to be able to load the whole model from the store. // Create 'root' path to be able to load the whole model from the store.
path, err := ygot.StringToPath("/", ygot.StructuredPath) path, err := ygot.StringToPath("/", ygot.StructuredPath)
...@@ -85,7 +85,7 @@ func (a *Application) callback(event *event.Event) { ...@@ -85,7 +85,7 @@ func (a *Application) callback(event *event.Event) {
} }
// Use unmarshall from the devices SBI to unmarshall ygot json in go struct. // Use unmarshall from the devices SBI to unmarshall ygot json in go struct.
err = models.Unmarshal([]byte(response.Device.Model), path, &d.Model) err = models.Unmarshal([]byte(response.NetworkElement.Model), path, &d.Model)
if err != nil { if err != nil {
panic(err) panic(err)
} }
...@@ -103,16 +103,16 @@ func (a *Application) callback(event *event.Event) { ...@@ -103,16 +103,16 @@ func (a *Application) callback(event *event.Event) {
panic(err) panic(err)
} }
requestUpdate := &device.UpdateDeviceRequest{ requestUpdate := &networkelement.UpdateNetworkElementRequest{
Timestamp: time.Now().UnixNano(), Timestamp: time.Now().UnixNano(),
Device: &device.Device{ NetworkElement: &networkelement.NetworkElement{
Id: d.UUID.String(), Id: d.UUID.String(),
Name: d.Name, Name: d.Name,
Model: modelAsString, Model: modelAsString,
}, },
} }
updateResponse, err := deviceServer.Update(ctx, requestUpdate) updateResponse, err := networkElementServer.Update(ctx, requestUpdate)
if err != nil { if err != nil {
panic(err) panic(err)
} }
......
...@@ -17,7 +17,7 @@ func main() { ...@@ -17,7 +17,7 @@ func main() {
eventService, err := event.NewEventService( eventService, err := event.NewEventService(
queueCredentials, queueCredentials,
[]event.Topic{event.Device}, []event.Topic{event.ManagedNetworkElement},
) )
if err != nil { if err != nil {
logrus.Errorf("failed to create event service. %v", err) logrus.Errorf("failed to create event service. %v", err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment