colibri: advance request handling (#3859)

- Segment request operations are complete
- E2E request operations with the exception of the admission one are complete

go/cs/reservation/segment/response.go

@@ -32,6 +32,8 @@ type Response struct {
 	FailedHop            uint8                   // if accepted is false, the AS that failed it
 }
 
+var _ base.MessageWithPath = (*Response)(nil)
+
 // NewResponse contructs the segment Response type.
 func NewResponse(ts time.Time, id *reservation.SegmentID, idx reservation.IndexNumber,
 	path *spath.Path, accepted bool, failedHop uint8) (*Response, error) {

go/cs/reservationstorage/BUILD.bazel

@@ -9,7 +9,6 @@ go_library(
         "//go/cs/reservation:go_default_library",
         "//go/cs/reservation/e2e:go_default_library",
         "//go/cs/reservation/segment:go_default_library",
-        "//go/lib/colibri/reservation:go_default_library",
         "//go/lib/infra/modules/cleaner:go_default_library",
     ],
 )

go/cs/reservationstorage/store.go

@@ -20,18 +20,23 @@ import (
 	base "github.com/scionproto/scion/go/cs/reservation"
 	"github.com/scionproto/scion/go/cs/reservation/e2e"
 	sgt "github.com/scionproto/scion/go/cs/reservation/segment"
-	rsv "github.com/scionproto/scion/go/lib/colibri/reservation"
 	"github.com/scionproto/scion/go/lib/infra/modules/cleaner"
 )
 
 // Store is the interface to interact with the reservation store.
 type Store interface {
-	AdmitSegmentReservation(ctx context.Context, req *sgt.SetupReq) (base.MessageWithPath, error)
-	ConfirmSegmentReservation(ctx context.Context, id rsv.SegmentID, idx rsv.IndexNumber) error
-	CleanupSegmentReservation(ctx context.Context, id rsv.SegmentID, idx rsv.IndexNumber) error
-	TearDownSegmentReservation(ctx context.Context, id rsv.SegmentID, idx rsv.IndexNumber) error
-	AdmitE2EReservation(ctx context.Context, req e2e.SetupReq) error
-	CleanupE2EReservation(ctx context.Context, id rsv.E2EID, idx rsv.IndexNumber) error
+	AdmitSegmentReservation(ctx context.Context, req *sgt.SetupReq) (
+		base.MessageWithPath, error)
+	ConfirmSegmentReservation(ctx context.Context, req *sgt.IndexConfirmationReq) (
+		base.MessageWithPath, error)
+	CleanupSegmentReservation(ctx context.Context, req *sgt.CleanupReq) (
+		base.MessageWithPath, error)
+	TearDownSegmentReservation(ctx context.Context, req *sgt.TeardownReq) (
+		base.MessageWithPath, error)
+	AdmitE2EReservation(ctx context.Context, req *e2e.SetupReq) (
+		base.MessageWithPath, error)
+	CleanupE2EReservation(ctx context.Context, req *e2e.CleanupReq) (
+		base.MessageWithPath, error)
 
 	DeleteExpiredIndices(ctx context.Context) (int, error)
 }