Merge pull request #1114 from yunfeiyanggzq/bridge_3

feature:modify client api
dragonflyoss · Dec 3, 2019 · e49d466 · e49d466
2 parents d1577a8 + 5e3fab2
commit e49d466
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 14 deletions.
diff --git a/client/interface.go b/client/interface.go
@@ -25,9 +25,28 @@ import (
 // CommonAPIClient defines common methods of api client.
 type CommonAPIClient interface {
 	PreheatAPIClient
+	PeerAPIClient
+	TaskAPIClient
 }
 
 // PreheatAPIClient defines methods of Container client.
 type PreheatAPIClient interface {
-	PreheatCreate(ctx context.Context, config *types.PreheatCreateRequest) (*types.PreheatCreateResponse, error)
+	PreheatCreate(ctx context.Context, request *types.PreheatCreateRequest) (preheatCreateResponse *types.PreheatCreateResponse, err error)
+	PreheatInfo(ctx context.Context, id string) (preheatInfoResponse *types.PreheatInfo, err error)
+}
+
+// PeerAPIClient defines methods of peer related client.
+type PeerAPIClient interface {
+	PeerCreate(ctx context.Context, request *types.PeerCreateRequest) (peerCreateResponse *types.PeerCreateResponse, err error)
+	PeerDelete(ctx context.Context, id string) error
+	PeerInfo(ctx context.Context, id string) (peerInfoResponse *types.PeerInfo, err error)
+	PeerList(ctx context.Context, id string) (peersInfoResponse []*types.PeerInfo, err error)
+}
+
+// TaskAPIClient defines methods of task related client.
+type TaskAPIClient interface {
+	TaskCreate(ctx context.Context, request *types.TaskCreateRequest) (taskCreateResponse *types.TaskCreateResponse, err error)
+	TaskDelete(ctx context.Context, id string) error
+	TaskInfo(ctx context.Context, id string) (taskInfoResponse *types.TaskInfo, err error)
+	TaskUpdate(ctx context.Context, id string, config *types.TaskUpdateRequest) error
 }
diff --git a/client/peer_create.go b/client/peer_create.go
@@ -23,8 +23,8 @@ import (
 )
 
 // PeerCreate creates a peer node in supernode.
-func (client *APIClient) PeerCreate(ctx context.Context, config *types.PeerCreateRequest) (*types.PeerCreateResponse, error) {
-	resp, err := client.post(ctx, "/peers", nil, config, nil)
+func (client *APIClient) PeerCreate(ctx context.Context, request *types.PeerCreateRequest) (peerCreateResponse *types.PeerCreateResponse, err error) {
+	resp, err := client.post(ctx, "/api/v1/peers", nil, request, nil)
 	if err != nil {
 		return nil, err
 	}

diff --git a/client/peer_delete.go b/client/peer_delete.go
@@ -22,7 +22,7 @@ import (
 
 // PeerDelete deletes the specified peer in supernode.
 func (client *APIClient) PeerDelete(ctx context.Context, id string) error {
-	resp, err := client.delete(ctx, "/peers/"+id, nil, nil)
+	resp, err := client.delete(ctx, "/api/v1/peers/"+id, nil, nil)
 	if err != nil {
 		return err
 	}

diff --git a/client/peer_info.go b/client/peer_info.go
@@ -23,14 +23,13 @@ import (
 )
 
 // PeerInfo gets detailed information of a peer in supernode.
-func (client *APIClient) PeerInfo(ctx context.Context, id string) (*types.PeerInfo, error) {
-	resp, err := client.get(ctx, "/peers/"+id, nil, nil)
+func (client *APIClient) PeerInfo(ctx context.Context, id string) (peerInfoResponse *types.PeerInfo, err error) {
+	resp, err := client.get(ctx, "/api/v1/peers/"+id, nil, nil)
 	if err != nil {
 		return nil, err
 	}
 
 	peer := &types.PeerInfo{}
-
 	err = decodeBody(peer, resp.Body)
 	ensureCloseReader(resp)
 

diff --git a/client/peer_list.go b/client/peer_list.go
@@ -23,8 +23,8 @@ import (
 )
 
 // PeerList lists detailed information of all peers in supernode.
-func (client *APIClient) PeerList(ctx context.Context, id string) ([]*types.PeerInfo, error) {
-	resp, err := client.get(ctx, "/peers", nil, nil)
+func (client *APIClient) PeerList(ctx context.Context, id string) (peersInfoResponse []*types.PeerInfo, err error) {
+	resp, err := client.get(ctx, "/api/v1/peers", nil, nil)
 	if err != nil {
 		return nil, err
 	}

diff --git a/client/preheat_create.go b/client/preheat_create.go
@@ -23,7 +23,7 @@ import (
 )
 
 // PreheatCreate creates a preheat task.
-func (client *APIClient) PreheatCreate(ctx context.Context, config *types.PreheatCreateRequest) (*types.PreheatCreateResponse, error) {
+func (client *APIClient) PreheatCreate(ctx context.Context, config *types.PreheatCreateRequest) (preheatCreateResponse *types.PreheatCreateResponse, err error) {
 	resp, err := client.post(ctx, "/preheats", nil, config, nil)
 	if err != nil {
 		return nil, err

diff --git a/client/preheat_info.go b/client/preheat_info.go
@@ -23,7 +23,7 @@ import (
 )
 
 // PreheatInfo gets detailed information of a preheat task.
-func (client *APIClient) PreheatInfo(ctx context.Context, id string) (*types.PreheatInfo, error) {
+func (client *APIClient) PreheatInfo(ctx context.Context, id string) (preheatInfoResponse *types.PreheatInfo, err error) {
 	resp, err := client.get(ctx, "/preheats/"+id, nil, nil)
 	if err != nil {
 		return nil, err

diff --git a/client/task_create.go b/client/task_create.go
@@ -23,8 +23,8 @@ import (
 )
 
 // TaskCreate creates a task in supernode.
-func (client *APIClient) TaskCreate(ctx context.Context, config *types.TaskCreateRequest) (*types.TaskCreateResponse, error) {
-	resp, err := client.post(ctx, "/tasks", nil, config, nil)
+func (client *APIClient) TaskCreate(ctx context.Context, request *types.TaskCreateRequest) (taskCreateResponse *types.TaskCreateResponse, err error) {
+	resp, err := client.post(ctx, "/api/v1/tasks", nil, request, nil)
 	if err != nil {
 		return nil, err
 	}

diff --git a/client/task_info.go b/client/task_info.go
@@ -23,7 +23,7 @@ import (
 )
 
 // TaskInfo gets detailed information of a task in supernode.
-func (client *APIClient) TaskInfo(ctx context.Context, id string) (*types.TaskInfo, error) {
+func (client *APIClient) TaskInfo(ctx context.Context, id string) (taskInfoResponse *types.TaskInfo, err error) {
 	resp, err := client.get(ctx, "/tasks/"+id, nil, nil)
 	if err != nil {
 		return nil, err