Skip to content
Snippets Groups Projects
Commit 96314cee authored by Fabian Seidl's avatar Fabian Seidl
Browse files

fixed missing pndId in store and test

parent 2957517d
No related branches found
No related tags found
1 merge request!416Resolve "Refactor how PNDs are implemented in the code"
Pipeline #130928 failed
This commit is part of merge request !416. Comments created here will be created in the context of that merge request.
......@@ -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(),
})
}
......
......@@ -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),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment