second try

Author: karimra

pkg/datastore/target/nc.go

@@ -122,9 +122,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{
-			stripRootDataContainer(noti),
-		},
+		Notification: noti,
 	}
 	return result, nil
 }
@@ -386,16 +384,3 @@ 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

@@ -271,111 +271,3 @@ 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/xml2SchemapbAdapter.go

@@ -41,11 +41,18 @@ func NewXML2sdcpbConfigAdapter(ssc schema.Client, schema *sdcpb.Schema) *XML2sdc
 }
 
 // Transform takes an etree.Document and transforms the content into a sdcpb based Notification
-func (x *XML2sdcpbConfigAdapter) Transform(ctx context.Context, doc *etree.Document) (*sdcpb.Notification, error) {
-	result := &sdcpb.Notification{}
-	err := x.transformRecursive(ctx, doc.Root(), []*sdcpb.PathElem{}, result, nil)
+func (x *XML2sdcpbConfigAdapter) Transform(ctx context.Context, doc *etree.Document) ([]*sdcpb.Notification, error) {
+	result := make([]*sdcpb.Notification, 0, len(doc.ChildElements()))
+	for _, e := range doc.ChildElements() {
+		r := &sdcpb.Notification{}
+		err := x.transformRecursive(ctx, e, []*sdcpb.PathElem{}, r, nil)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, r)
+	}
 
-	return result, err
+	return result, nil
 }
 
 func (x *XML2sdcpbConfigAdapter) transformRecursive(ctx context.Context, e *etree.Element, pelems []*sdcpb.PathElem, result *sdcpb.Notification, tc *TransformationContext) error {

pkg/datastore/target/netconf/xml2SchemapbAdapter_test.go

@@ -57,7 +57,7 @@ func TestXML2sdcpbConfigAdapter_Transform(t *testing.T) {
 		name                      string
 		getXML2sdcpbConfigAdapter func(ctrl *gomock.Controller, t *testing.T) *XML2sdcpbConfigAdapter
 		args                      args
-		want                      *sdcpb.Notification
+		want                      []*sdcpb.Notification
 		wantErr                   bool
 	}{
 		{
@@ -124,28 +124,30 @@ func TestXML2sdcpbConfigAdapter_Transform(t *testing.T) {
 				)
 				return NewXML2sdcpbConfigAdapter(schemaClientMock, TestSchema)
 			},
-			want: &sdcpb.Notification{
-				Update: []*sdcpb.Update{
-					{
-						Path: &sdcpb.Path{
-							Elem: []*sdcpb.PathElem{
-								{
-									Name: "interfaces",
-								},
-								{
-									Name: "interface",
-									Key: map[string]string{
-										"name": "eth0",
+			want: []*sdcpb.Notification{
+				{
+					Update: []*sdcpb.Update{
+						{
+							Path: &sdcpb.Path{
+								Elem: []*sdcpb.PathElem{
+									{
+										Name: "interfaces",
+									},
+									{
+										Name: "interface",
+										Key: map[string]string{
+											"name": "eth0",
+										},
+									},
+									{
+										Name: "name",
 									},
-								},
-								{
-									Name: "name",
 								},
 							},
-						},
-						Value: &sdcpb.TypedValue{
-							Value: &sdcpb.TypedValue_StringVal{
-								StringVal: "eth0",
+							Value: &sdcpb.TypedValue{
+								Value: &sdcpb.TypedValue_StringVal{
+									StringVal: "eth0",
+								},
 							},
 						},
 					},
@@ -159,17 +161,19 @@ func TestXML2sdcpbConfigAdapter_Transform(t *testing.T) {
 			mockCtrl := gomock.NewController(t)
 
 			x := tt.getXML2sdcpbConfigAdapter(mockCtrl, t)
-			// tt.args.doc.Indent(2)
-			// s, _ := tt.args.doc.WriteToString()
-			// fmt.Println(s)
 			got, err := x.Transform(tt.args.ctx, tt.args.doc)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("XML2sdcpbConfigAdapter.Transform() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !utils.NotificationsEqual(got, tt.want) {
+			if len(got) != len(tt.want) {
 				t.Errorf("XML2sdcpbConfigAdapter.Transform() = %v, want %v", got, tt.want)
 			}
+			for i := range got {
+				if !utils.NotificationsEqual(got[i], tt.want[i]) {
+					t.Errorf("XML2sdcpbConfigAdapter.Transform() = %v, want %v", got[i], tt.want[i])
+				}
+			}
 		})
 	}
 }