diff --git a/.gitmodules b/.gitmodules index e69de29..69f71d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "proxmoxaas-common-lib"] + path = proxmoxaas-common-lib + url = https://git.tronnet.net/tronnet/proxmoxaas-common-lib diff --git a/app/routes/config.go b/app/routes/config.go index 331b99f..fcb6536 100644 --- a/app/routes/config.go +++ b/app/routes/config.go @@ -3,8 +3,8 @@ package routes import ( "fmt" "net/http" + paas "proxmoxaas-common-lib" "proxmoxaas-dashboard/app/common" - fabric "proxmoxaas-fabric/app" "slices" "sort" @@ -15,16 +15,16 @@ import ( // imported types from fabric type InstanceConfig struct { - Type fabric.InstanceType `json:"type"` - Name string `json:"name"` - CPU string `json:"cpu"` - Cores uint64 `json:"cores"` - Memory uint64 `json:"memory"` - Swap uint64 `json:"swap"` - Volumes map[string]*fabric.Volume `json:"volumes"` - Nets map[string]*fabric.Net `json:"nets"` - Devices map[string]*fabric.Device `json:"devices"` - Boot fabric.BootOrder `json:"boot"` + Type paas.InstanceType `json:"type"` + Name string `json:"name"` + CPU string `json:"cpu"` + Cores uint64 `json:"cores"` + Memory uint64 `json:"memory"` + Swap uint64 `json:"swap"` + Volumes map[string]*paas.Volume `json:"volumes"` + Nets map[string]*paas.Net `json:"nets"` + Devices map[string]*paas.Device `json:"devices"` + Boot paas.BootOrder `json:"boot"` // overrides ProctypeSelect common.Select } diff --git a/go.mod b/go.mod index 258889a..5f9c060 100644 --- a/go.mod +++ b/go.mod @@ -7,10 +7,10 @@ require ( github.com/gin-gonic/gin v1.12.0 github.com/go-viper/mapstructure/v2 v2.5.0 github.com/tdewolff/minify/v2 v2.24.11 - proxmoxaas-fabric v0.0.0 + proxmoxaas-common-lib v0.0.0 ) -replace proxmoxaas-fabric => ./ProxmoxAAS-Fabric +replace proxmoxaas-common-lib => ./proxmoxaas-common-lib require ( github.com/buger/goterm v1.0.4 // indirect diff --git a/proxmoxaas-common-lib b/proxmoxaas-common-lib new file mode 160000 index 0000000..1c78f59 --- /dev/null +++ b/proxmoxaas-common-lib @@ -0,0 +1 @@ +Subproject commit 1c78f59c8cc5b9fc15143e410eeb3dfbe2ea9513