Add default constraints for cpu, memory all nodes (#407)

Co-authored-by: Neha Manjunath <[email protected]>
openconfig · Jul 27, 2023 · f8fbd7d · f8fbd7d
1 parent 4c246ee
commit f8fbd7d
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 19 deletions.
diff --git a/topo/node/arista/arista.go b/topo/node/arista/arista.go
@@ -335,12 +335,7 @@ func defaults(pb *tpb.Node) *tpb.Node {
 			Name: "default_ceos_node",
 		}
 	}
-	if pb.Constraints == nil {
-		pb.Constraints = map[string]string{
-			"cpu":    "0.5",
-			"memory": "1Gi",
-		}
-	}
+	pb = constraints(pb)
 	if pb.Services == nil {
 		pb.Services = map[uint32]*tpb.Service{
 			443: {
@@ -394,6 +389,19 @@ func defaults(pb *tpb.Node) *tpb.Node {
 	return pb
 }
 
+func constraints(pb *tpb.Node) *tpb.Node {
+	if pb.Constraints == nil {
+		pb.Constraints = map[string]string{}
+	}
+	if pb.Constraints["cpu"] == "" {
+		pb.Constraints["cpu"] = "0.5"
+	}
+	if pb.Constraints["memory"] == "" {
+		pb.Constraints["memory"] = "1Gi"
+	}
+	return pb
+}
+
 func (n *Node) FixInterfaces() error {
 	for k, v := range n.Proto.Interfaces {
 		switch {

diff --git a/topo/node/juniper/juniper.go b/topo/node/juniper/juniper.go
@@ -507,10 +507,13 @@ func defaults(pb *tpb.Node) *tpb.Node {
 	switch pb.Model {
 	case ModelNCPTX:
 		if pb.Constraints == nil {
-			pb.Constraints = map[string]string{
-				"cpu":    "4",
-				"memory": "4Gi",
-			}
+			pb.Constraints = map[string]string{}
+		}
+		if pb.Constraints["cpu"] == "" {
+			pb.Constraints["cpu"] = "4"
+		}
+		if pb.Constraints["memory"] == "" {
+			pb.Constraints["memory"] = "4Gi"
 		}
 		if len(pb.Config.GetCommand()) == 0 {
 			pb.Config.Command = []string{
@@ -522,10 +525,13 @@ func defaults(pb *tpb.Node) *tpb.Node {
 		}
 	default:
 		if pb.Constraints == nil {
-			pb.Constraints = map[string]string{
-				"cpu":    "8",
-				"memory": "8Gi",
-			}
+			pb.Constraints = map[string]string{}
+		}
+		if pb.Constraints["cpu"] == "" {
+			pb.Constraints["cpu"] = "8"
+		}
+		if pb.Constraints["memory"] == "" {
+			pb.Constraints["memory"] = "8Gi"
 		}
 		if len(pb.Config.GetCommand()) == 0 {
 			pb.Config.Command = []string{

diff --git a/topo/node/nokia/nokia.go b/topo/node/nokia/nokia.go
@@ -378,6 +378,15 @@ func defaults(pb *tpb.Node) *tpb.Node {
 
 		pb.Config.ConfigFile = "config" + ext
 	}
+	if pb.Constraints == nil {
+		pb.Constraints = map[string]string{}
+	}
+	if pb.Constraints["cpu"] == "" {
+		pb.Constraints["cpu"] = "0.5"
+	}
+	if pb.Constraints["memory"] == "" {
+		pb.Constraints["memory"] = "1Gi"
+	}
 	return pb
 }
 

diff --git a/topo/node/nokia/nokia_test.go b/topo/node/nokia/nokia_test.go
@@ -139,6 +139,10 @@ func TestNew(t *testing.T) {
 					Inside: 9559,
 				},
 			},
+			Constraints: map[string]string{
+				"cpu":    "0.5",
+				"memory": "1Gi",
+			},
 		},
 	}, {
 		desc: "json config file",
@@ -188,6 +192,10 @@ func TestNew(t *testing.T) {
 					Inside: 9559,
 				},
 			},
+			Constraints: map[string]string{
+				"cpu":    "0.5",
+				"memory": "1Gi",
+			},
 		},
 	},
 	}

diff --git a/topo/node/openconfig/openconfig.go b/topo/node/openconfig/openconfig.go
@@ -245,10 +245,13 @@ func lemmingDefaults(pb *tpb.Node) *tpb.Node {
 		}
 	}
 	if pb.Constraints == nil {
-		pb.Constraints = map[string]string{
-			"cpu":    "0.5",
-			"memory": "1Gi",
-		}
+		pb.Constraints = map[string]string{}
+	}
+	if pb.Constraints["cpu"] == "" {
+		pb.Constraints["cpu"] = "0.5"
+	}
+	if pb.Constraints["memory"] == "" {
+		pb.Constraints["memory"] = "1Gi"
 	}
 	if pb.Labels == nil {
 		pb.Labels = map[string]string{}

diff --git a/topo/node/openconfig/openconfig_test.go b/topo/node/openconfig/openconfig_test.go
@@ -388,7 +388,8 @@ func TestNew(t *testing.T) {
 				Cert:         &tpb.CertificateCfg{},
 			},
 			Constraints: map[string]string{
-				"cpu": "10",
+				"cpu":    "10",
+				"memory": "1Gi",
 			},
 			Labels: map[string]string{
 				"custom":       "value",