Refactor. Add Subcluster get metric list helper routine.

pkg/archive/clusterConfig.go

@@ -69,16 +69,18 @@ func initClusterConfig() error {
 
 			for _, sc := range cluster.SubClusters {
 				newMetric := &schema.MetricConfig{
-					Unit:          mc.Unit,
+					Metric: schema.Metric{
+						Name:    mc.Name,
+						Unit:    mc.Unit,
+						Peak:    mc.Peak,
+						Normal:  mc.Normal,
+						Caution: mc.Caution,
+						Alert:   mc.Alert,
+					},
 					Energy:        mc.Energy,
-					Name:          mc.Name,
 					Scope:         mc.Scope,
 					Aggregation:   mc.Aggregation,
-					Peak:          mc.Peak,
-					Caution:       mc.Caution,
-					Alert:         mc.Alert,
 					Timestep:      mc.Timestep,
-					Normal:        mc.Normal,
 					LowerIsBetter: mc.LowerIsBetter,
 				}
 
@@ -167,6 +169,45 @@ func GetSubCluster(cluster, subcluster string) (*schema.SubCluster, error) {
 	return nil, fmt.Errorf("subcluster '%v' not found for cluster '%v', or cluster '%v' not configured", subcluster, cluster, cluster)
 }
 
+func GetMetricConfigSubCluster(cluster, subcluster string) map[string]*schema.Metric {
+	metrics := make(map[string]*schema.Metric)
+
+	for _, c := range Clusters {
+		if c.Name == cluster {
+			for _, m := range c.MetricConfig {
+				for _, s := range m.SubClusters {
+					if s.Name == subcluster {
+						metrics[m.Name] = &schema.Metric{
+							Name:    m.Name,
+							Unit:    s.Unit,
+							Peak:    s.Peak,
+							Normal:  s.Normal,
+							Caution: s.Caution,
+							Alert:   s.Alert,
+						}
+						break
+					}
+				}
+
+				_, ok := metrics[m.Name]
+				if !ok {
+					metrics[m.Name] = &schema.Metric{
+						Name:    m.Name,
+						Unit:    m.Unit,
+						Peak:    m.Peak,
+						Normal:  m.Normal,
+						Caution: m.Caution,
+						Alert:   m.Alert,
+					}
+				}
+			}
+			break
+		}
+	}
+
+	return metrics
+}
+
 func GetMetricConfig(cluster, metric string) *schema.MetricConfig {
 	for _, c := range Clusters {
 		if c.Name == cluster {

pkg/archive/nodelist.go

@@ -61,7 +61,7 @@ func (nl *NodeList) PrintList() []string {
 }
 
 func (nl *NodeList) NodeCount() int {
-	var out int = 0
+	out := 0
 	for _, term := range *nl {
 		if len(term) == 1 { // If only String-Part in Term: Single Node Name -> add one
 			out += 1
@@ -160,7 +160,7 @@ func (nle NLExprIntRange) limits() []map[string]int {
 	m["start"] = int(nle.start)
 	m["end"] = int(nle.end)
 	m["digits"] = int(nle.digits)
-	if nle.zeroPadded == true {
+	if nle.zeroPadded {
 		m["zeroPadded"] = 1
 	} else {
 		m["zeroPadded"] = 0
@@ -183,14 +183,15 @@ func ParseNodeList(raw string) (NodeList, error) {
 	rawterms := []string{}
 	prevterm := 0
 	for i := 0; i < len(raw); i++ {
-		if raw[i] == '[' {
+		switch raw[i] {
+		case '[':
 			for i < len(raw) && raw[i] != ']' {
 				i++
 			}
 			if i == len(raw) {
 				return nil, fmt.Errorf("ARCHIVE/NODELIST > unclosed '['")
 			}
-		} else if raw[i] == ',' {
+		case ',':
 			rawterms = append(rawterms, raw[prevterm:i])
 			prevterm = i + 1
 		}