Skip to content
Snippets Groups Projects
Commit 574da4a4 authored by André Sterba's avatar André Sterba
Browse files

Fix processing delete response

parent 3df2d72c
No related branches found
No related tags found
1 merge request!342Resolve "Add an option to send gNMI Subscribe requests via SBI"
Pipeline #110117 passed
...@@ -314,29 +314,25 @@ func handleProcessResponseErrors(errs []error) error { ...@@ -314,29 +314,25 @@ func handleProcessResponseErrors(errs []error) error {
return fmt.Errorf("encountered %v errors during response processing\n%v", len(errs), errs) return fmt.Errorf("encountered %v errors during response processing\n%v", len(errs), errs)
} }
func (g *Gnmi) processResponseDeletes(deletes []*gpb.Path, root ygot.ValidatedGoStruct, s *ytypes.Schema) error { func (g *Gnmi) processResponseDeletes(deletes []*gpb.Path, deviceModel ygot.ValidatedGoStruct, rootSchema *ytypes.Schema) error {
errs := make([]error, 0) if err := ytypes.DeleteNode(rootSchema.RootSchema(), deviceModel, deletes[0]); err != nil {
return err
for _, path := range deletes { }
if err := ytypes.DeleteNode(s.RootSchema(), root, path); err != nil { modelAsString, _ := ygot.EmitJSON(deviceModel, &ygot.EmitJSONConfig{
errs = append(errs, err) Format: ygot.RFC7951,
} Indent: "",
modelAsString, _ := ygot.EmitJSON(root, &ygot.EmitJSONConfig{ SkipValidation: true,
Format: ygot.RFC7951, RFC7951Config: &ygot.RFC7951JSONConfig{
Indent: "", AppendModuleName: true,
SkipValidation: true, }})
RFC7951Config: &ygot.RFC7951JSONConfig{
AppendModuleName: true, rootPath, err := ygot.StringToStructuredPath("/")
}}) if err != nil {
if err := g.Unmarshal([]byte(modelAsString), path, root); err != nil { return err
errs = append(errs, err)
}
log.Error(root)
} }
if len(errs) != 0 { if err := g.Unmarshal([]byte(modelAsString), rootPath, deviceModel); err != nil {
return handleProcessResponseErrors(errs) return err
} }
return nil return nil
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment