Skip to content

Commit 96ac709

Browse files
committed
enhance: use polymorphism on graphql and remove dublicate code
Signed-off-by: nabil salah <nabil.salah203@gmail.com>
1 parent 13ec903 commit 96ac709

File tree

2 files changed

+11
-26
lines changed

2 files changed

+11
-26
lines changed

pkg/perf/iperf/graphql_wrapper.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,3 @@ import (
1010
type GraphQLClient interface {
1111
GetUpNodes(ctx context.Context, nodesNum int, farmID, excludeFarmID uint32, ipv4, ipv6 bool) ([]graphql.Node, error)
1212
}
13-
14-
// GraphQLClientWrapper wraps the real GraphQL client to implement the interface
15-
type GraphQLClientWrapper struct {
16-
client graphql.GraphQl
17-
}
18-
19-
// NewGraphQLClientWrapper creates a new wrapper for the GraphQL client
20-
func NewGraphQLClientWrapper(client graphql.GraphQl) GraphQLClient {
21-
return &GraphQLClientWrapper{client: client}
22-
}
23-
24-
// GetUpNodes calls the underlying GraphQL client's GetUpNodes method
25-
func (g *GraphQLClientWrapper) GetUpNodes(ctx context.Context, nodesNum int, farmID, excludeFarmID uint32, ipv4, ipv6 bool) ([]graphql.Node, error) {
26-
return g.client.GetUpNodes(ctx, nodesNum, farmID, excludeFarmID, ipv4, ipv6)
27-
}

pkg/perf/iperf/iperf_task.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ func (t *IperfTest) Run(ctx context.Context) (interface{}, error) {
8282
var g GraphQLClient
8383
var err error
8484

85-
// Use injected GraphQL client if available, otherwise create a new one
8685
if t.graphqlClient != nil {
8786
g = t.graphqlClient
8887
} else {
@@ -91,7 +90,7 @@ func (t *IperfTest) Run(ctx context.Context) (interface{}, error) {
9190
if err != nil {
9291
return nil, err
9392
}
94-
g = NewGraphQLClientWrapper(graphqlClient)
93+
g = &graphqlClient
9594
}
9695

9796
// get public up nodes
@@ -107,15 +106,17 @@ func (t *IperfTest) Run(ctx context.Context) (interface{}, error) {
107106

108107
nodes = append(nodes, freeFarmNodes...)
109108

110-
// Use injected exec wrapper if available
111-
execWrap := execWrapper
112109
if t.execWrapper != nil {
113-
execWrap = t.execWrapper
114-
}
115-
116-
_, err = execWrap.LookPath("iperf")
117-
if err != nil {
118-
return nil, err
110+
execWrap := t.execWrapper
111+
_, err = execWrap.LookPath("iperf")
112+
if err != nil {
113+
return nil, err
114+
}
115+
} else {
116+
_, err = exec.LookPath("iperf")
117+
if err != nil {
118+
return nil, err
119+
}
119120
}
120121

121122
var results []IperfResult
@@ -169,7 +170,6 @@ func (t *IperfTest) runIperfTest(ctx context.Context, clientIP string, tcp bool)
169170
opts = append(opts, "--length", "16B", "--udp")
170171
}
171172

172-
// Use injected exec wrapper if available
173173
execWrap := execWrapper
174174
if t.execWrapper != nil {
175175
execWrap = t.execWrapper

0 commit comments

Comments
 (0)