Skip to content

Commit 36ef26f

Browse files
VSuryaprasad-HCLparmarkj
authored andcommitted
[sdn_tests]: Adding GNMI testhelper to pins_ondatra. (sonic-net#12667)
* [sdn_tests]: Adding Build support for pins_ondatra * [sdn_tests]: Adding binding infra to pins_ondatra. * [sdn_tests]: Adding cert generation script and certs folder to pins_ondatra. * [sdn_tests]: Adding Data Infra to pins_ondatra. * [sdn_tests]: Adding gnmi testhelper to pins_ondatra.
1 parent a558bf2 commit 36ef26f

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

sdn_tests/pins_ondatra/infrastructure/testhelper/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ go_library(
99
name = "testhelper",
1010
testonly = 1,
1111
srcs = [
12+
<<<<<<< HEAD
1213
"augment.go",
1314
"gnmi.go",
1415
"gnoi.go",
@@ -21,6 +22,9 @@ go_library(
2122
"results.go",
2223
"ssh.go",
2324
"//infrastructure/testhelper/platform_info:platform_info",
25+
=======
26+
"gnmi.go",
27+
>>>>>>> [sdn_tests]: Adding GNMI testhelper to pins_ondatra. (#12667)
2428
],
2529
data = [
2630
"//infrastructure/data",

sdn_tests/pins_ondatra/infrastructure/testhelper/gnmi.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ package testhelper
22

33
import (
44
"context"
5+
<<<<<<< HEAD
56
"os"
67
"testing"
78

89
closer "github.com/openconfig/gocloser"
10+
=======
11+
"testing"
12+
13+
>>>>>>> [sdn_tests]: Adding GNMI testhelper to pins_ondatra. (#12667)
914
"github.com/openconfig/ondatra"
1015
"github.com/openconfig/ondatra/gnmi"
1116
"github.com/openconfig/ondatra/gnmi/oc/system"
@@ -90,6 +95,7 @@ func CreateSubscribeRequest(params SubscribeRequestParams) (*gpb.SubscribeReques
9095
},
9196
}, nil
9297
}
98+
<<<<<<< HEAD
9399

94100
// GNMIAble returns whether the gNMI server on the specified device is reachable
95101
// or not.
@@ -154,3 +160,5 @@ func ConfigPush(t *testing.T, dut *ondatra.DUTDevice, config *[]byte) error {
154160
_, err := gnmiSet(t, dut, setRequest)
155161
return err
156162
}
163+
=======
164+
>>>>>>> [sdn_tests]: Adding GNMI testhelper to pins_ondatra. (#12667)

0 commit comments

Comments
 (0)