added getter for vars

srl-labs · Jul 9, 2021 · d2f7473 · d2f7473
1 parent 57e1cb4
commit d2f7473
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/types/node_definition.go b/types/node_definition.go
@@ -65,8 +65,8 @@ func (n *NodeDefinition) GetStartupConfig() string {
 }
 
 func (n *NodeDefinition) GetConfigDispatcher() *ConfigDispatcher {
-	if n == nil || n.Config == nil {
-		return &ConfigDispatcher{}
+	if n == nil {
+		return nil
 	}
 	return n.Config
 }

diff --git a/types/topology.go b/types/topology.go
@@ -138,9 +138,9 @@ func (t *Topology) GetNodeLabels(name string) map[string]string {
 func (t *Topology) GetNodeConfigDispatcher(name string) *ConfigDispatcher {
 	if ndef, ok := t.Nodes[name]; ok {
 		vars := utils.MergeStringMaps(
-			utils.MergeStringMaps(t.Defaults.GetConfigDispatcher().Vars,
-				t.GetKind(t.GetNodeKind(name)).GetConfigDispatcher().Vars),
-			ndef.GetConfigDispatcher().Vars)
+			utils.MergeStringMaps(t.Defaults.GetConfigDispatcher().GetVars(),
+				t.GetKind(t.GetNodeKind(name)).GetConfigDispatcher().GetVars()),
+			ndef.GetConfigDispatcher().GetVars())
 
 		return &ConfigDispatcher{
 			Vars: vars,

diff --git a/types/types.go b/types/types.go
@@ -211,3 +211,10 @@ func FilterFromLabelStrings(labels []string) []*GenericFilter {
 type ConfigDispatcher struct {
 	Vars map[string]string `yaml:"vars,omitempty"`
 }
+
+func (cd *ConfigDispatcher) GetVars() map[string]string {
+	if cd == nil {
+		return nil
+	}
+	return cd.Vars
+}