Added testing to provisioner instance statuses

Horacio Duran · Horacio Duran · commit 8b6ec4b845b4 · 2016-02-25T12:29:39.000-03:00
diff --git a/api/provisioner/machine.go b/api/provisioner/machine.go
@@ -70,6 +70,7 @@ func (m *Machine) ProvisioningInfo() (*params.ProvisioningInfo, error) {
 	return result.Result, nil
 }
 
+// SetInstanceStatus sets the status for the provider instance.
 func (m *Machine) SetInstanceStatus(status status.Status, message string, data map[string]interface{}) error {
 	var result params.ErrorResults
 	args := params.SetStatus{Entities: []params.EntityStatusArgs{
@@ -82,6 +83,26 @@ func (m *Machine) SetInstanceStatus(status status.Status, message string, data m
 	return result.OneError()
 }
 
+// InstanceStatus returns the status of the provider instance.
+func (m *Machine) InstanceStatus() (status.Status, string, error) {
+	var results params.StatusResults
+	args := params.Entities{Entities: []params.Entity{
+		{Tag: m.tag.String()},
+	}}
+	err := m.st.facade.FacadeCall("InstanceStatus", args, &results)
+	if err != nil {
+		return "", "", err
+	}
+	if len(results.Results) != 1 {
+		return "", "", fmt.Errorf("expected 1 result, got %d", len(results.Results))
+	}
+	result := results.Results[0]
+	if result.Error != nil {
+		return "", "", result.Error
+	}
+	return result.Status, result.Info, nil
+}
+
 // SetStatus sets the status of the machine.
 func (m *Machine) SetStatus(status status.Status, info string, data map[string]interface{}) error {
 	var result params.ErrorResults
diff --git a/api/provisioner/provisioner_test.go b/api/provisioner/provisioner_test.go
@@ -135,6 +135,25 @@ func (s *provisionerSuite) TestGetSetStatus(c *gc.C) {
 	c.Assert(statusInfo.Data, gc.HasLen, 0)
 }
 
+func (s *provisionerSuite) TestGetSetInstanceStatus(c *gc.C) {
+	apiMachine, err := s.provisioner.Machine(s.machine.Tag().(names.MachineTag))
+	c.Assert(err, jc.ErrorIsNil)
+
+	instanceStatus, info, err := apiMachine.InstanceStatus()
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(instanceStatus, gc.Equals, status.StatusPending)
+	c.Assert(info, gc.Equals, "")
+	err = apiMachine.SetInstanceStatus(status.StatusStarted, "blah", nil)
+	c.Assert(err, jc.ErrorIsNil)
+	instanceStatus, info, err = apiMachine.InstanceStatus()
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(instanceStatus, gc.Equals, status.StatusStarted)
+	c.Assert(info, gc.Equals, "blah")
+	statusInfo, err := s.machine.InstanceStatus()
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(statusInfo.Data, gc.HasLen, 0)
+}
+
 func (s *provisionerSuite) TestGetSetStatusWithData(c *gc.C) {
 	apiMachine, err := s.provisioner.Machine(s.machine.Tag().(names.MachineTag))
 	c.Assert(err, jc.ErrorIsNil)
diff --git a/apiserver/provisioner/provisioner.go b/apiserver/provisioner/provisioner.go
@@ -1246,3 +1246,60 @@ func (p *ProvisionerAPI) createOrFetchStateSubnet(subnetInfo network.SubnetInfo)
 	}
 	return subnet, nil
 }
+
+// InstanceStatus returns the instance status for each given entity.
+// Only machine tags are accepted.
+func (p *ProvisionerAPI) InstanceStatus(args params.Entities) (params.StatusResults, error) {
+	result := params.StatusResults{
+		Results: make([]params.StatusResult, len(args.Entities)),
+	}
+	canAccess, err := p.getAuthFunc()
+	if err != nil {
+		logger.Errorf("failed to get an authorisation function: %v", err)
+		return result, errors.Trace(err)
+	}
+	for i, arg := range args.Entities {
+		mTag, err := names.ParseMachineTag(arg.Tag)
+		if err != nil {
+			result.Results[i].Error = common.ServerError(err)
+			continue
+		}
+		machine, err := p.getMachine(canAccess, mTag)
+		if err == nil {
+			var statusInfo status.StatusInfo
+			statusInfo, err = machine.InstanceStatus()
+			result.Results[i].Status = statusInfo.Status
+			result.Results[i].Info = statusInfo.Message
+			result.Results[i].Data = statusInfo.Data
+			result.Results[i].Since = statusInfo.Since
+		}
+		result.Results[i].Error = common.ServerError(err)
+	}
+	return result, nil
+}
+
+// SetInstanceStatus updates the instance status for each given
+// entity. Only machine tags are accepted.
+func (p *ProvisionerAPI) SetInstanceStatus(args params.SetStatus) (params.ErrorResults, error) {
+	result := params.ErrorResults{
+		Results: make([]params.ErrorResult, len(args.Entities)),
+	}
+	canAccess, err := p.getAuthFunc()
+	if err != nil {
+		logger.Errorf("failed to get an authorisation function: %v", err)
+		return result, errors.Trace(err)
+	}
+	for i, arg := range args.Entities {
+		mTag, err := names.ParseMachineTag(arg.Tag)
+		if err != nil {
+			result.Results[i].Error = common.ServerError(err)
+			continue
+		}
+		machine, err := p.getMachine(canAccess, mTag)
+		if err == nil {
+			err = machine.SetInstanceStatus(arg.Status, arg.Info, arg.Data)
+		}
+		result.Results[i].Error = common.ServerError(err)
+	}
+	return result, nil
+}
diff --git a/status/status.go b/status/status.go
@@ -1,4 +1,4 @@
-// Copyright 2013 Canonical Ltd.
+// Copyright 2016 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package status

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2013 Canonical Ltd.`
	`1`	`+// Copyright 2016 Canonical Ltd.`
`2`	`2`	`// Licensed under the AGPLv3, see LICENCE file for details.`
`3`	`3`
`4`	`4`	`package status`