From ee56ce6ba5cac6ea8701498415fe635767b1b4b6 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.b.seidl@stud.h-da.de>
Date: Wed, 6 Jul 2022 16:00:13 +0200
Subject: [PATCH] linter pleasing and small changes
---
cli/adapter/PndAdapter.go | 2 ++
controller/api/device.go | 1 +
controller/nucleus/principalNetworkDomain.go | 8 ++++----
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cli/adapter/PndAdapter.go b/cli/adapter/PndAdapter.go
index a8dc29e8f..9d39456be 100644
--- a/cli/adapter/PndAdapter.go
+++ b/cli/adapter/PndAdapter.go
@@ -127,6 +127,8 @@ func (p *PndAdapter) Request(ctx context.Context, did uuid.UUID, path string) (*
return resp, nil
}
+// SubscribeONDPath sends an API call to the controller requesting to subscribe
+// to a specific path of a specifc device
func (p *PndAdapter) SubscribeONDPath(ctx context.Context, did uuid.UUID, slist *ppb.SubscriptionList) (ppb.PndService_SubscribePathClient, error) {
resp, err := api.SubscribePath(ctx, p.endpoint, p.id.String(), did.String(), slist)
if err != nil {
diff --git a/controller/api/device.go b/controller/api/device.go
index d06e30c73..35f211724 100644
--- a/controller/api/device.go
+++ b/controller/api/device.go
@@ -152,6 +152,7 @@ func GetPath(ctx context.Context, addr, pid, did, path string) (*ppb.GetPathResp
return pndClient.GetPath(ctx, req)
}
+// SubscribePath subscribes to paths on a device
func SubscribePath(ctx context.Context, addr, pid, did string, slist *ppb.SubscriptionList) (ppb.PndService_SubscribePathClient, error) {
log.Println("subscribePath called")
pndClient, err := nbi.PndClient(addr, dialOptions...)
diff --git a/controller/nucleus/principalNetworkDomain.go b/controller/nucleus/principalNetworkDomain.go
index d318d942b..70f1c1941 100644
--- a/controller/nucleus/principalNetworkDomain.go
+++ b/controller/nucleus/principalNetworkDomain.go
@@ -522,13 +522,13 @@ func (pnd *pndImplementation) SubscribePath(uuid uuid.UUID, subList *ppb.Subscri
return err
}
- mode, err := MapModeToAristaFork(subList.GetMode())
+ mode, err := mapModeToAristaFork(subList.GetMode())
if err != nil {
return err
}
for _, sub := range subList.Subscription {
- streamMode, err := MapStreamModeToAristaFork(sub.GetStreamMode())
+ streamMode, err := mapStreamModeToAristaFork(sub.GetStreamMode())
if err != nil {
return err
}
@@ -555,7 +555,7 @@ func splitStringPath(s string) []string {
return strings.Split(s, "/")
}
-func MapStreamModeToAristaFork(mode ppb.StreamMode) (string, error) {
+func mapStreamModeToAristaFork(mode ppb.StreamMode) (string, error) {
switch mode {
case ppb.StreamMode_STREAM_MODE_TARGET_DEFINED:
return "target_defined", nil
@@ -568,7 +568,7 @@ func MapStreamModeToAristaFork(mode ppb.StreamMode) (string, error) {
}
}
-func MapModeToAristaFork(mode ppb.SubscriptionMode) (string, error) {
+func mapModeToAristaFork(mode ppb.SubscriptionMode) (string, error) {
switch mode {
case ppb.SubscriptionMode_SUBSCRIPTION_MODE_STREAM:
return "stream", nil
--
GitLab