Move client folder to Uyuni folder

Marcelo Chiaradia · chiaradiamarcelo · commit 4cb7210aaec9 · 2020-08-18T16:43:34.000+02:00
diff --git a/initialization/initializitation.go b/initialization/initializitation.go
@@ -6,7 +6,6 @@ import (
 	"sync"
 
 	"github.com/gorilla/rpc"
-	"github.com/uyuni-project/hub-xmlrpc-api/client"
 	"github.com/uyuni-project/hub-xmlrpc-api/config"
 	"github.com/uyuni-project/hub-xmlrpc-api/controller"
 	"github.com/uyuni-project/hub-xmlrpc-api/controller/parser"
@@ -15,6 +14,7 @@ import (
 	"github.com/uyuni-project/hub-xmlrpc-api/gateway"
 	"github.com/uyuni-project/hub-xmlrpc-api/session"
 	"github.com/uyuni-project/hub-xmlrpc-api/uyuni"
+	"github.com/uyuni-project/hub-xmlrpc-api/uyuni/client"
 )
 
 func InitServer() {
@@ -47,7 +47,7 @@ func InitServer() {
 	multicaster := gateway.NewMulticaster(uyuniCallExecutor, hubSessionRepository)
 	unicaster := gateway.NewUnicaster(uyuniCallExecutor, serverSessionRepository)
 
-	//init controller
+	//init controllers
 	xmlrpcCodec := initCodec()
 	rpcServer.RegisterCodec(xmlrpcCodec, "text/xml")
 
diff --git a/integration_tests/authentication_intergration_test.go b/integration_tests/authentication_intergration_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/uyuni-project/hub-xmlrpc-api/client"
+	"github.com/uyuni-project/hub-xmlrpc-api/uyuni/client"
 )
 
 func Test_LoginWithManualMode(t *testing.T) {
diff --git a/integration_tests/hub_proxy_intergration_test.go b/integration_tests/hub_proxy_intergration_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/uyuni-project/hub-xmlrpc-api/client"
+	"github.com/uyuni-project/hub-xmlrpc-api/uyuni/client"
 )
 
 func Test_ProxyCallToHub(t *testing.T) {
diff --git a/integration_tests/logout_integration_test.go b/integration_tests/logout_integration_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/uyuni-project/hub-xmlrpc-api/client"
+	"github.com/uyuni-project/hub-xmlrpc-api/uyuni/client"
 )
 
 func Test_Logout(t *testing.T) {
diff --git a/integration_tests/multicast_intergration_test.go b/integration_tests/multicast_intergration_test.go
@@ -3,7 +3,7 @@ package integration_tests
 import (
 	"testing"
 
-	"github.com/uyuni-project/hub-xmlrpc-api/client"
+	"github.com/uyuni-project/hub-xmlrpc-api/uyuni/client"
 )
 
 func Test_Multicast(t *testing.T) {
diff --git a/integration_tests/unicast_integration_test.go b/integration_tests/unicast_integration_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/uyuni-project/hub-xmlrpc-api/client"
+	"github.com/uyuni-project/hub-xmlrpc-api/uyuni/client"
 )
 
 func Test_Unicast(t *testing.T) {
diff --git a/uyuni/client.go b/uyuni/client.go
diff --git a/uyuni/client/xmlrpc_client.go b/uyuni/client/xmlrpc_client.go
diff --git a/uyuni/client/xmlrpc_client_test.go b/uyuni/client/xmlrpc_client_test.go
diff --git a/uyuni/uyuni_call_executor.go b/uyuni/uyuni_call_executor.go
@@ -4,6 +4,10 @@ type uyuniCallExecutor struct {
 	client Client
 }
 
+type Client interface {
+	ExecuteCall(endpoint string, call string, args []interface{}) (response interface{}, err error)
+}
+
 func NewUyuniCallExecutor(client Client) *uyuniCallExecutor {
 	return &uyuniCallExecutor{client}
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"strings"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/uyuni-project/hub-xmlrpc-api/client"`
	`7`	`+ "github.com/uyuni-project/hub-xmlrpc-api/uyuni/client"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func Test_LoginWithManualMode(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package integration_tests`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/uyuni-project/hub-xmlrpc-api/client"`
	`6`	`+ "github.com/uyuni-project/hub-xmlrpc-api/uyuni/client"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func Test_Multicast(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@ type uyuniCallExecutor struct {`
`4`	`4`	`client Client`
`5`	`5`	`}`
`6`	`6`
	`7`	`+type Client interface {`
	`8`	`+ ExecuteCall(endpoint string, call string, args []interface{}) (response interface{}, err error)`
	`9`	`+}`
	`10`	`+`
`7`	`11`	`func NewUyuniCallExecutor(client Client) *uyuniCallExecutor {`
`8`	`12`	`return &uyuniCallExecutor{client}`
`9`	`13`	`}`