From 53d7a64fc5f1754c3bbaab556d6a27e156dcc7f2 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Fri, 24 Nov 2023 14:51:58 +0000
Subject: [PATCH] remove/deal with todos, generate mocks to fit adjustments in
mne
---
controller/mocks/NetworkElement.go | 16 ++++++++++++++++
.../northbound/server/configurationmanagement.go | 2 +-
controller/nucleus/networkElementService.go | 2 --
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/controller/mocks/NetworkElement.go b/controller/mocks/NetworkElement.go
index a8ccd7fba..a37cedfef 100644
--- a/controller/mocks/NetworkElement.go
+++ b/controller/mocks/NetworkElement.go
@@ -20,6 +20,22 @@ type NetworkElement struct {
mock.Mock
}
+// GetGnmiSubscriptionPaths provides a mock function with given fields:
+func (_m *NetworkElement) GetGnmiSubscriptionPaths() [][]string {
+ ret := _m.Called()
+
+ var r0 [][]string
+ if rf, ok := ret.Get(0).(func() [][]string); ok {
+ r0 = rf()
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).([][]string)
+ }
+ }
+
+ return r0
+}
+
// GetMetadata provides a mock function with given fields:
func (_m *NetworkElement) GetMetadata() conflict.Metadata {
ret := _m.Called()
diff --git a/controller/northbound/server/configurationmanagement.go b/controller/northbound/server/configurationmanagement.go
index fc9c8879a..539a567ac 100644
--- a/controller/northbound/server/configurationmanagement.go
+++ b/controller/northbound/server/configurationmanagement.go
@@ -327,7 +327,7 @@ func (c ConfigurationManagementServer) createNetworkElements(sdnConfig *loadedSD
&transportOption,
pndUUID,
plugin,
- [][]string{}, // TODO: change here!
+ inputNetworkElement.GnmiSubscriptionPaths,
conflict.Metadata{ResourceVersion: inputNetworkElement.Metadata.ResourceVersion},
)
if err != nil {
diff --git a/controller/nucleus/networkElementService.go b/controller/nucleus/networkElementService.go
index 5ce62e79e..635c190be 100644
--- a/controller/nucleus/networkElementService.go
+++ b/controller/nucleus/networkElementService.go
@@ -145,7 +145,6 @@ func (s *NetworkElementService) UpdateModel(networkElementID uuid.UUID, modelAsS
return err
}
- // TODO (faseid): check if we want to add the paths with values here instead of empty map!
pubEvent := event.NewUpdateEvent(networkElementID)
if err := s.eventService.PublishEvent(NetworkElementEventTopic, pubEvent); err != nil {
go func() {
@@ -168,7 +167,6 @@ func (s *NetworkElementService) Update(networkElementToUpdate networkelement.Net
return err
}
- // TODO (faseid): check if we want to add the paths with values here instead of empty map!
pubEvent := event.NewUpdateEvent(networkElementToUpdate.ID())
if err := s.eventService.PublishEvent(NetworkElementEventTopic, pubEvent); err != nil {
go func() {
--
GitLab