X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fusecases%2Foruclosedlooprecovery%2Fgoversion%2Finternal%2Frestclient%2Fclient.go;h=036819a0d376405efe31281a72d8fc7c92949ad2;hb=cc74808f1f5835a0b42c77ced5a585648d6d434c;hp=310a44934c7e73f4f01eb31b06feb566b314e2ac;hpb=2f0d0d08efe5efe671178e63fdab4dacee543f9a;p=nonrtric.git

diff --git a/test/usecases/oruclosedlooprecovery/goversion/internal/restclient/client.go b/test/usecases/oruclosedlooprecovery/goversion/internal/restclient/client.go
index 310a4493..036819a0 100644
--- a/test/usecases/oruclosedlooprecovery/goversion/internal/restclient/client.go
+++ b/test/usecases/oruclosedlooprecovery/goversion/internal/restclient/client.go
@@ -25,7 +25,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"time"
 )
 
 type RequestError struct {
@@ -33,8 +32,8 @@ type RequestError struct {
 	Body       []byte
 }
 
-func (pe RequestError) Error() string {
-	return fmt.Sprintf("Request failed due to error response with status: %v and body: %v", pe.StatusCode, string(pe.Body))
+func (e RequestError) Error() string {
+	return fmt.Sprintf("Request failed due to error response with status: %v and body: %v", e.StatusCode, string(e.Body))
 }
 
 // HTTPClient interface
@@ -44,46 +43,19 @@ type HTTPClient interface {
 	Do(*http.Request) (*http.Response, error)
 }
 
-var (
-	Client HTTPClient
-)
-
-func init() {
-	Client = &http.Client{
-		Timeout: time.Second * 5,
-	}
-}
-
-func Get(url string) ([]byte, error) {
-	if response, err := Client.Get(url); err == nil {
-		if isResponseSuccess(response.StatusCode) {
-			defer response.Body.Close()
-			if responseData, err := io.ReadAll(response.Body); err == nil {
-				return responseData, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			return nil, getResponseError(response)
-		}
-	} else {
-		return nil, err
-	}
-}
-
-func PutWithoutAuth(url string, body []byte) error {
-	return do(http.MethodPut, url, body)
+func PutWithoutAuth(url string, body []byte, client HTTPClient) error {
+	return do(http.MethodPut, url, body, client)
 }
 
-func Put(url string, body string, userName string, password string) error {
-	return do(http.MethodPut, url, []byte(body), userName, password)
+func Put(url string, body string, client HTTPClient, userName string, password string) error {
+	return do(http.MethodPut, url, []byte(body), client, userName, password)
 }
 
-func Delete(url string) error {
-	return do(http.MethodDelete, url, nil)
+func Delete(url string, client HTTPClient) error {
+	return do(http.MethodDelete, url, nil, client)
 }
 
-func do(method string, url string, body []byte, userInfo ...string) error {
+func do(method string, url string, body []byte, client HTTPClient, userInfo ...string) error {
 	if req, reqErr := http.NewRequest(method, url, bytes.NewBuffer(body)); reqErr == nil {
 		if body != nil {
 			req.Header.Set("Content-Type", "application/json; charset=utf-8")
@@ -91,7 +63,7 @@ func do(method string, url string, body []byte, userInfo ...string) error {
 		if len(userInfo) > 0 {
 			req.SetBasicAuth(userInfo[0], userInfo[1])
 		}
-		if response, respErr := Client.Do(req); respErr == nil {
+		if response, respErr := client.Do(req); respErr == nil {
 			if isResponseSuccess(response.StatusCode) {
 				return nil
 			} else {