Merge d5b6c8f into a37d079

onosproject · May 29, 2019 · 59d3fba · 59d3fba
2 parents a37d079 + d5b6c8f
commit 59d3fba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/manager/manager_test.go b/pkg/manager/manager_test.go
@@ -75,7 +75,7 @@ func setUp() (*Manager, map[string]*change.Change, map[store.ConfigName]store.Co
 	changeStoreTest[store.B64(change1.ID)] = change1
 
 	device1config, err = store.CreateConfiguration("Device1", "1.0.0", "TestDevice",
-		[]gnmi.ModelData{gnmi.ModelData{Name: "test", Version: "1.0.0", Organization: "test"}},
+		[]gnmi.ModelData{{Name: "test", Version: "1.0.0", Organization: "test"}},
 		[]change.ID{change1.ID})
 
 	configurationStoreTest = make(map[store.ConfigName]store.Configuration)

diff --git a/pkg/northbound/gnmi/set_test.go b/pkg/northbound/gnmi/set_test.go
@@ -49,7 +49,7 @@ func Test_doSingleSet(t *testing.T) {
 		Delete:  deletePaths,
 		Replace: replacedPaths,
 		Update:  updatedPaths,
-		Extension: []*gnmi_ext.Extension{&gnmi_ext.Extension{
+		Extension: []*gnmi_ext.Extension{{
 			Ext: &ext100Name,
 		}},
 	}

diff --git a/pkg/store/store-api_test.go b/pkg/store/store-api_test.go
@@ -237,7 +237,7 @@ func TestMain(m *testing.M) {
 	changeStore[B64(change3.ID)] = change3
 
 	device1V, err = CreateConfiguration("Device1", "1.0.0", "TestDevice",
-		[]gnmi.ModelData{gnmi.ModelData{Name: "test", Version: "1.0.0", Organization: "onosproject"}},
+		[]gnmi.ModelData{{Name: "test", Version: "1.0.0", Organization: "onosproject"}},
 		[]change.ID{change1.ID, change2.ID, change3.ID})
 	if err != nil {
 		fmt.Println(err)
@@ -258,7 +258,7 @@ func TestMain(m *testing.M) {
 	changeStore[B64(change4.ID)] = change4
 
 	device2V, err = CreateConfiguration("Device2", "1.0.0", "TestDevice",
-		[]gnmi.ModelData{gnmi.ModelData{Name: "test", Version: "1.0.0", Organization: "onosproject"}},
+		[]gnmi.ModelData{{Name: "test", Version: "1.0.0", Organization: "onosproject"}},
 		[]change.ID{change1.ID, change2.ID, change4.ID})
 	if err != nil {
 		fmt.Println(err)