support netconf responses with multiple root nodes

Author: karimra

pkg/datastore/target/nc.go

@@ -123,7 +123,7 @@ func (t *ncTarget) Get(ctx context.Context, req *sdcpb.GetDataRequest) (*sdcpb.G
 	// building the resulting sdcpb.GetDataResponse struct
 	result := &sdcpb.GetDataResponse{
 		Notification: []*sdcpb.Notification{
-			noti,
+			stripRootDataContainer(noti),
 		},
 	}
 	return result, nil
@@ -363,7 +363,7 @@ func (t *ncTarget) setCandidate(ctx context.Context, req *sdcpb.SetDataRequest)
 				return nil, err
 			}
 			err2 := t.driver.Discard()
-			if err != nil {
+			if err2 != nil {
 				// log failed discard
 				log.Errorf("failed with %v while discarding pending changes after error %v", err2, err)
 			}
@@ -386,3 +386,16 @@ func (t *ncTarget) setCandidate(ctx context.Context, req *sdcpb.SetDataRequest)
 		Timestamp: time.Now().UnixNano(),
 	}, nil
 }
+
+func stripRootDataContainer(n *sdcpb.Notification) *sdcpb.Notification {
+	for i := range n.GetUpdate() {
+		numElem := len(n.Update[i].GetPath().GetElem())
+		if numElem == 0 {
+			continue
+		}
+		if n.Update[i].GetPath().GetElem()[0].GetName() == "data" {
+			n.Update[i].GetPath().Elem = n.Update[i].GetPath().Elem[1:]
+		}
+	}
+	return n
+}

pkg/datastore/target/nc_test.go

@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"github.com/beevik/etree"
-
 	"github.com/sdcio/data-server/mocks/mocknetconf"
 	"github.com/sdcio/data-server/mocks/mockschema"
 	"github.com/sdcio/data-server/pkg/config"
@@ -272,3 +271,111 @@ func Test_ncTarget_Get(t *testing.T) {
 		})
 	}
 }
+
+func Test_stripDataContainerRoot(t *testing.T) {
+	type args struct {
+		n *sdcpb.Notification
+	}
+	tests := []struct {
+		name string
+		args args
+		want *sdcpb.Notification
+	}{
+		{
+			name: "test0",
+			args: args{
+				n: &sdcpb.Notification{
+					Timestamp: 42,
+					Update: []*sdcpb.Update{{
+						Path:  &sdcpb.Path{},
+						Value: &sdcpb.TypedValue{},
+					}},
+				},
+			},
+			want: &sdcpb.Notification{
+				Timestamp: 42,
+				Update: []*sdcpb.Update{{
+					Path:  &sdcpb.Path{},
+					Value: &sdcpb.TypedValue{},
+				}},
+			},
+		},
+		{
+			name: "test1",
+			args: args{
+				n: &sdcpb.Notification{
+					Timestamp: 42,
+					Update: []*sdcpb.Update{{
+						Path: &sdcpb.Path{
+							Elem: []*sdcpb.PathElem{
+								{
+									Name: "data",
+								},
+								{
+									Name: "configure"},
+							},
+						},
+						Value: &sdcpb.TypedValue{},
+					}},
+				},
+			},
+			want: &sdcpb.Notification{
+				Timestamp: 42,
+				Update: []*sdcpb.Update{{
+					Path: &sdcpb.Path{
+						Elem: []*sdcpb.PathElem{
+							{
+								Name: "configure",
+							},
+						},
+					},
+					Value: &sdcpb.TypedValue{},
+				}},
+			},
+		},
+		{
+			name: "test2",
+			args: args{
+				n: &sdcpb.Notification{
+					Timestamp: 42,
+					Update: []*sdcpb.Update{{
+						Path: &sdcpb.Path{
+							Elem: []*sdcpb.PathElem{
+								{
+									Name: "not_data",
+								},
+								{
+									Name: "configure",
+								},
+							},
+						},
+						Value: &sdcpb.TypedValue{},
+					}},
+				},
+			},
+			want: &sdcpb.Notification{
+				Timestamp: 42,
+				Update: []*sdcpb.Update{{
+					Path: &sdcpb.Path{
+						Elem: []*sdcpb.PathElem{
+							{
+								Name: "not_data",
+							},
+							{
+								Name: "configure",
+							},
+						},
+					},
+					Value: &sdcpb.TypedValue{},
+				}},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := stripRootDataContainer(tt.args.n); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("stripDataContainerRoot() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/datastore/target/netconf/driver/scrapligo/scrapligo.go

@@ -144,7 +144,7 @@ func (snt *ScrapligoNetconfTarget) GetConfig(source string, filter string) (*typ
 
 	// the actual config is contained under /rpc-reply/data/ in the result document.
 	// so we are extracting that portion
-	newRootXpath := "/rpc-reply/data/*"
+	newRootXpath := "/rpc-reply/data"
 	r := x.FindElement(newRootXpath)
 	if r == nil {
 		return nil, fmt.Errorf("unable to find %q in %s", newRootXpath, resp.Result)
@@ -194,7 +194,7 @@ func (snt *ScrapligoNetconfTarget) Get(filter string) (*types.NetconfResponse, e
 		return nil, err
 	}
 
-	newRootXpath := "/rpc-reply/data/*"
+	newRootXpath := "/rpc-reply/data"
 	r := x.FindElement(newRootXpath)
 	if r == nil {
 		return nil, fmt.Errorf("unable to find %q in %s", newRootXpath, resp.Result)