mirror of
https://github.com/compute-blade-community/compute-blade-agent.git
synced 2026-04-21 17:45:43 +02:00
feat(bladectl)!: add more bladectl commands (#91)
This PR introduces a comprehensive set of new subcommands to bladectl, expanding its capabilities for querying and managing compute blade state. It also includes an internal refactor to simplify interface management across the gRPC API.
* `get`
* `fan`: Returns current fan speed.
* `identify`: Indicates whether the identify mode is active.
* `stealth`: Shows if stealth mode is currently enabled.
* `status`: Prints a full blade status report.
* `temperature`: Retrieves current SoC temperature.
* `critical`: Shows whether critical mode is active.
* `power`: Reports the current power source (e.g., PoE+ or USB).
* `set`
* `stealth`: Enables stealth mode.
* `remove`
* `stealth`: Disables stealth mode.
* `describe`
* `fan`: Outputs the current fan curve configuration.
* `monitor`: plot some charts about the state of the compute-blade-agent
* **gRPC API refactor**: The gRPC service definitions previously located in `internal/api` have been folded into `internal/agent`. This eliminates redundant interface declarations and ensures that all ComputeBladeAgent implementations are directly compatible with the gRPC API.
This reduces duplication and improves long-term maintainability and clarity of the interface contract.
```bash
bladectl set fan --percent 90 --blade 1 --blade 2
bladectl unset identify --blade 1 --blade 2 --blade 3 --blade 4
bladectl set stealth --blade 1 --blade 2 --blade 3 --blade 4
bladectl get status --blade 1 --blade 2 --blade 3 --blade 4
┌───────┬─────────────┬────────────────────┬───────────────┬──────────────┬──────────┬───────────────┬──────────────┐
│ BLADE │ TEMPERATURE │ FAN SPEED OVERRIDE │ FAN SPEED │ STEALTH MODE │ IDENTIFY │ CRITICAL MODE │ POWER STATUS │
├───────┼─────────────┼────────────────────┼───────────────┼──────────────┼──────────┼───────────────┼──────────────┤
│ 1 │ 50°C │ 90% │ 5825 RPM(90%) │ Active │ Off │ Off │ poe+ │
│ 2 │ 48°C │ 90% │ 5825 RPM(90%) │ Active │ Off │ Off │ poe+ │
│ 3 │ 49°C │ Not set │ 4643 RPM(56%) │ Active │ Off │ Off │ poe+ │
│ 4 │ 49°C │ Not set │ 4774 RPM(58%) │ Active │ Off │ Off │ poe+ │
└───────┴─────────────┴────────────────────┴───────────────┴──────────────┴──────────┴───────────────┴──────────────┘
bladectl rm stealth --blade 1 --blade 2 --blade 3 --blade 4
bladectl rm fan --blade 1 --blade 2 --blade 3 --blade 4
bladectl get status --blade 1 --blade 2 --blade 3 --blade 4
┌───────┬─────────────┬────────────────────┬───────────────┬──────────────┬──────────┬───────────────┬──────────────┐
│ BLADE │ TEMPERATURE │ FAN SPEED OVERRIDE │ FAN SPEED │ STEALTH MODE │ IDENTIFY │ CRITICAL MODE │ POWER STATUS │
├───────┼─────────────┼────────────────────┼───────────────┼──────────────┼──────────┼───────────────┼──────────────┤
│ 1 │ 51°C │ Not set │ 5177 RPM(66%) │ Off │ Off │ Off │ poe+ │
│ 2 │ 49°C │ Not set │ 5177 RPM(58%) │ Off │ Off │ Off │ poe+ │
│ 3 │ 50°C │ Not set │ 4659 RPM(60%) │ Off │ Off │ Off │ poe+ │
│ 4 │ 48°C │ Not set │ 4659 RPM(54%) │ Off │ Off │ Off │ poe+ │
└───────┴─────────────┴────────────────────┴───────────────┴──────────────┴──────────┴───────────────┴──────────────┘
```
when having multiple compute-blades in your bladeconfig:
```yaml
blades:
- name: 1
blade:
server: blade-pi1:8081
cert:
certificate-authority-data: <redacted>
client-certificate-data: <redacted>
client-key-data: <redacted>
- name: 2
blade:
server: blade-pi2:8081
cert:
certificate-authority-data: <redacted>
client-certificate-data: <redacted>
client-key-data: <redacted>
- name: 3
blade:
server: blade-pi3:8081
cert:
certificate-authority-data: <redacted>
client-certificate-data: <redacted>
client-key-data: <redacted>
- name: 4
blade:
server: blade-pi4:8081
cert:
certificate-authority-data: <redacted>
client-certificate-data: <redacted>
client-key-data: <redacted>
- name: 4
blade:
server: blade-pi4:8081
cert:
certificate-authority-data: <redacted>
client-certificate-data: <redacted>
client-key-data: <redacted>
current-blade: 1
```
Fixes #4, #9 (partially), should help with #5
* test: improve unit-testing
* fix: pin github.com/warthog618/gpiod
---------
Co-authored-by: Cedric Kienzler <cedric@specht-labs.de>
This commit is contained in:
committed by
Cedric Kienzler
parent
7ec49ce05c
commit
781ded8e43
@@ -10,7 +10,14 @@ import (
|
||||
|
||||
type FanController interface {
|
||||
Override(opts *FanOverrideOpts)
|
||||
GetFanSpeed(temperature float64) uint8
|
||||
// GetFanSpeedPercent returns the fan speed in percent based on the current temperature
|
||||
GetFanSpeedPercent(temperature float64) uint8
|
||||
// IsAutomaticSpeed returns true if the FanSpeed is determined by the fan controller logic, or false if determined
|
||||
// by an FanOverrideOpts
|
||||
IsAutomaticSpeed() bool
|
||||
|
||||
// Steps returns the list of temperature and fan speed steps configured for the fan controller.
|
||||
Steps() []Step
|
||||
}
|
||||
|
||||
// FanController is a simple fan controller that reacts to temperature changes with a linear function
|
||||
@@ -60,14 +67,18 @@ func NewLinearFanController(config Config) (FanController, humane.Error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (f *fanControllerLinear) Steps() []Step {
|
||||
return f.config.Steps
|
||||
}
|
||||
|
||||
func (f *fanControllerLinear) Override(opts *FanOverrideOpts) {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
f.overrideOpts = opts
|
||||
}
|
||||
|
||||
// GetFanSpeed returns the fan speed in percent based on the current temperature
|
||||
func (f *fanControllerLinear) GetFanSpeed(temperature float64) uint8 {
|
||||
// GetFanSpeedPercent returns the fan speed in percent based on the current temperature
|
||||
func (f *fanControllerLinear) GetFanSpeedPercent(temperature float64) uint8 {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
@@ -90,3 +101,7 @@ func (f *fanControllerLinear) GetFanSpeed(temperature float64) uint8 {
|
||||
|
||||
return uint8(speed)
|
||||
}
|
||||
|
||||
func (f *fanControllerLinear) IsAutomaticSpeed() bool {
|
||||
return f.overrideOpts == nil
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/compute-blade-community/compute-blade-agent/pkg/fancontroller"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestFanControllerLinear_GetFanSpeed(t *testing.T) {
|
||||
@@ -30,15 +31,16 @@ func TestFanControllerLinear_GetFanSpeed(t *testing.T) {
|
||||
{35, 60}, // Should use the maximum speed
|
||||
}
|
||||
|
||||
assert.Equal(t, controller.Steps(), config.Steps)
|
||||
|
||||
for _, tc := range testCases {
|
||||
expected := tc.expected
|
||||
temperature := tc.temperature
|
||||
t.Run("", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
speed := controller.GetFanSpeed(temperature)
|
||||
if speed != expected {
|
||||
t.Errorf("For temperature %.2f, expected speed %d but got %d", temperature, expected, speed)
|
||||
}
|
||||
speed := controller.GetFanSpeedPercent(temperature)
|
||||
assert.Equal(t, expected, speed)
|
||||
assert.True(t, controller.IsAutomaticSpeed(), "Expected fan speed to be automatic, but it was not")
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -75,10 +77,9 @@ func TestFanControllerLinear_GetFanSpeedWithOverride(t *testing.T) {
|
||||
temperature := tc.temperature
|
||||
t.Run("", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
speed := controller.GetFanSpeed(temperature)
|
||||
if speed != expected {
|
||||
t.Errorf("For temperature %.2f, expected speed %d but got %d", temperature, expected, speed)
|
||||
}
|
||||
speed := controller.GetFanSpeedPercent(temperature)
|
||||
assert.Equal(t, expected, speed)
|
||||
assert.False(t, controller.IsAutomaticSpeed(), "Expected fan speed to be overridden, but it was not")
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -127,11 +128,9 @@ func TestFanControllerLinear_ConstructionErrors(t *testing.T) {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
_, err := fancontroller.NewLinearFanController(config)
|
||||
if err == nil {
|
||||
t.Errorf("Expected error with message '%s', but got no error", expectedErrMsg)
|
||||
} else if err.Error() != expectedErrMsg {
|
||||
t.Errorf("Expected error message '%s', but got '%s'", expectedErrMsg, err.Error())
|
||||
}
|
||||
|
||||
assert.NotNil(t, err, "Expected error with message '%s', but got no error", expectedErrMsg)
|
||||
assert.EqualError(t, err, expectedErrMsg)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user