Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(463)

Unified Diff: state/state_test.go

Issue 14619045: state: make Addresses use Machine.Addresses
Patch Set: state: make Addresses use Machine.Addresses Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « state/open.go ('k') | worker/provisioner/lxc-broker_test.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: state/state_test.go
=== modified file 'state/state_test.go'
--- state/state_test.go 2013-10-09 07:42:44 +0000
+++ state/state_test.go 2013-10-14 17:44:23 +0000
@@ -7,7 +7,6 @@
"fmt"
"net/url"
"strconv"
- "strings"
"time"
"labix.org/v2/mgo/bson"
@@ -54,12 +53,54 @@
}
}
-func (s *StateSuite) TestStateInfo(c *gc.C) {
- info := state.TestingStateInfo()
- stateAddr, err := s.State.Addresses()
- c.Assert(err, gc.IsNil)
- c.Assert(stateAddr, gc.DeepEquals, info.Addrs)
- c.Assert(s.State.CACert(), gc.DeepEquals, info.CACert)
+func (s *StateSuite) TestAddresses(c *gc.C) {
+ var err error
+ machines := make([]*state.Machine, 3)
+ machines[0], err = s.State.AddMachine("quantal", state.JobHostUnits)
+ c.Assert(err, gc.IsNil)
+ machines[1], err = s.State.AddMachine("quantal", state.JobManageState, state.JobHostUnits)
+ c.Assert(err, gc.IsNil)
+ machines[2], err = s.State.AddMachine("quantal", state.JobManageState)
+ c.Assert(err, gc.IsNil)
+
+ for i, m := range machines {
+ err := m.SetAddresses([]instance.Address{{
+ Type: instance.Ipv4Address,
+ NetworkScope: instance.NetworkCloudLocal,
+ Value: fmt.Sprintf("10.0.0.%d", i),
+ }, {
+ Type: instance.Ipv6Address,
+ NetworkScope: instance.NetworkCloudLocal,
+ Value: "::1",
+ }, {
+ Type: instance.Ipv4Address,
+ NetworkScope: instance.NetworkMachineLocal,
+ Value: "127.0.0.1",
+ }, {
+ Type: instance.Ipv4Address,
+ NetworkScope: instance.NetworkPublic,
+ Value: "5.4.3.2",
+ }})
+ c.Assert(err, gc.IsNil)
+ }
+ envConfig, err := s.State.EnvironConfig()
+ c.Assert(err, gc.IsNil)
+
+ addrs, err := s.State.Addresses()
+ c.Assert(err, gc.IsNil)
+ c.Assert(addrs, gc.HasLen, 2)
+ c.Assert(addrs, jc.SameContents, []string{
+ fmt.Sprintf("10.0.0.1:%d", envConfig.StatePort()),
+ fmt.Sprintf("10.0.0.2:%d", envConfig.StatePort()),
+ })
+
+ addrs, err = s.State.APIAddresses()
+ c.Assert(err, gc.IsNil)
+ c.Assert(addrs, gc.HasLen, 2)
+ c.Assert(addrs, jc.SameContents, []string{
+ fmt.Sprintf("10.0.0.1:%d", envConfig.APIPort()),
+ fmt.Sprintf("10.0.0.2:%d", envConfig.APIPort()),
+ })
}
func (s *StateSuite) TestPing(c *gc.C) {
@@ -68,22 +109,6 @@
c.Assert(s.State.Ping(), gc.NotNil)
}
-func (s *StateSuite) TestAPIAddresses(c *gc.C) {
- config, err := s.State.EnvironConfig()
- c.Assert(err, gc.IsNil)
- apiPort := strconv.Itoa(config.APIPort())
- info := state.TestingStateInfo()
- expectedAddrs := make([]string, 0, len(info.Addrs))
- for _, stateAddr := range info.Addrs {
- domain := strings.Split(stateAddr, ":")[0]
- expectedAddr := strings.Join([]string{domain, apiPort}, ":")
- expectedAddrs = append(expectedAddrs, expectedAddr)
- }
- apiAddrs, err := s.State.APIAddresses()
- c.Assert(err, gc.IsNil)
- c.Assert(apiAddrs, gc.DeepEquals, expectedAddrs)
-}
-
func (s *StateSuite) TestIsNotFound(c *gc.C) {
err1 := fmt.Errorf("unrelated error")
err2 := errors.NotFoundf("foo")
« no previous file with comments | « state/open.go ('k') | worker/provisioner/lxc-broker_test.go » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b