Skip to content
Snippets Groups Projects
Commit 13a4dba0 authored by Malte Bauch's avatar Malte Bauch
Browse files

change ensureIntendedConfiguration... to use GetModelAsFilteredCopy

parent 783bc48e
Branches
No related tags found
1 merge request!404Enable export and import of SDN configuration
Pipeline #125715 failed
......@@ -239,7 +239,7 @@ func (s *NetworkElementService) createNetworkElementFromStore(loadedNetworkEleme
}
// Use unmarshall from the network elements SBI to unmarshall ygot json in go struct.
opts := []ytypes.UnmarshalOpt{&ytypes.IgnoreReadOnlyFields{}, &ytypes.IgnoreExtraFields{}}
opts := []ytypes.UnmarshalOpt{&ytypes.IgnoreExtraFields{}}
err = mne.SBI().Unmarshal([]byte(loadedNetworkElement.Model), path, mne.GetModel(), opts...)
if err != nil {
return nil, err
......
......@@ -480,7 +480,19 @@ func (pnd *pndImplementation) ensureIntendedConfigurationIsAppliedOnNetworkEleme
return err
}
model, err := mne.GetModelAsString()
model, err := mne.GetModelAsFilteredCopy()
if err != nil {
return err
}
modelAsString, err := ygot.EmitJSON(model, &ygot.EmitJSONConfig{
Format: ygot.RFC7951,
Indent: "",
SkipValidation: true,
RFC7951Config: &ygot.RFC7951JSONConfig{
AppendModuleName: true,
},
})
if err != nil {
return err
}
......@@ -494,7 +506,7 @@ func (pnd *pndImplementation) ensureIntendedConfigurationIsAppliedOnNetworkEleme
req.Update = []*gpb.Update{{
Path: path,
Val: &gpb.TypedValue{
Value: &gpb.TypedValue_JsonIetfVal{JsonIetfVal: []byte(model)},
Value: &gpb.TypedValue_JsonIetfVal{JsonIetfVal: []byte(modelAsString)},
},
}}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment