Go MAAS API Library

Merge lp:~wallyworld/gomaasapi/testservice-numeric-field-fix into lp:gomaasapi

  1. testservice-numeric-field-fix
  2. Merge into trunk
Proposed by Ian Booth
Status: Merged
Merged at revision: 61
Proposed branch: lp:~wallyworld/gomaasapi/testservice-numeric-field-fix
Merge into: lp:gomaasapi
Diff against target: 70 lines (+19/-17)
2 files modified
testservice.go (+9/-9)
testservice_test.go (+10/-8)
To merge this branch: bzr merge lp:~wallyworld/gomaasapi/testservice-numeric-field-fix
Reviewer Review Type Date Requested Status
Andrew Wilkins (community) Approve
Review via email: mp+246250@code.launchpad.net

Commit message

The test server now assumes numeric fields are stored as float, not string.

Description of the change

The test server now assumes numeric fields are stored as float, not string.

To post a comment you must log in.
Revision history for this message
Andrew Wilkins (axwalk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'testservice.go'
2--- testservice.go 2015-01-13 00:09:11 +0000
3+++ testservice.go 2015-01-13 03:13:14 +0000
4@@ -693,15 +693,15 @@
5 }
6
7 func matchNumericField(node MAASObject, k, v string) bool {
8- field, err := node.GetField(k)
9- if err != nil {
10- return false
11- }
12- nodeVal, err := strconv.ParseInt(field, 10, 64)
13- if err != nil {
14- return false
15- }
16- constraintVal, err := strconv.ParseInt(v, 10, 64)
17+ field, ok := node.GetMap()[k]
18+ if !ok {
19+ return false
20+ }
21+ nodeVal, err := field.GetFloat64()
22+ if err != nil {
23+ return false
24+ }
25+ constraintVal, err := strconv.ParseFloat(v, 64)
26 if err != nil {
27 return false
28 }
29
30=== modified file 'testservice_test.go'
31--- testservice_test.go 2015-01-13 00:09:11 +0000
32+++ testservice_test.go 2015-01-13 03:13:14 +0000
33@@ -1147,27 +1147,29 @@
34 }
35
36 func (suite *TestMAASObjectSuite) TestAcquireFilterMemory(c *C) {
37- suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n0", "memory": "1024"}`)
38- suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n1", "memory": "2048"}`)
39+ suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n0", "memory": 1024}`)
40+ suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n1", "memory": 2048}`)
41 nodeListing := suite.TestMAASObject.GetSubObject("nodes")
42 jsonResponse, err := nodeListing.CallPost("acquire", url.Values{"mem": []string{"2048"}})
43 c.Assert(err, IsNil)
44 acquiredNode, err := jsonResponse.GetMAASObject()
45 c.Assert(err, IsNil)
46- mem, _ := acquiredNode.GetField("memory")
47- c.Assert(mem, Equals, "2048")
48+ mem, err := acquiredNode.GetMap()["memory"].GetFloat64()
49+ c.Assert(err, IsNil)
50+ c.Assert(mem, Equals, float64(2048))
51 }
52
53 func (suite *TestMAASObjectSuite) TestAcquireFilterCpuCores(c *C) {
54- suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n0", "cpu_count": "1"}`)
55- suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n1", "cpu_count": "2"}`)
56+ suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n0", "cpu_count": 1}`)
57+ suite.TestMAASObject.TestServer.NewNode(`{"system_id": "n1", "cpu_count": 2}`)
58 nodeListing := suite.TestMAASObject.GetSubObject("nodes")
59 jsonResponse, err := nodeListing.CallPost("acquire", url.Values{"cpu-cores": []string{"2"}})
60 c.Assert(err, IsNil)
61 acquiredNode, err := jsonResponse.GetMAASObject()
62 c.Assert(err, IsNil)
63- cores, _ := acquiredNode.GetField("cpu_count")
64- c.Assert(cores, Equals, "2")
65+ cpucount, err := acquiredNode.GetMap()["cpu_count"].GetFloat64()
66+ c.Assert(err, IsNil)
67+ c.Assert(cpucount, Equals, float64(2))
68 }
69
70 func (suite *TestMAASObjectSuite) TestAcquireFilterArch(c *C) {

Subscribers

People subscribed via source and target branches

to all changes: