Merge lp:~wallyworld/gomaasapi/testservice-additions into lp:gomaasapi

[Ian Booth]

Add capability to the test server to:

1. Filter instances using mem/arch/cpu-cores constraints when acquiring
2. Support new deployment_status api

Add capability to the test server to:

1. Filter instances using mem/arch/cpu-cores constraints when acquiring
2. Support new deployment_status api

[Andrew Wilkins (axwalk)]

LGTM. Suggest adding means of disabling ?op=deployment_status, but feel free to defer if you think it's not a high priority.

review: Approve

=== modified file 'testservice.go'
--- testservice.go	2015-01-09 10:04:00 +0000
+++ testservice.go	2015-01-13 00:22:44 +0000
@@ -605,13 +605,41 @@
 	fmt.Fprint(w, string(res))
 }
 
+// nodeDeploymentStatusHandler handles requests for '/nodes/?op=deployment_status'.
+func nodeDeploymentStatusHandler(server *TestServer, w http.ResponseWriter, r *http.Request) {
+	values, err := url.ParseQuery(r.URL.RawQuery)
+	checkError(err)
+	nodes, _ := values["nodes"]
+	var nodeStatus = make(map[string]interface{})
+	for _, systemId := range nodes {
+		node := server.nodes[systemId]
+		field, err := node.GetField("status")
+		if err != nil {
+			continue
+		}
+		// The MAAS node model has changed somewhat since this test server was written.
+		// For now, assume allocated = deployed, which is fine for testing with.
+		switch field {
+		case NodeStatusAllocated:
+			nodeStatus[systemId] = "Deployed"
+		default:
+			nodeStatus[systemId] = "Not in Deployment"
+		}
+	}
+	obj := maasify(server.client, nodeStatus)
+	res, err := json.Marshal(obj)
+	checkError(err)
+	w.WriteHeader(http.StatusOK)
+	fmt.Fprint(w, string(res))
+}
+
 // findFreeNode looks for a node that is currently available, and
 // matches the specified filter.
 func findFreeNode(server *TestServer, filter url.Values) *MAASObject {
 	for systemID, node := range server.Nodes() {
 		_, present := server.OwnedNodes()[systemID]
 		if !present {
-			var agentName, nodeName, zoneName string
+			var agentName, nodeName, zoneName, mem, cpuCores, arch string
 			for k := range filter {
 				switch k {
 				case "agent_name":
@@ -620,6 +648,12 @@
 					nodeName = filter.Get(k)
 				case "zone":
 					zoneName = filter.Get(k)
+				case "mem":
+					mem = filter.Get(k)
+				case "arch":
+					arch = filter.Get(k)
+				case "cpu-cores":
+					cpuCores = filter.Get(k)
 				}
 			}
 			if nodeName != "" && !matchField(node, "hostname", nodeName) {
@@ -628,6 +662,15 @@
 			if zoneName != "" && !matchField(node, "zone", zoneName) {
 				continue
 			}
+			if mem != "" && !matchNumericField(node, "memory", mem) {
+				continue
+			}
+			if arch != "" && !matchArchitecture(node, "architecture", arch) {
+				continue
+			}
+			if cpuCores != "" && !matchNumericField(node, "cpu_count", cpuCores) {
+				continue
+			}
 			if agentName != "" {
 				agentNameObj := maasify(server.client, agentName)
 				node.GetMap()["agent_name"] = agentNameObj
@@ -640,6 +683,31 @@
 	return nil
 }
 
+func matchArchitecture(node MAASObject, k, v string) bool {
+	field, err := node.GetField(k)
+	if err != nil {
+		return false
+	}
+	baseArch := strings.Split(field, "/")
+	return v == baseArch[0]
+}
+
+func matchNumericField(node MAASObject, k, v string) bool {
+	field, err := node.GetField(k)
+	if err != nil {
+		return false
+	}
+	nodeVal, err := strconv.ParseInt(field, 10, 64)
+	if err != nil {
+		return false
+	}
+	constraintVal, err := strconv.ParseInt(v, 10, 64)
+	if err != nil {
+		return false
+	}
+	return constraintVal <= nodeVal
+}
+
 func matchField(node MAASObject, k, v string) bool {
 	field, err := node.GetField(k)
 	if err != nil {
@@ -705,6 +773,9 @@
 	case r.Method == "GET" && op == "list":
 		// Node listing operation.
 		nodeListingHandler(server, w, r)
+	case r.Method == "GET" && op == "deployment_status":
+		// Node deployment_status operation.
+		nodeDeploymentStatusHandler(server, w, r)
 	case r.Method == "POST" && op == "acquire":
 		nodesAcquireHandler(server, w, r)
 	case r.Method == "POST" && op == "release":

=== modified file 'testservice_test.go'
--- testservice_test.go	2015-01-09 10:04:00 +0000
+++ testservice_test.go	2015-01-13 00:22:44 +0000
@@ -1145,3 +1145,58 @@
 	c.Assert(id, Not(Equals), "n0")
 	c.Assert(zone, Equals, "z1")
 }
+
+func (suite *TestMAASObjectSuite) TestAcquireFilterMemory(c *C) {
+	suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n0", "memory": "1024"}`)
+	suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n1", "memory": "2048"}`)
+	nodeListing := suite.TestMAASObject.GetSubObject("nodes")
+	jsonResponse, err := nodeListing.CallPost("acquire", url.Values{"mem": []string{"2048"}})
+	c.Assert(err, IsNil)
+	acquiredNode, err := jsonResponse.GetMAASObject()
+	c.Assert(err, IsNil)
+	mem, _ := acquiredNode.GetField("memory")
+	c.Assert(mem, Equals, "2048")
+}
+
+func (suite *TestMAASObjectSuite) TestAcquireFilterCpuCores(c *C) {
+	suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n0", "cpu_count": "1"}`)
+	suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n1", "cpu_count": "2"}`)
+	nodeListing := suite.TestMAASObject.GetSubObject("nodes")
+	jsonResponse, err := nodeListing.CallPost("acquire", url.Values{"cpu-cores": []string{"2"}})
+	c.Assert(err, IsNil)
+	acquiredNode, err := jsonResponse.GetMAASObject()
+	c.Assert(err, IsNil)
+	cores, _ := acquiredNode.GetField("cpu_count")
+	c.Assert(cores, Equals, "2")
+}
+
+func (suite *TestMAASObjectSuite) TestAcquireFilterArch(c *C) {
+	suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n0", "architecture": "amd64"}`)
+	suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n1", "architecture": "arm/generic"}`)
+	nodeListing := suite.TestMAASObject.GetSubObject("nodes")
+	jsonResponse, err := nodeListing.CallPost("acquire", url.Values{"arch": []string{"arm"}})
+	c.Assert(err, IsNil)
+	acquiredNode, err := jsonResponse.GetMAASObject()
+	c.Assert(err, IsNil)
+	arch, _ := acquiredNode.GetField("architecture")
+	c.Assert(arch, Equals, "arm/generic")
+}
+
+func (suite *TestMAASObjectSuite) TestDeploymentStatus(c *C) {
+	suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n0", "status": "6"}`)
+	suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n1", "status": "1"}`)
+	nodes := suite.TestMAASObject.GetSubObject("nodes")
+	jsonResponse, err := nodes.CallGet("deployment_status", url.Values{"nodes": []string{"n0", "n1"}})
+	c.Assert(err, IsNil)
+	deploymentStatus, err := jsonResponse.GetMap()
+	c.Assert(err, IsNil)
+	c.Assert(deploymentStatus, HasLen, 2)
+	expectedStatus := map[string]string{
+		"n0": "Deployed", "n1": "Not in Deployment",
+	}
+	for systemId, status := range expectedStatus {
+		nodeStatus, err := deploymentStatus[systemId].GetString()
+		c.Assert(err, IsNil)
+		c.Assert(nodeStatus, Equals, status)
+	}
+}