move handlers package

Author: Omarabdul3ziz

pkg/api/deployment.go

@@ -4,19 +4,20 @@ import (
 	"context"
 	"errors"
 
+	"github.com/threefoldtech/tfgrid-sdk-go/messenger"
 	"github.com/threefoldtech/zosbase/pkg/gridtypes"
 )
 
 func (a *API) DeploymentDeployHandler(ctx context.Context, deployment gridtypes.Deployment) error {
-	twinID, ok := ctx.Value("twin_id").(uint32)
+	twinID, ok := ctx.Value(messenger.TwinIdContextKey).(uint32)
 	if !ok {
 		return errors.New("could not get twin_id from context")
 	}
 	return a.provisionStub.CreateOrUpdate(ctx, twinID, deployment, false)
 }
 
 func (a *API) DeploymentUpdateHandler(ctx context.Context, deployment gridtypes.Deployment) error {
-	twinID, ok := ctx.Value("twin_id").(uint32)
+	twinID, ok := ctx.Value(messenger.TwinIdContextKey).(uint32)
 	if !ok {
 		return errors.New("could not get twin_id from context")
 	}
@@ -28,23 +29,23 @@ func (a *API) DeploymentDeleteHandler(ctx context.Context, contractID uint64) er
 }
 
 func (a *API) DeploymentGetHandler(ctx context.Context, contractID uint64) (gridtypes.Deployment, error) {
-	twinID, ok := ctx.Value("twin_id").(uint32)
+	twinID, ok := ctx.Value(messenger.TwinIdContextKey).(uint32)
 	if !ok {
 		return gridtypes.Deployment{}, errors.New("could not get twin_id from context")
 	}
 	return a.provisionStub.Get(ctx, twinID, contractID)
 }
 
 func (a *API) DeploymentListHandler(ctx context.Context) ([]gridtypes.Deployment, error) {
-	twinID, ok := ctx.Value("twin_id").(uint32)
+	twinID, ok := ctx.Value(messenger.TwinIdContextKey).(uint32)
 	if !ok {
 		return nil, errors.New("could not get twin_id from context")
 	}
 	return a.provisionStub.List(ctx, twinID)
 }
 
 func (a *API) DeploymentChangesHandler(ctx context.Context, contractID uint64) ([]gridtypes.Workload, error) {
-	twinID, ok := ctx.Value("twin_id").(uint32)
+	twinID, ok := ctx.Value(messenger.TwinIdContextKey).(uint32)
 	if !ok {
 		return nil, errors.New("could not get twin_id from context")
 	}

pkg/handlers/handlers.go renamed to pkg/api/jsonrpc/handlers.go

@@ -1,4 +1,4 @@
-package handlers
+package jsonrpc
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	"github.com/threefoldtech/zosbase/pkg/gridtypes"
 )
 
-// TODO: review the api again, rename the pkg rpcapi
 type RpcHandler struct {
 	api *api.API
 }
@@ -43,20 +42,20 @@ func RegisterHandlers(s *messenger.JSONRPCServer, r *RpcHandler) {
 	s.RegisterHandler("network.interfaces", r.handleNetworkInterfaces)
 	s.RegisterHandler("network.set_public_nic", r.handleAdminSetPublicNIC)
 	s.RegisterHandler("network.get_public_nic", r.handleAdminGetPublicNIC)
-	// s.RegisterHandler("network.admin.interfaces", r.handleAdminInterfaces)
+	s.RegisterHandler("network.admin.interfaces", r.handleAdminInterfaces)
 
 	s.RegisterHandler("deployment.deploy", r.handleDeploymentDeploy)
 	s.RegisterHandler("deployment.update", r.handleDeploymentUpdate)
 	s.RegisterHandler("deployment.get", r.handleDeploymentGet)
 	s.RegisterHandler("deployment.list", r.handleDeploymentList)
 	s.RegisterHandler("deployment.changes", r.handleDeploymentChanges)
-	// s.RegisterHandler("deployment.delete", r.handleDeploymentDelete)
+	s.RegisterHandler("deployment.delete", r.handleDeploymentDelete)
 
 	s.RegisterHandler("gpu.list", r.handleGpuList)
 	s.RegisterHandler("storage.pools", r.handleStoragePools)
 	s.RegisterHandler("statistics", r.handleStatistics)
 	s.RegisterHandler("location.get", r.handleLocationGet)
-	// s.RegisterHandler("vm.logs", r.handleVmLogs)
+	s.RegisterHandler("vm.logs", r.handleVmLogs)
 
 }