jpt/edgeboxctl
1
0
Fork 0
mirror of https://github.com/edgebox-iot/edgeboxctl.git synced 2026-09-29 08:05:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added constants for release version and device types, added diagnostics.GetReleaseVersion

Browse Source
This commit is contained in:
Paulo Truta
2022-02-05 21:52:49 +00:00
parent 162665b115
commit ef994a1002
3 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/storage/storage.go
+35 -23
View File
@@ -6,24 +6,25 @@ import (
"path/filepath"
"strings"
"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
"github.com/edgebox-iot/edgeboxctl/internal/utils"
"github.com/shirou/gopsutil/disk"
)
// Device : Struct representing a storage device in the system
type Device struct {
ID string `json:"id"`
Name string `json:"name"`
Size string `json:"size"`
InUse bool `json:"in_use"`
MainDevice bool `json:"main_device"`
MAJ string `json:"maj"`
MIN string `json:"min"`
RM string `json:"rm"`
RO string `json:"ro"`
Partitions []Partition `json:"partitions"`
Status DeviceStatus `json:"status"`
UsageStat UsageStat `json:"usage_stat"`
ID DeviceIdentifier `json:"id"`
Name string `json:"name"`
Size string `json:"size"`
InUse bool `json:"in_use"`
MainDevice bool `json:"main_device"`
MAJ string `json:"maj"`
MIN string `json:"min"`
RM string `json:"rm"`
RO string `json:"ro"`
Partitions []Partition `json:"partitions"`
Status DeviceStatus `json:"status"`
UsageStat UsageStat `json:"usage_stat"`
}
// DeviceStatus : Struct representing possible storage device statuses (code + description)
@@ -66,8 +67,27 @@ type Partition struct {
UsageStat UsageStat `json:"usage_stat"`
}
type DeviceIdentifier string
const (
DISK_TYPE_SDA DeviceIdentifier = "sda"
DISK_TYPE_MCBLK DeviceIdentifier = "mmcblk0"
DISK_TYPE_VDA DeviceIdentifier = "vda"
)
func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
switch release_version {
case diagnostics.CLOUD_VERSION:
return DISK_TYPE_VDA
case diagnostics.PROD_VERSION:
return DISK_TYPE_MCBLK
}
return DISK_TYPE_SDA
}
// GetDevices : Returns a list of all available sotrage devices in structs filled with information
func GetDevices(release_version string) []Device {
func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
var devices []Device
@@ -80,15 +100,7 @@ func GetDevices(release_version string) []Device {
firstDevice := true
currentDeviceInUseFlag := false
mainDiskID := "sda"
if release_version == "dev" {
mainDiskID = "sda"
} else if release_version == "prod" {
mainDiskID = "mmcblk0"
} else if release_version == "cloud" {
mainDiskID = "vda"
}
mainDiskID := GetDeviceIdentifier(release_version)
for scanner.Scan() {
// 1 Device is represented here. Extract words in order for filling a Device struct
@@ -130,7 +142,7 @@ func GetDevices(release_version string) []Device {
mainDevice := false
device := Device{
ID: deviceRawInfo[0],
ID: DeviceIdentifier(deviceRawInfo[0]),
Name: deviceRawInfo[0],
Size: deviceRawInfo[3],
MainDevice: mainDevice,