feat: implement cmd management for targets, LUNs, and TPGTs (fixes #36)
- Fix target delete URL path mismatch (/targets/ -> /target/) - Implement target create/delete server handlers with proper validation - Add DeleteTarget method with force flag and mutex locking to SCSITargetService - Implement full LU management: create/list/delete through CLI, client, and server - Add TPGT list command to show target portal group tags - Add unit tests for target/LU router handlers and SCSI service Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -16,27 +16,30 @@ limitations under the License.
|
||||
package target
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"github.com/gostor/gotgt/pkg/api"
|
||||
"github.com/gostor/gotgt/pkg/apiserver/httputils"
|
||||
"github.com/gostor/gotgt/pkg/apiserver/router"
|
||||
"github.com/gostor/gotgt/pkg/scsi"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
// containerRouter is a router to talk with the container controller
|
||||
// targetRouter is a router to talk with the target controller
|
||||
type targetRouter struct {
|
||||
routes []router.Route
|
||||
}
|
||||
|
||||
// NewRouter initializes a new container router
|
||||
// NewRouter initializes a new target router
|
||||
func NewRouter() router.Router {
|
||||
r := &targetRouter{}
|
||||
r.initRoutes()
|
||||
return r
|
||||
}
|
||||
|
||||
// Routes returns the available routers to the container controller
|
||||
// Routes returns the available routers to the target controller
|
||||
func (r *targetRouter) Routes() []router.Route {
|
||||
return r.routes
|
||||
}
|
||||
@@ -46,10 +49,10 @@ func (r *targetRouter) initRoutes() {
|
||||
r.routes = []router.Route{
|
||||
// GET
|
||||
router.NewGetRoute("/target/list", r.getTargetList),
|
||||
router.NewGetRoute("/target/tpgt/list", r.getTargetTPGTList),
|
||||
// POST
|
||||
router.NewPostRoute("/target/create", r.postTargetCreate),
|
||||
router.NewPostRoute("/target/up", r.postTargetUp),
|
||||
// PUT
|
||||
// DELETE
|
||||
router.NewDeleteRoute("/target/{name:.*}", r.deleteTarget),
|
||||
}
|
||||
@@ -65,7 +68,20 @@ func (r *targetRouter) getTargetList(ctx context.Context, w http.ResponseWriter,
|
||||
}
|
||||
|
||||
func (r *targetRouter) postTargetCreate(ctx context.Context, w http.ResponseWriter, req *http.Request, vars map[string]string) error {
|
||||
return nil
|
||||
var opts api.TargetCreateRequest
|
||||
if err := json.NewDecoder(req.Body).Decode(&opts); err != nil {
|
||||
return fmt.Errorf("bad parameter: %v", err)
|
||||
}
|
||||
if opts.Name == "" {
|
||||
return fmt.Errorf("bad parameter: target name is required")
|
||||
}
|
||||
|
||||
service := scsi.NewSCSITargetService()
|
||||
target, err := service.NewSCSITarget(len(service.Targets), "iscsi", opts.Name)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return httputils.WriteJSON(w, http.StatusCreated, target)
|
||||
}
|
||||
|
||||
func (r *targetRouter) postTargetUp(ctx context.Context, w http.ResponseWriter, req *http.Request, vars map[string]string) error {
|
||||
@@ -73,5 +89,51 @@ func (r *targetRouter) postTargetUp(ctx context.Context, w http.ResponseWriter,
|
||||
}
|
||||
|
||||
func (r *targetRouter) deleteTarget(ctx context.Context, w http.ResponseWriter, req *http.Request, vars map[string]string) error {
|
||||
name := vars["name"]
|
||||
if name == "" {
|
||||
return fmt.Errorf("bad parameter: target name is required")
|
||||
}
|
||||
|
||||
if err := httputils.ParseForm(req); err != nil {
|
||||
return err
|
||||
}
|
||||
force := httputils.BoolValue(req, "force")
|
||||
|
||||
service := scsi.NewSCSITargetService()
|
||||
if err := service.DeleteTarget(name, force); err != nil {
|
||||
return err
|
||||
}
|
||||
w.WriteHeader(http.StatusNoContent)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *targetRouter) getTargetTPGTList(ctx context.Context, w http.ResponseWriter, req *http.Request, vars map[string]string) error {
|
||||
if err := httputils.ParseForm(req); err != nil {
|
||||
return err
|
||||
}
|
||||
targetName := req.FormValue("target")
|
||||
if targetName == "" {
|
||||
return fmt.Errorf("bad parameter: target name is required")
|
||||
}
|
||||
|
||||
service := scsi.NewSCSITargetService()
|
||||
tgts, err := service.GetTargetList()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, tgt := range tgts {
|
||||
if tgt.Name == targetName {
|
||||
var result []api.TpgtInfo
|
||||
for _, tpg := range tgt.TargetPortGroups {
|
||||
info := api.TpgtInfo{TPGT: tpg.GroupID}
|
||||
for _, port := range tpg.TargetPortGroup {
|
||||
info.Portals = append(info.Portals, port.TargetPortName)
|
||||
}
|
||||
result = append(result, info)
|
||||
}
|
||||
return httputils.WriteJSON(w, http.StatusOK, result)
|
||||
}
|
||||
}
|
||||
return fmt.Errorf("target %q not found", targetName)
|
||||
}
|
||||
|
||||
124
pkg/apiserver/router/target/target_test.go
Normal file
124
pkg/apiserver/router/target/target_test.go
Normal file
@@ -0,0 +1,124 @@
|
||||
package target
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/gostor/gotgt/pkg/api"
|
||||
"github.com/gostor/gotgt/pkg/scsi"
|
||||
_ "github.com/gostor/gotgt/pkg/scsi/backingstore"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
func resetService() *scsi.SCSITargetService {
|
||||
s := scsi.NewSCSITargetService()
|
||||
// Clear targets for test isolation
|
||||
targets, _ := s.GetTargetList()
|
||||
for _, t := range targets {
|
||||
s.DeleteTarget(t.Name, true)
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func TestPostTargetCreate(t *testing.T) {
|
||||
resetService()
|
||||
r := &targetRouter{}
|
||||
|
||||
body, _ := json.Marshal(api.TargetCreateRequest{Name: "iqn.2016-09.com.gotgt:test"})
|
||||
req, _ := http.NewRequest("POST", "/target/create", bytes.NewReader(body))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
err := r.postTargetCreate(context.Background(), w, req, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("postTargetCreate failed: %v", err)
|
||||
}
|
||||
if w.Code != http.StatusCreated {
|
||||
t.Fatalf("expected status 201, got %d", w.Code)
|
||||
}
|
||||
|
||||
var target api.SCSITarget
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &target); err != nil {
|
||||
t.Fatalf("failed to decode response: %v", err)
|
||||
}
|
||||
if target.Name != "iqn.2016-09.com.gotgt:test" {
|
||||
t.Fatalf("expected target name iqn.2016-09.com.gotgt:test, got %s", target.Name)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPostTargetCreateEmptyName(t *testing.T) {
|
||||
resetService()
|
||||
r := &targetRouter{}
|
||||
|
||||
body, _ := json.Marshal(api.TargetCreateRequest{Name: ""})
|
||||
req, _ := http.NewRequest("POST", "/target/create", bytes.NewReader(body))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
err := r.postTargetCreate(context.Background(), w, req, nil)
|
||||
if err == nil {
|
||||
t.Fatal("expected error for empty target name")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteTarget(t *testing.T) {
|
||||
s := resetService()
|
||||
r := &targetRouter{}
|
||||
|
||||
s.NewSCSITarget(0, "iscsi", "iqn.2016-09.com.gotgt:to_delete")
|
||||
|
||||
req, _ := http.NewRequest("DELETE", "/target/iqn.2016-09.com.gotgt:to_delete", nil)
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
vars := map[string]string{"name": "iqn.2016-09.com.gotgt:to_delete"}
|
||||
err := r.deleteTarget(context.Background(), w, req, vars)
|
||||
if err != nil {
|
||||
t.Fatalf("deleteTarget failed: %v", err)
|
||||
}
|
||||
if w.Code != http.StatusNoContent {
|
||||
t.Fatalf("expected status 204, got %d", w.Code)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteTargetNotFound(t *testing.T) {
|
||||
resetService()
|
||||
r := &targetRouter{}
|
||||
|
||||
req, _ := http.NewRequest("DELETE", "/target/nonexistent", nil)
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
vars := map[string]string{"name": "nonexistent"}
|
||||
err := r.deleteTarget(context.Background(), w, req, vars)
|
||||
if err == nil {
|
||||
t.Fatal("expected error deleting nonexistent target")
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetTargetList(t *testing.T) {
|
||||
s := resetService()
|
||||
r := &targetRouter{}
|
||||
|
||||
s.NewSCSITarget(0, "iscsi", "iqn.2016-09.com.gotgt:list_test")
|
||||
|
||||
req, _ := http.NewRequest("GET", "/target/list", nil)
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
err := r.getTargetList(context.Background(), w, req, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("getTargetList failed: %v", err)
|
||||
}
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("expected status 200, got %d", w.Code)
|
||||
}
|
||||
|
||||
var targets []*api.SCSITarget
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &targets); err != nil {
|
||||
t.Fatalf("failed to decode response: %v", err)
|
||||
}
|
||||
if len(targets) == 0 {
|
||||
t.Fatal("expected at least one target")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user