Merge lp:~waigani/gomaasapi/faildeploy into lp:gomaasapi

[Jesse Meek]

Add missing node statuses, required to fix bug #1376246. There will be a follow up branch in juju-core which will use this commit to fix the bug.

Add missing node statuses, required to fix bug #1376246. There will be a follow up branch in juju-core which will use this commit to fix the bug.

[Raphaël Badin (rvb)]

Fwiw, the 'status' field doesn't include the new statuses (for backward compatibility). To have access to the full ranges of 'in progress' statuses, use the 'substatus' field (the 'substatus' field was included in revision 3319).

Example: here is what a 'Deploying' node would look like:

{
        "status": 6,
        [...]
        "substatus": 9,
}

[Ian Booth (wallyworld)]

So in juju we are using the "deployment_status" API on the node to get it's status, which we assume is a string like "Deployed" or "Failed Deployment".

Will that work? I think that API is only on later MAAS's. So if we get a not implemented error, we jut ignore it.

[Raphaël Badin (rvb)]

> So in juju we are using the "deployment_status" API on the node to get it's status,
> which we assume is a string like "Deployed" or "Failed Deployment".

> Will that work? I think that API is only on later MAAS's. So if we get a not implemented
> error, we jut ignore it.

Right, this endpoint returns "Deployed", "Deploying", "Failed deployment", "Not in deployment".
The endpoint was added in revision 2633.

=== modified file 'enum.go'
--- enum.go	2013-10-14 22:25:01 +0000
+++ enum.go	2015-06-02 02:45:01 +0000
@@ -25,8 +25,33 @@
 	NodeStatusReserved = "5"
 
 	// The node is powering a service from a charm or is ready for use with a fresh Ubuntu install.
-	NodeStatusAllocated = "6"
+	NodeStatusDeployed = "6"
 
 	// The node has been removed from service manually until an admin overrides the retirement.
 	NodeStatusRetired = "7"
+
+	// The node is broken: a step in the node lifecyle failed. More details
+	// can be found in the node's event log.
+	NodeStatusBroken = "8"
+
+	// The node is being installed.
+	NodeStatusDeploying = "9"
+
+	// The node has been allocated to a user and is ready for deployment.
+	NodeStatusAllocated = "10"
+
+	// The deployment of the node failed.
+	NodeStatusFailedDeployment = "11"
+
+	// The node is powering down after a release request.
+	NodeStatusReleasing = "12"
+
+	// The releasing of the node failed.
+	NodeStatusFailedReleasing = "13"
+
+	// The node is erasing its disks.
+	NodeStatusDiskErasing = "14"
+
+	// The node failed to erase its disks.
+	NodeStatusFailedDiskErasing = "15"
 )

=== modified file 'testservice.go'
--- testservice.go	2015-01-13 03:11:30 +0000
+++ testservice.go	2015-06-02 02:45:01 +0000
@@ -266,7 +266,7 @@
 	systemId := systemIdEntry.(string)
 	attrs[resourceURI] = getNodeURL(server.version, systemId)
 	if _, hasStatus := attrs["status"]; !hasStatus {
-		attrs["status"] = NodeStatusAllocated
+		attrs["status"] = NodeStatusDeployed
 	}
 	obj := newJSONMAASObject(attrs, server.client)
 	server.nodes[systemId] = obj
@@ -617,11 +617,11 @@
 		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:
+		case NodeStatusDeployed:
 			nodeStatus[systemId] = "Deployed"
+		case NodeStatusFailedDeployment:
+			nodeStatus[systemId] = "Failed deployment"
 		default:
 			nodeStatus[systemId] = "Not in Deployment"
 		}