diff --git a/application-framework/event/eventService.go b/application-framework/event/eventService.go
index 1cb63f996ea4ea36fe0d7e3b34adcfc6350d3c35..c6f9040d0f6f065fe6960b4c537e4ae014f32ee1 100644
--- a/application-framework/event/eventService.go
+++ b/application-framework/event/eventService.go
@@ -115,7 +115,6 @@ func (e *Service) setupQueueConsume(topic string, stopChan chan os.Signal) error
val, ok := e.subscriber[parseTypeString(event.Type)]
if ok {
- //fmt.Print("Executing Callback: ")
val(event)
fmt.Println()
}
diff --git a/applications/basic-interface-monitoring/app.go b/applications/basic-interface-monitoring/app.go
index 562d58c0685806d9a1d414921c5e6a701e6d2f2b..1a982598af1d49ba56143b0610feed7a41afcbc8 100644
--- a/applications/basic-interface-monitoring/app.go
+++ b/applications/basic-interface-monitoring/app.go
@@ -15,9 +15,9 @@ import (
// Application is an example for a sdn application.
type Application struct {
- eventServiceDevices event.ServiceInterface
- stopChannel chan os.Signal
- grpcClientConn *grpc.ClientConn
+ eventServiceNetworkElements event.ServiceInterface
+ stopChannel chan os.Signal
+ grpcClientConn *grpc.ClientConn
}
// Run runs the application.
@@ -26,10 +26,10 @@ func (a *Application) Run(controllerAddress string) {
signal.Notify(a.stopChannel, os.Interrupt, syscall.SIGTERM)
- a.eventServiceDevices.SubscribeToEventType([]event.TypeToCallbackTuple{
- {Type: event.Update, Callback: a.DeviceCallback},
+ a.eventServiceNetworkElements.SubscribeToEventType([]event.TypeToCallbackTuple{
+ {Type: event.Update, Callback: a.NetworkElementCallback},
})
- a.eventServiceDevices.SetupEventReciever(a.stopChannel)
+ a.eventServiceNetworkElements.SetupEventReciever(a.stopChannel)
conn, err := grpc.Dial(controllerAddress, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
@@ -59,11 +59,11 @@ func (a *Application) Run(controllerAddress string) {
<-forever
}
-// DeviceCallback is the callback function for device changes.
-func (a *Application) DeviceCallback(event *event.Event) {
- deviceServer := networkelement.NewNetworkElementServiceClient(a.grpcClientConn)
+// NetworkElementCallback is the callback function for network element changes.
+func (a *Application) NetworkElementCallback(event *event.Event) {
+ networkElementServer := networkelement.NewNetworkElementServiceClient(a.grpcClientConn)
- changedInterfaces, err := checkIfOperationStateHasChanged(deviceServer, event.EntityID)
+ changedInterfaces, err := checkIfOperationStateHasChanged(networkElementServer, event.EntityID)
if err != nil {
fmt.Printf("Error %+v\n ", err)
}
diff --git a/applications/basic-interface-monitoring/main.go b/applications/basic-interface-monitoring/main.go
index 838acddd977d68df3da89b6cad506a26c900d5d0..5b63758127f647129235d4432e87ea259817d784 100644
--- a/applications/basic-interface-monitoring/main.go
+++ b/applications/basic-interface-monitoring/main.go
@@ -9,13 +9,13 @@ import (
)
func main() {
- queueCredentials, err := registration.Register("localhost:55055", "ese-Application", "SecurePresharedToken")
+ queueCredentials, err := registration.Register("localhost:55055", "basic-interface-monitoring", "SecurePresharedToken")
if err != nil {
logrus.Errorf("failed to register application on control plane. %v", err)
os.Exit(1)
}
- eventServiceDevices, err := event.NewEventService(
+ eventServiceNetworkElements, err := event.NewEventService(
queueCredentials,
[]event.Topic{event.ManagedNetworkElement},
)
@@ -25,8 +25,8 @@ func main() {
}
app := &Application{
- eventServiceDevices: eventServiceDevices,
- stopChannel: make(chan os.Signal, 1),
+ eventServiceNetworkElements: eventServiceNetworkElements,
+ stopChannel: make(chan os.Signal, 1),
}
app.Run("localhost:55055")
diff --git a/applications/basic-interface-monitoring/network-element.go b/applications/basic-interface-monitoring/network-element.go
index 008a0df1898da0860460488a87e13d4234754e52..c2993a25a680e46528133f4123d185dd3710fa63 100644
--- a/applications/basic-interface-monitoring/network-element.go
+++ b/applications/basic-interface-monitoring/network-element.go
@@ -19,18 +19,18 @@ var statusMap map[string]map[string]*InterfaceStatus
// NetworkElement is a NetworkElement.
type NetworkElement struct {
- // UUID represents the Devices UUID
+ // UUID represents the network element's UUID
UUID uuid.UUID
- // Name is the device's human readable Name
+ // Name is the network element's human readable Name
Name string
- // Device embeds a ygot.GoStruct containing the device details
+ // Model embeds a ygot.GoStruct containing the network element details
Model arista.Device
}
// NewNetworkElement creates a new NetworkElement.
-func NewNetworkElement(id uuid.UUID, name string, deviceModel string) *NetworkElement {
+func NewNetworkElement(id uuid.UUID, name string, networkElementModel string) *NetworkElement {
d := &NetworkElement{
UUID: id,
Model: arista.Device{},
@@ -46,8 +46,8 @@ func NewNetworkElement(id uuid.UUID, name string, deviceModel string) *NetworkEl
opts := []ytypes.UnmarshalOpt{
&ytypes.IgnoreExtraFields{},
}
- // Use unmarshall from the devices SBI to unmarshall ygot json in go struct.
- err = models.Unmarshal([]byte(deviceModel), path, &d.Model, opts...)
+ // Use unmarshall from the network elements model to unmarshall ygot json in go struct.
+ err = models.Unmarshal([]byte(networkElementModel), path, &d.Model, opts...)
if err != nil {
panic(err)
}
@@ -62,7 +62,7 @@ type InterfaceStatus struct {
Status string
}
-func checkIfOperationStateHasChanged(deviceServer networkelement.NetworkElementServiceClient, networkElementID uuid.UUID) ([]InterfaceStatus, error) {
+func checkIfOperationStateHasChanged(networkElementServer networkelement.NetworkElementServiceClient, networkElementID uuid.UUID) ([]InterfaceStatus, error) {
ctx := context.Background()
request := &networkelement.GetNetworkElementRequest{
@@ -70,7 +70,7 @@ func checkIfOperationStateHasChanged(deviceServer networkelement.NetworkElementS
NetworkElementId: networkElementID.String(),
}
- resp, err := deviceServer.Get(ctx, request)
+ resp, err := networkElementServer.Get(ctx, request)
if err != nil {
return nil, err
}
@@ -79,14 +79,14 @@ func checkIfOperationStateHasChanged(deviceServer networkelement.NetworkElementS
storedInterfaces, ok := statusMap[networkElement.Name]
if !ok {
- addDeviceToStatusMap(networkElement.Name, networkElement.Model.Interfaces.Interface)
+ addNetworkElementToStatusMap(networkElement.Name, networkElement.Model.Interfaces.Interface)
return nil, nil
}
return walkThroughInterfaces(networkElement.Model.Interfaces.Interface, storedInterfaces)
}
-func addDeviceToStatusMap(networkElementName string, interfaces map[string]*arista.OpenconfigInterfaces_Interfaces_Interface) {
+func addNetworkElementToStatusMap(networkElementName string, interfaces map[string]*arista.OpenconfigInterfaces_Interfaces_Interface) {
statusList := make(map[string]*InterfaceStatus)
for _, receivedInterface := range interfaces {
diff --git a/applications/basic-interface-monitoring/webpage/index.html b/applications/basic-interface-monitoring/webpage/index.html
index d5d09482097d37ba662ce2031f349ec298ff5830..7e8d3fc2d528471a8bed7950a2059f87fb90d6ed 100644
--- a/applications/basic-interface-monitoring/webpage/index.html
+++ b/applications/basic-interface-monitoring/webpage/index.html
@@ -1,5 +1,5 @@
<script type="text/javascript">
- let lastStateDeviceMap = new Map()
+ let lastStateNetworkElementMap = new Map()
const eventListener = new EventSource("http://localhost:4000/sse")
eventListener.onmessage = (event) => {
@@ -9,10 +9,10 @@
contentInnerHTML = "";
- for (let deviceName in data) {
- let interfaces = data[deviceName];
+ for (let networkElementName in data) {
+ let interfaces = data[networkElementName];
- contentInnerHTML += "<h1>" + deviceName + "</h1>";
+ contentInnerHTML += "<h1>" + networkElementName + "</h1>";
contentInnerHTML += '<div class="flex-container">';
@@ -31,10 +31,10 @@
return interfaceB < interfaceA
})
- console.log(lastStateDeviceMap.get(deviceName))
+ console.log(lastStateNetworkElementMap.get(networkElementName))
- const lastStateArray = lastStateDeviceMap.get(deviceName)
+ const lastStateArray = lastStateNetworkElementMap.get(networkElementName)
interfaceArray.forEach( (interface, index) => {
contentInnerHTML += "<div"
@@ -52,7 +52,7 @@
contentInnerHTML += "</div>";
})
- lastStateDeviceMap.set(deviceName, interfaceArray)
+ lastStateNetworkElementMap.set(networkElementName, interfaceArray)
contentInnerHTML += "</div>";
}