Fix and test subcluster Config

This commit is contained in:
Jan Eitzinger 2024-07-04 06:49:59 +02:00
parent b05909969f
commit 1b70596735
Signed by: moebiusband
GPG Key ID: 2574BA29B90D6DD5
4 changed files with 2277 additions and 3057 deletions

View File

@ -59,6 +59,7 @@ func initClusterConfig() error {
for _, sc := range cluster.SubClusters { for _, sc := range cluster.SubClusters {
newMetric := mc newMetric := mc
newMetric.SubClusters = nil
if cfg, ok := scLookup[sc.Name]; ok { if cfg, ok := scLookup[sc.Name]; ok {
if !cfg.Remove { if !cfg.Remove {
@ -69,12 +70,19 @@ func initClusterConfig() error {
newMetric.Alert = cfg.Alert newMetric.Alert = cfg.Alert
newMetric.Footprint = cfg.Footprint newMetric.Footprint = cfg.Footprint
sc.MetricConfig = append(sc.MetricConfig, *newMetric) sc.MetricConfig = append(sc.MetricConfig, *newMetric)
if newMetric.Footprint {
sc.Footprint = append(sc.Footprint, newMetric.Name)
}
}
} else {
sc.MetricConfig = append(sc.MetricConfig, *newMetric)
if newMetric.Footprint {
sc.Footprint = append(sc.Footprint, newMetric.Name)
} }
} }
if newMetric.Footprint {
sc.Footprint = append(sc.Footprint, newMetric.Name)
}
} }
} }

View File

@ -9,15 +9,22 @@ import (
"testing" "testing"
"github.com/ClusterCockpit/cc-backend/pkg/archive" "github.com/ClusterCockpit/cc-backend/pkg/archive"
"github.com/davecgh/go-spew/spew"
) )
func TestClusterConfig(t *testing.T) { func TestClusterConfig(t *testing.T) {
if err := archive.Init(json.RawMessage("{\"kind\":\"testdata/archive\"}"), false); err != nil { if err := archive.Init(json.RawMessage("{\"kind\": \"file\",\"path\": \"testdata/archive\"}"), false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
c := archive.GetCluster("fritz") sc, err := archive.GetSubCluster("fritz", "spr1tb")
spew.Dump(c) if err != nil {
t.Fail() t.Fatal(err)
}
// spew.Dump(sc.MetricConfig)
if len(sc.Footprint) != 3 {
t.Fail()
}
if len(sc.MetricConfig) != 15 {
t.Fail()
}
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff