From 96314cee88bbbcf77bd8dd825ba14fb59de9ef20 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Thu, 2 Feb 2023 09:58:51 +0000
Subject: [PATCH] fixed missing pndId in store and test
---
controller/nucleus/networkElement.go | 12 ++++++++++++
controller/nucleus/networkElementService.go | 3 ---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/controller/nucleus/networkElement.go b/controller/nucleus/networkElement.go
index d79ba1acb..848260ae6 100644
--- a/controller/nucleus/networkElement.go
+++ b/controller/nucleus/networkElement.go
@@ -282,6 +282,14 @@ func (n *CommonNetworkElement) MarshalJSON() ([]byte, error) {
sbiUUID = n.sbi.ID()
}
+ var pndUUID uuid.UUID
+
+ if n.PndID == uuid.Nil {
+ pndUUID = uuid.UUID{}
+ } else {
+ pndUUID = n.PndID
+ }
+
modelAsString, err := ygot.EmitJSON(n.Model, n.getYgotEmitJSONConfig())
if err != nil {
return []byte{}, err
@@ -297,6 +305,7 @@ func (n *CommonNetworkElement) MarshalJSON() ([]byte, error) {
TransportOptionType spb.Type `json:"transport_option"`
SBI uuid.UUID `json:"sbi,omitempty"`
Model string `bson:"model,omitempty"`
+ PndID uuid.UUID `json:"pnd_id,omitempty"`
}{
ID: n.ID(),
Name: n.Name(),
@@ -307,6 +316,7 @@ func (n *CommonNetworkElement) MarshalJSON() ([]byte, error) {
TransportOptionType: transportOptionType,
SBI: sbiUUID,
Model: modelAsString,
+ PndID: pndUUID,
})
}
@@ -350,6 +360,7 @@ func (n *CommonNetworkElement) MarshalBSON() ([]byte, error) {
TransportOptionType spb.Type `bson:"transport_option"`
SBI string `bson:"sbi,omitempty"`
Model string `bson:"model,omitempty"`
+ PndID string `bson:"pnd_id,omitempty"`
}{
ID: n.ID().String(),
Name: n.Name(),
@@ -360,6 +371,7 @@ func (n *CommonNetworkElement) MarshalBSON() ([]byte, error) {
TransportOptionType: transportOptionType,
SBI: n.sbi.ID().String(),
Model: modelAsString,
+ PndID: n.PndID.String(),
})
}
diff --git a/controller/nucleus/networkElementService.go b/controller/nucleus/networkElementService.go
index ae67f9335..940726f39 100644
--- a/controller/nucleus/networkElementService.go
+++ b/controller/nucleus/networkElementService.go
@@ -214,9 +214,6 @@ func (s *NetworkElementService) createNetworkElementFromStore(loadedNetworkEleme
return nil, err
}
- //TODO(PND): remove when pndID can be added to stored MNE!
- fmt.Println(loadedNetworkElement.PndID)
-
mne, err := NewNetworkElement(
loadedNetworkElement.Name,
uuid.MustParse(loadedNetworkElement.ID),
--
GitLab