From d44bd488585c11a0265b9a80b4759d04e585b03c Mon Sep 17 00:00:00 2001
From: Arthur Lu <root@tronnet.net>
Date: Tue, 11 Feb 2025 07:11:05 +0000
Subject: [PATCH] fix hard coded URL, add proxmox URL to config
---
app/app.go | 2 +-
app/proxmox.go | 10 +++++-----
app/types.go | 12 +++---------
app/utils.go | 1 +
4 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/app/app.go b/app/app.go
index 16fdb70..b477de2 100644
--- a/app/app.go
+++ b/app/app.go
@@ -28,7 +28,7 @@ func Run() {
log.Println("Initialized config from " + *configPath)
token := fmt.Sprintf(`%s@%s!%s`, config.PVE.Token.USER, config.PVE.Token.REALM, config.PVE.Token.ID)
- client = NewClient(token, config.PVE.Token.Secret)
+ client = NewClient(config.PVE.URL, token, config.PVE.Token.Secret)
router := gin.Default()
diff --git a/app/proxmox.go b/app/proxmox.go
index 6b45a38..67b05f4 100644
--- a/app/proxmox.go
+++ b/app/proxmox.go
@@ -15,7 +15,7 @@ type ProxmoxClient struct {
client *proxmox.Client
}
-func NewClient(token string, secret string) ProxmoxClient {
+func NewClient(url string, token string, secret string) ProxmoxClient {
HTTPClient := http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
@@ -24,7 +24,7 @@ func NewClient(token string, secret string) ProxmoxClient {
},
}
- client := proxmox.NewClient("https://pve.tronnet.net/api2/json",
+ client := proxmox.NewClient(url,
proxmox.WithHTTPClient(&HTTPClient),
proxmox.WithAPIToken(token, secret),
)
@@ -78,9 +78,9 @@ func (pve ProxmoxClient) Node(nodeName string) (*Host, error) {
}
host.Name = node.Name
- host.Cores.Total = uint64(node.CPUInfo.CPUs)
- host.Memory.Total = uint64(node.Memory.Total)
- host.Swap.Total = uint64(node.Swap.Total)
+ host.Cores = uint64(node.CPUInfo.CPUs)
+ host.Memory = uint64(node.Memory.Total)
+ host.Swap = uint64(node.Swap.Total)
host.pvenode = node
return &host, err
diff --git a/app/types.go b/app/types.go
index a5b9cc8..ce3aa3a 100644
--- a/app/types.go
+++ b/app/types.go
@@ -15,9 +15,9 @@ type Cluster struct {
type Host struct {
lock sync.Mutex
Name string
- Cores Resource
- Memory Resource
- Swap Resource
+ Cores uint64
+ Memory uint64
+ Swap uint64
Devices map[string]*Device
Instances map[uint]*Instance
pvenode *proxmox.Node
@@ -47,12 +47,6 @@ type Instance struct {
configHostPCIs map[string]string
}
-type Resource struct {
- Reserved uint64
- Free uint64
- Total uint64
-}
-
type Volume struct {
Path string
Format string
diff --git a/app/utils.go b/app/utils.go
index 1d966b6..068d3a3 100644
--- a/app/utils.go
+++ b/app/utils.go
@@ -12,6 +12,7 @@ const MiB = 1024 * 1024
type Config struct {
ListenPort int `json:"listenPort"`
PVE struct {
+ URL string `json:"url"`
Token struct {
USER string `json:"user"`
REALM string `json:"realm"`