From eb7093005c7ce69806a2366923b2005d2b97f8c2 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Fri, 25 Aug 2023 10:49:26 +0000
Subject: [PATCH] Resolve "Investigate MarshalJSON for network element in
nucleus/networkelement uses bson annotation for model"
See merge request danet/gosdn!523
---
controller/controller.go | 1 +
controller/nucleus/networkElement.go | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/controller/controller.go b/controller/controller.go
index 33d92e4c3..f830c20df 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -287,6 +287,7 @@ func ensureDefaultRoleExists() error {
"/gosdn.networkelement.NetworkElementService/GetFlattenedMne",
"/gosdn.networkelement.NetworkElementService/GetFlattenedMneList",
"/gosdn.networkelement.NetworkElementService/GetPath",
+ "/gosdn.networkelement.NetworkElementService/GetIntendedPath",
"/gosdn.networkelement.NetworkElementService/GetChange",
"/gosdn.networkelement.NetworkElementService/GetChangeList",
"/gosdn.networkelement.NetworkElementService/SetMneList",
diff --git a/controller/nucleus/networkElement.go b/controller/nucleus/networkElement.go
index 6c2a77ef7..fc1d8e419 100644
--- a/controller/nucleus/networkElement.go
+++ b/controller/nucleus/networkElement.go
@@ -276,7 +276,7 @@ func (n *CommonNetworkElement) MarshalJSON() ([]byte, error) {
TransportOptionType spb.Type `json:"transport_option"`
TransportTLS bool `json:"transport_tls"`
Plugin uuid.UUID `json:"plugin,omitempty"`
- Model string `bson:"model,omitempty"`
+ Model string `json:"model,omitempty"`
PndID uuid.UUID `json:"pnd_id,omitempty"`
}{
ID: n.ID(),
--
GitLab