Merge lp:~axwalk/juju-core/apihostports-api into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

Introduce APIHostPorts client API

I've added a APIHostPorts client API,
to allow clients to discover addresses
for additional API servers. There already
existed an internal API of the same name,
so I moved the result struct from
internal.go and reused it.

https://codereview.appspot.com/81340045/

Introduce APIHostPorts client API

I've added a APIHostPorts client API,
to allow clients to discover addresses
for additional API servers. There already
existed an internal API of the same name,
so I moved the result struct from
internal.go and reused it.

https://codereview.appspot.com/81340045/

[Andrew Wilkins (axwalk)]

Reviewers: mp+213200_code.launchpad.net,

Message:
Please take a look.

Description:
Introduce APIHostPorts client API

I've added a APIHostPorts client API,
to allow clients to discover addresses
for additional API servers. There already
existed an internal API of the same name,
so I moved the result struct from
internal.go and reused it.

https://code.launchpad.net/~axwalk/juju-core/apihostports-api/+merge/213200

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/81340045/

Affected files (+59, -7 lines):
   A [revision details]
   M state/api/client.go
   M state/api/params/internal.go
   M state/api/params/params.go
   M state/apiserver/client/client.go
   M state/apiserver/client/client_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140327203820-qrgltgfsli0ff9ci
+New revision: <email address hidden>

Index: state/api/client.go
=== modified file 'state/api/client.go'
--- state/api/client.go 2014-03-26 17:19:35 +0000
+++ state/api/client.go 2014-03-28 05:59:48 +0000
@@ -666,3 +666,12 @@
   }
   return jsonResponse.Tools, nil
  }
+
+// APIHostPorts returns a slice of instance.HostPort for each API server.
+func (c *Client) APIHostPorts() ([][]instance.HostPort, error) {
+ var result params.APIHostPortsResult
+ if err := c.call("APIHostPorts", nil, &result); err != nil {
+ return nil, err
+ }
+ return result.Servers, nil
+}

Index: state/api/params/internal.go
=== modified file 'state/api/params/internal.go'
--- state/api/params/internal.go 2014-03-26 04:13:52 +0000
+++ state/api/params/internal.go 2014-03-28 05:59:48 +0000
@@ -532,10 +532,3 @@
  type RunResults struct {
   Results []RunResult
  }
-
-// APIHostPortsResult holds the result of an APIHostPorts
-// call. Each element in the top level slice holds
-// the addresses for one API server.
-type APIHostPortsResult struct {
- Servers [][]instance.HostPort
-}

Index: state/api/params/params.go
=== modified file 'state/api/params/params.go'
--- state/api/params/params.go 2014-03-27 12:53:54 +0000
+++ state/api/params/params.go 2014-03-28 05:59:48 +0000
@@ -632,3 +632,10 @@
  type SetRsyslogCertParams struct {
   CACert []byte
  }
+
+// APIHostPortsResult holds the result of an APIHostPorts
+// call. Each element in the top level slice holds
+// the addresses for one API server.
+type APIHostPortsResult struct {
+ Servers [][]instance.HostPort
+}

Index: state/apiserver/client/client.go
=== modified file 'state/apiserver/client/client.go'
--- state/apiserver/client/client.go 2014-03-26 13:40:28 +0000
+++ state/apiserver/client/client.go 2014-03-28 05:59:48 +0000
@@ -976,3 +976,11 @@
    Entities: entityStatus,
   })
  }
+
+// APIHostPOrts returns the API host/port addresses stored in state.
+func (c *Client) APIHostPorts() (result params.APIHostPortsResult, err
error) {
+ if result.Servers, err = c.api.state.APIHostPorts(); err != nil {
+ return params.APIHostPortsResult{}, err
+ }
+ return result, nil
+}

Index: state/apiserver/cli...

[Roger Peppe (rogpeppe)]

On 2014/03/28 06:17:37, axw wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/81340045/

=== modified file 'state/api/client.go'
--- state/api/client.go	2014-03-26 17:19:35 +0000
+++ state/api/client.go	2014-03-28 06:14:33 +0000
@@ -666,3 +666,12 @@
 	}
 	return jsonResponse.Tools, nil
 }
+
+// APIHostPorts returns a slice of instance.HostPort for each API server.
+func (c *Client) APIHostPorts() ([][]instance.HostPort, error) {
+	var result params.APIHostPortsResult
+	if err := c.call("APIHostPorts", nil, &result); err != nil {
+		return nil, err
+	}
+	return result.Servers, nil
+}

=== modified file 'state/api/params/internal.go'
--- state/api/params/internal.go	2014-03-26 04:13:52 +0000
+++ state/api/params/internal.go	2014-03-28 06:14:33 +0000
@@ -532,10 +532,3 @@
 type RunResults struct {
 	Results []RunResult
 }
-
-// APIHostPortsResult holds the result of an APIHostPorts
-// call. Each element in the top level slice holds
-// the addresses for one API server.
-type APIHostPortsResult struct {
-	Servers [][]instance.HostPort
-}

=== modified file 'state/api/params/params.go'
--- state/api/params/params.go	2014-03-27 12:53:54 +0000
+++ state/api/params/params.go	2014-03-28 06:14:33 +0000
@@ -632,3 +632,10 @@
 type SetRsyslogCertParams struct {
 	CACert []byte
 }
+
+// APIHostPortsResult holds the result of an APIHostPorts
+// call. Each element in the top level slice holds
+// the addresses for one API server.
+type APIHostPortsResult struct {
+	Servers [][]instance.HostPort
+}

=== modified file 'state/apiserver/client/client.go'
--- state/apiserver/client/client.go	2014-03-26 13:40:28 +0000
+++ state/apiserver/client/client.go	2014-03-28 06:14:33 +0000
@@ -976,3 +976,11 @@
 		Entities: entityStatus,
 	})
 }
+
+// APIHostPOrts returns the API host/port addresses stored in state.
+func (c *Client) APIHostPorts() (result params.APIHostPortsResult, err error) {
+	if result.Servers, err = c.api.state.APIHostPorts(); err != nil {
+		return params.APIHostPortsResult{}, err
+	}
+	return result, nil
+}

=== modified file 'state/apiserver/client/client_test.go'
--- state/apiserver/client/client_test.go	2014-03-26 17:19:35 +0000
+++ state/apiserver/client/client_test.go	2014-03-28 06:14:33 +0000
@@ -2082,3 +2082,36 @@
 	c.Assert(info, gc.Equals, "error")
 	c.Assert(data["transient"], gc.Equals, true)
 }
+
+func (s *clientSuite) TestAPIHostPorts(c *gc.C) {
+	apiHostPorts, err := s.APIState.Client().APIHostPorts()
+	c.Assert(err, gc.IsNil)
+	c.Assert(apiHostPorts, gc.HasLen, 0)
+
+	server1Addresses := []instance.Address{{
+		Value:        "server-1",
+		Type:         instance.HostName,
+		NetworkScope: instance.NetworkPublic,
+	}, {
+		Value:        "10.0.0.1",
+		Type:         instance.Ipv4Address,
+		NetworkName:  "internal",
+		NetworkScope: instance.NetworkCloudLocal,
+	}}
+	server2Addresses := []instance.Address{{
+		Value:        "::1",
+		Type:         instance.Ipv6Address,
+		NetworkName:  "loopback",
+		NetworkScope: instance.NetworkMachineLocal,
+	}}
+	stateAPIHostPorts := [][]instance.HostPort{
+		instance.AddressesWithPort(server1Addresses, 123),
+		instance.AddressesWithPort(server2Addresses, 456),
+	}
+
+	err = s.State.SetAPIHostPorts(stateAPIHostPorts)
+	c.Assert(err, gc.IsNil)
+	apiHostPorts, err = s.APIState.Client().APIHostPorts()
+	c.Assert(err, gc.IsNil)
+	c.Assert(apiHostPorts, gc.DeepEquals, stateAPIHostPorts)
+}