From f542709b5eb7def9d2827f2ed1158e61118a7ca6 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.b.seidl@stud.h-da.de>
Date: Thu, 21 Jul 2022 08:54:03 +0200
Subject: [PATCH] apply feedback
---
controller/interfaces/networkdomain/pnd.go | 2 +-
controller/mocks/NetworkDomain.go | 4 ++--
controller/nucleus/deviceWatcher.go | 8 ++++----
controller/nucleus/principalNetworkDomain.go | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/controller/interfaces/networkdomain/pnd.go b/controller/interfaces/networkdomain/pnd.go
index d64ae2386..750cd46ff 100644
--- a/controller/interfaces/networkdomain/pnd.go
+++ b/controller/interfaces/networkdomain/pnd.go
@@ -36,5 +36,5 @@ type NetworkDomain interface {
Commit(uuid.UUID) error
Confirm(uuid.UUID) error
SubscribePath(uuid.UUID, *ppb.SubscriptionList) error
- UpdateONDAfterSubscribeResponse(device.Device) error
+ UpdateDeviceAfterSubscribeResponse(device.Device) error
}
diff --git a/controller/mocks/NetworkDomain.go b/controller/mocks/NetworkDomain.go
index b8916ecaf..c4c289f1a 100644
--- a/controller/mocks/NetworkDomain.go
+++ b/controller/mocks/NetworkDomain.go
@@ -431,8 +431,8 @@ func (_m *NetworkDomain) UpdateDevice(_a0 device.Device, _a1 string) error {
return r0
}
-// UpdateONDAfterSubscribeResponse provides a mock function with given fields: _a0
-func (_m *NetworkDomain) UpdateONDAfterSubscribeResponse(_a0 device.Device) error {
+// UpdateDeviceAfterSubscribeResponse provides a mock function with given fields: _a0
+func (_m *NetworkDomain) UpdateDeviceAfterSubscribeResponse(_a0 device.Device) error {
ret := _m.Called(_a0)
var r0 error
diff --git a/controller/nucleus/deviceWatcher.go b/controller/nucleus/deviceWatcher.go
index 8442a004e..de7f135af 100644
--- a/controller/nucleus/deviceWatcher.go
+++ b/controller/nucleus/deviceWatcher.go
@@ -63,12 +63,12 @@ func (d *DeviceWatcher) SubToDevices(paths [][]string, opts *gnmi.SubscribeOptio
}
for _, pnd := range pnds {
- d.subscribeToPndDevices(pnd.ID().String(), pnd.Devices(), opts)
+ d.subscribeToPndDevices(pnd.ID().String(), pnd, opts)
}
}
-func (d *DeviceWatcher) subscribeToPndDevices(pndID string, devices []device.Device, opts *gnmi.SubscribeOptions) {
- for _, device := range devices {
+func (d *DeviceWatcher) subscribeToPndDevices(pndID string, pnd networkdomain.NetworkDomain, opts *gnmi.SubscribeOptions) {
+ for _, device := range pnd.Devices() {
subID := uuid.New()
stopContext, cancel := context.WithCancel(context.Background())
@@ -161,7 +161,7 @@ func (d *DeviceWatcher) handleSubscribeResponseUpdate(resp *gpb.SubscribeRespons
if err != nil {
log.Error(err)
} else {
- if err := pnd.UpdateONDAfterSubscribeResponse(device); err != nil {
+ if err := pnd.UpdateDeviceAfterSubscribeResponse(device); err != nil {
log.Error(err)
}
}
diff --git a/controller/nucleus/principalNetworkDomain.go b/controller/nucleus/principalNetworkDomain.go
index 190741b63..566d6623b 100644
--- a/controller/nucleus/principalNetworkDomain.go
+++ b/controller/nucleus/principalNetworkDomain.go
@@ -926,7 +926,7 @@ func (pnd *pndImplementation) MarshalBSON() ([]byte, error) {
}
// UpdateONDAfterSubscribeResponse takes a device and forwards it to the device service to handle the update.
-func (pnd *pndImplementation) UpdateONDAfterSubscribeResponse(device device.Device) error {
+func (pnd *pndImplementation) UpdateDeviceAfterSubscribeResponse(device device.Device) error {
if err := pnd.deviceService.Update(device); err != nil {
return err
}
--
GitLab