Resource accounting

Makefile

@@ -192,11 +192,13 @@ dev: ensure-ch-binaries ensure-caddy-binaries build-embedded $(AIR)
 # Usage: make test                              - runs all tests
 #        make test TEST=TestCreateInstanceWithNetwork  - runs specific test
 test: ensure-ch-binaries ensure-caddy-binaries build-embedded
-	@if [ -n "$(TEST)" ]; then \
+	@VERBOSE_FLAG=""; \
+	if [ -n "$(VERBOSE)" ]; then VERBOSE_FLAG="-v"; fi; \
+	if [ -n "$(TEST)" ]; then \
 		echo "Running specific test: $(TEST)"; \
-		sudo env "PATH=$$PATH" "DOCKER_CONFIG=$${DOCKER_CONFIG:-$$HOME/.docker}" go test -tags containers_image_openpgp -run=$(TEST) -v -timeout=180s ./...; \
+		sudo env "PATH=$$PATH" "DOCKER_CONFIG=$${DOCKER_CONFIG:-$$HOME/.docker}" go test -tags containers_image_openpgp -run=$(TEST) $$VERBOSE_FLAG -timeout=180s ./...; \
 	else \
-		sudo env "PATH=$$PATH" "DOCKER_CONFIG=$${DOCKER_CONFIG:-$$HOME/.docker}" go test -tags containers_image_openpgp -v -timeout=180s ./...; \
+		sudo env "PATH=$$PATH" "DOCKER_CONFIG=$${DOCKER_CONFIG:-$$HOME/.docker}" go test -tags containers_image_openpgp $$VERBOSE_FLAG -timeout=180s ./...; \
 	fi
 
 # Generate JWT token for testing

cmd/api/api/api.go

@@ -8,6 +8,7 @@ import (
 	"github.com/onkernel/hypeman/lib/instances"
 	"github.com/onkernel/hypeman/lib/network"
 	"github.com/onkernel/hypeman/lib/oapi"
+	"github.com/onkernel/hypeman/lib/resources"
 	"github.com/onkernel/hypeman/lib/volumes"
 )
 
@@ -20,6 +21,7 @@ type ApiService struct {
 	NetworkManager  network.Manager
 	DeviceManager   devices.Manager
 	IngressManager  ingress.Manager
+	ResourceManager *resources.Manager
 }
 
 var _ oapi.StrictServerInterface = (*ApiService)(nil)
@@ -33,6 +35,7 @@ func New(
 	networkManager network.Manager,
 	deviceManager devices.Manager,
 	ingressManager ingress.Manager,
+	resourceManager *resources.Manager,
 ) *ApiService {
 	return &ApiService{
 		Config:          config,
@@ -42,5 +45,6 @@ func New(
 		NetworkManager:  networkManager,
 		DeviceManager:   deviceManager,
 		IngressManager:  ingressManager,
+		ResourceManager: resourceManager,
 	}
 }

cmd/api/api/api_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/onkernel/hypeman/lib/network"
 	"github.com/onkernel/hypeman/lib/oapi"
 	"github.com/onkernel/hypeman/lib/paths"
+	"github.com/onkernel/hypeman/lib/resources"
 	"github.com/onkernel/hypeman/lib/system"
 	"github.com/onkernel/hypeman/lib/volumes"
 	"github.com/stretchr/testify/require"
@@ -37,6 +38,7 @@ func newTestService(t *testing.T) *ApiService {
 	networkMgr := network.NewManager(p, cfg, nil)
 	deviceMgr := devices.NewManager(p)
 	volumeMgr := volumes.NewManager(p, 0, nil) // 0 = unlimited storage
+	resourceMgr := resources.NewManager(cfg, p)
 	limits := instances.ResourceLimits{
 		MaxOverlaySize: 100 * 1024 * 1024 * 1024, // 100GB
 	}
@@ -53,6 +55,7 @@ func newTestService(t *testing.T) *ApiService {
 		InstanceManager: instanceMgr,
 		VolumeManager:   volumeMgr,
 		DeviceManager:   deviceMgr,
+		ResourceManager: resourceMgr,
 	}
 }
 

cmd/api/api/cp_test.go

@@ -46,7 +46,9 @@ func TestCpToAndFromInstance(t *testing.T) {
 			Name:  "cp-test",
 			Image: "docker.io/library/nginx:alpine",
 			Network: &struct {
-				Enabled *bool `json:"enabled,omitempty"`
+				BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+				BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+				Enabled           *bool   `json:"enabled,omitempty"`
 			}{
 				Enabled: &networkEnabled,
 			},
@@ -182,7 +184,9 @@ func TestCpDirectoryToInstance(t *testing.T) {
 			Name:  "cp-dir-test",
 			Image: "docker.io/library/nginx:alpine",
 			Network: &struct {
-				Enabled *bool `json:"enabled,omitempty"`
+				BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+				BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+				Enabled           *bool   `json:"enabled,omitempty"`
 			}{
 				Enabled: &networkEnabled,
 			},

cmd/api/api/exec_test.go

@@ -47,7 +47,9 @@ func TestExecInstanceNonTTY(t *testing.T) {
 			Name:  "exec-test",
 			Image: "docker.io/library/nginx:alpine",
 			Network: &struct {
-				Enabled *bool `json:"enabled,omitempty"`
+				BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+				BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+				Enabled           *bool   `json:"enabled,omitempty"`
 			}{
 				Enabled: &networkEnabled,
 			},
@@ -185,7 +187,9 @@ func TestExecWithDebianMinimal(t *testing.T) {
 			Name:  "debian-exec-test",
 			Image: "docker.io/library/debian:12-slim",
 			Network: &struct {
-				Enabled *bool `json:"enabled,omitempty"`
+				BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+				BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+				Enabled           *bool   `json:"enabled,omitempty"`
 			}{
 				Enabled: &networkEnabled,
 			},

cmd/api/api/instances.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/c2h5oh/datasize"
 	"github.com/onkernel/hypeman/lib/guest"
@@ -15,6 +16,7 @@ import (
 	mw "github.com/onkernel/hypeman/lib/middleware"
 	"github.com/onkernel/hypeman/lib/network"
 	"github.com/onkernel/hypeman/lib/oapi"
+	"github.com/onkernel/hypeman/lib/resources"
 	"github.com/samber/lo"
 )
 
@@ -82,6 +84,23 @@ func (s *ApiService) CreateInstance(ctx context.Context, request oapi.CreateInst
 		overlaySize = int64(overlayBytes)
 	}
 
+	// Parse disk_io_bps (0 = auto/unlimited)
+	diskIOBps := int64(0)
+	if request.Body.DiskIoBps != nil && *request.Body.DiskIoBps != "" {
+		var ioBpsBytes datasize.ByteSize
+		// Remove "/s" suffix if present
+		ioStr := *request.Body.DiskIoBps
+		ioStr = strings.TrimSuffix(ioStr, "/s")
+		ioStr = strings.TrimSuffix(ioStr, "ps")
+		if err := ioBpsBytes.UnmarshalText([]byte(ioStr)); err != nil {
+			return oapi.CreateInstance400JSONResponse{
+				Code:    "invalid_disk_io_bps",
+				Message: fmt.Sprintf("invalid disk_io_bps format: %v", err),
+			}, nil
+		}
+		diskIOBps = int64(ioBpsBytes)
+	}
+
 	vcpus := 2
 	if request.Body.Vcpus != nil {
 		vcpus = *request.Body.Vcpus
@@ -98,6 +117,33 @@ func (s *ApiService) CreateInstance(ctx context.Context, request oapi.CreateInst
 		networkEnabled = *request.Body.Network.Enabled
 	}
 
+	// Parse network bandwidth limits (0 = auto)
+	// Supports both bit-based (e.g., "1Gbps") and byte-based (e.g., "125MB/s") formats
+	var networkBandwidthDownload int64
+	var networkBandwidthUpload int64
+	if request.Body.Network != nil {
+		if request.Body.Network.BandwidthDownload != nil && *request.Body.Network.BandwidthDownload != "" {
+			bw, err := resources.ParseBandwidth(*request.Body.Network.BandwidthDownload)
+			if err != nil {
+				return oapi.CreateInstance400JSONResponse{
+					Code:    "invalid_bandwidth_download",
+					Message: fmt.Sprintf("invalid bandwidth_download format: %v", err),
+				}, nil
+			}
+			networkBandwidthDownload = bw
+		}
+		if request.Body.Network.BandwidthUpload != nil && *request.Body.Network.BandwidthUpload != "" {
+			bw, err := resources.ParseBandwidth(*request.Body.Network.BandwidthUpload)
+			if err != nil {
+				return oapi.CreateInstance400JSONResponse{
+					Code:    "invalid_bandwidth_upload",
+					Message: fmt.Sprintf("invalid bandwidth_upload format: %v", err),
+				}, nil
+			}
+			networkBandwidthUpload = bw
+		}
+	}
+
 	// Parse devices (GPU passthrough)
 	var deviceRefs []string
 	if request.Body.Devices != nil {
@@ -144,18 +190,36 @@ func (s *ApiService) CreateInstance(ctx context.Context, request oapi.CreateInst
 		hvType = hypervisor.Type(*request.Body.Hypervisor)
 	}
 
+	// Calculate default resource limits when not specified (0 = auto)
+	// Uses proportional allocation based on CPU: (vcpus / cpuCapacity) * resourceCapacity
+	if diskIOBps == 0 {
+		diskIOBps, _ = s.ResourceManager.DefaultDiskIOBandwidth(vcpus)
+	}
+	if networkBandwidthDownload == 0 || networkBandwidthUpload == 0 {
+		defaultDown, defaultUp := s.ResourceManager.DefaultNetworkBandwidth(vcpus)
+		if networkBandwidthDownload == 0 {
+			networkBandwidthDownload = defaultDown
+		}
+		if networkBandwidthUpload == 0 {
+			networkBandwidthUpload = defaultUp
+		}
+	}
+
 	domainReq := instances.CreateInstanceRequest{
-		Name:           request.Body.Name,
-		Image:          request.Body.Image,
-		Size:           size,
-		HotplugSize:    hotplugSize,
-		OverlaySize:    overlaySize,
-		Vcpus:          vcpus,
-		Env:            env,
-		NetworkEnabled: networkEnabled,
-		Devices:        deviceRefs,
-		Volumes:        volumes,
-		Hypervisor:     hvType,
+		Name:                     request.Body.Name,
+		Image:                    request.Body.Image,
+		Size:                     size,
+		HotplugSize:              hotplugSize,
+		OverlaySize:              overlaySize,
+		Vcpus:                    vcpus,
+		DiskIOBps:                diskIOBps,
+		NetworkBandwidthDownload: networkBandwidthDownload,
+		NetworkBandwidthUpload:   networkBandwidthUpload,
+		Env:                      env,
+		NetworkEnabled:           networkEnabled,
+		Devices:                  deviceRefs,
+		Volumes:                  volumes,
+		Hypervisor:               hvType,
 	}
 
 	inst, err := s.InstanceManager.CreateInstance(ctx, domainReq)
@@ -539,14 +603,29 @@ func instanceToOAPI(inst instances.Instance) oapi.Instance {
 	hotplugSizeStr := datasize.ByteSize(inst.HotplugSize).HR()
 	overlaySizeStr := datasize.ByteSize(inst.OverlaySize).HR()
 
-	// Build network object with ip/mac nested inside
+	// Format bandwidth as human-readable (bytes/s to rate string)
+	var downloadBwStr, uploadBwStr *string
+	if inst.NetworkBandwidthDownload > 0 {
+		s := datasize.ByteSize(inst.NetworkBandwidthDownload).HR() + "/s"
+		downloadBwStr = &s
+	}
+	if inst.NetworkBandwidthUpload > 0 {
+		s := datasize.ByteSize(inst.NetworkBandwidthUpload).HR() + "/s"
+		uploadBwStr = &s
+	}
+
+	// Build network object with ip/mac and bandwidth nested inside
 	netObj := &struct {
-		Enabled *bool   `json:"enabled,omitempty"`
-		Ip      *string `json:"ip"`
-		Mac     *string `json:"mac"`
-		Name    *string `json:"name,omitempty"`
+		BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+		BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+		Enabled           *bool   `json:"enabled,omitempty"`
+		Ip                *string `json:"ip"`
+		Mac               *string `json:"mac"`
+		Name              *string `json:"name,omitempty"`
 	}{
-		Enabled: lo.ToPtr(inst.NetworkEnabled),
+		Enabled:           lo.ToPtr(inst.NetworkEnabled),
+		BandwidthDownload: downloadBwStr,
+		BandwidthUpload:   uploadBwStr,
 	}
 	if inst.NetworkEnabled {
 		netObj.Name = lo.ToPtr("default")
@@ -557,6 +636,13 @@ func instanceToOAPI(inst instances.Instance) oapi.Instance {
 	// Convert hypervisor type
 	hvType := oapi.InstanceHypervisor(inst.HypervisorType)
 
+	// Format disk I/O as human-readable
+	var diskIoBpsStr *string
+	if inst.DiskIOBps > 0 {
+		s := datasize.ByteSize(inst.DiskIOBps).HR() + "/s"
+		diskIoBpsStr = &s
+	}
+
 	oapiInst := oapi.Instance{
 		Id:          inst.Id,
 		Name:        inst.Name,
@@ -567,6 +653,7 @@ func instanceToOAPI(inst instances.Instance) oapi.Instance {
 		HotplugSize: lo.ToPtr(hotplugSizeStr),
 		OverlaySize: lo.ToPtr(overlaySizeStr),
 		Vcpus:       lo.ToPtr(inst.Vcpus),
+		DiskIoBps:   diskIoBpsStr,
 		Network:     netObj,
 		CreatedAt:   inst.CreatedAt,
 		StartedAt:   inst.StartedAt,

cmd/api/api/instances_test.go

@@ -65,7 +65,9 @@ func TestCreateInstance_ParsesHumanReadableSizes(t *testing.T) {
 			HotplugSize: &hotplugSize,
 			OverlaySize: &overlaySize,
 			Network: &struct {
-				Enabled *bool `json:"enabled,omitempty"`
+				BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+				BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+				Enabled           *bool   `json:"enabled,omitempty"`
 			}{
 				Enabled: &networkEnabled,
 			},
@@ -109,7 +111,9 @@ func TestCreateInstance_InvalidSizeFormat(t *testing.T) {
 			Image: "docker.io/library/alpine:latest",
 			Size:  &invalidSize,
 			Network: &struct {
-				Enabled *bool `json:"enabled,omitempty"`
+				BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+				BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+				Enabled           *bool   `json:"enabled,omitempty"`
 			}{
 				Enabled: &networkEnabled,
 			},
@@ -150,7 +154,9 @@ func TestInstanceLifecycle_StopStart(t *testing.T) {
 			Name:  "test-lifecycle",
 			Image: "docker.io/library/nginx:alpine",
 			Network: &struct {
-				Enabled *bool `json:"enabled,omitempty"`
+				BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+				BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+				Enabled           *bool   `json:"enabled,omitempty"`
 			}{
 				Enabled: &networkEnabled,
 			},
@@ -208,11 +214,11 @@ func waitForState(t *testing.T, svc *ApiService, instanceID string, expectedStat
 		inst, err := svc.InstanceManager.GetInstance(ctx(), instanceID)
 		require.NoError(t, err)
 
-			if string(inst.State) == expectedState {
-				t.Logf("Instance reached %s state", expectedState)
-				return
-			}
-			t.Logf("Instance state: %s (waiting for %s)", inst.State, expectedState)
+		if string(inst.State) == expectedState {
+			t.Logf("Instance reached %s state", expectedState)
+			return
+		}
+		t.Logf("Instance state: %s (waiting for %s)", inst.State, expectedState)
 		time.Sleep(100 * time.Millisecond)
 	}
 	t.Fatalf("Timeout waiting for instance to reach %s state", expectedState)

cmd/api/api/registry_test.go

@@ -135,7 +135,9 @@ func TestRegistryPushAndCreateInstance(t *testing.T) {
 			Name:  "test-pushed-image",
 			Image: imageName,
 			Network: &struct {
-				Enabled *bool `json:"enabled,omitempty"`
+				BandwidthDownload *string `json:"bandwidth_download,omitempty"`
+				BandwidthUpload   *string `json:"bandwidth_upload,omitempty"`
+				Enabled           *bool   `json:"enabled,omitempty"`
 			}{
 				Enabled: &networkEnabled,
 			},