From f691b7cc84d330bf049febd46f5a54af407a3861 Mon Sep 17 00:00:00 2001 From: Fabian Seidl <fabian.seidl@h-da.de> Date: Fri, 31 Mar 2023 14:04:26 +0200 Subject: [PATCH] fixed minor issues as renaming, removing import due to review remarks --- controller/controller.go | 6 ++---- controller/nucleus/networkElementWatcher.go | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/controller/controller.go b/controller/controller.go index ea90a12dc..a8e715d8b 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -30,9 +30,7 @@ import ( apb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/rbac" tpb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/topology" - //TODO: check if both of 'app' are necessary? "code.fbi.h-da.de/danet/gosdn/controller/app" - apps "code.fbi.h-da.de/danet/gosdn/controller/app" "code.fbi.h-da.de/danet/gosdn/controller/config" "code.fbi.h-da.de/danet/gosdn/controller/conflict" @@ -134,7 +132,7 @@ func initialize() error { routeService: routeService, eventService: eventService, pluginService: pluginService, - appService: apps.NewAppService(apps.NewAppStore()), + appService: app.NewAppService(app.NewAppStore()), stopChan: make(chan os.Signal, 1), pluginRegistryClient: pluginRegistryClient, } @@ -149,7 +147,7 @@ func initialize() error { } c.networkElementWatcher = nucleus.NewNetworkElementWatcher(c.mneService, c.eventService) - c.networkElementWatcher.SubToNetworkElements(config.GetGnmiSubscriptionPaths(), nil) + c.networkElementWatcher.SubscribeToNetworkElements(config.GetGnmiSubscriptionPaths(), nil) if err := ensureDefaultRoleExists(); err != nil { return err diff --git a/controller/nucleus/networkElementWatcher.go b/controller/nucleus/networkElementWatcher.go index ccfba7fd6..64bd1d373 100644 --- a/controller/nucleus/networkElementWatcher.go +++ b/controller/nucleus/networkElementWatcher.go @@ -48,10 +48,10 @@ func NewNetworkElementWatcher(mneService networkelement.Service, eventService ev } } -// SubToNetworkElements subscribes to every available network element in each network domain according to provided SubscribeOptions. +// SubscribeToNetworkElements subscribes to every available network element in each network domain according to provided SubscribeOptions. // Paths should be provided in the following format [][]string{{"system", "config", "hostname"}} // SubscribeOptions can be nil. Use nil for a fixed, pre-defined set of gNMI subscription options (streaming in sample mode each second). -func (n *NetworkElementWatcher) SubToNetworkElements(paths [][]string, opts *gnmi.SubscribeOptions) { +func (n *NetworkElementWatcher) SubscribeToNetworkElements(paths [][]string, opts *gnmi.SubscribeOptions) { if opts == nil { opts = &gnmi.SubscribeOptions{ Mode: gNMISubscribeMode, @@ -68,11 +68,11 @@ func (n *NetworkElementWatcher) SubToNetworkElements(paths [][]string, opts *gnm } for _, mne := range mnes { - n.subscribeToPndNetworkElements(mne, opts) + n.subscribeToNetworkElement(mne, opts) } } -func (n *NetworkElementWatcher) subscribeToPndNetworkElements(mne networkelement.NetworkElement, opts *gnmi.SubscribeOptions) { +func (n *NetworkElementWatcher) subscribeToNetworkElement(mne networkelement.NetworkElement, opts *gnmi.SubscribeOptions) { subID := uuid.New() stopContext, cancel := context.WithCancel(context.Background()) -- GitLab