Merge lp:~thumper/juju-core/move-params-port into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Move params.Ports to the instance package

This removes the state/api/params dependency inside instance.
The instance package only imports standard libraries now.

https://codereview.appspot.com/10327043/

Move params.Ports to the instance package

This removes the state/api/params dependency inside instance.
The instance package only imports standard libraries now.

https://codereview.appspot.com/10327043/

[Tim Penhey (thumper)]

Reviewers: mp+169711_code.launchpad.net,

Message:
Please take a look.

Description:
Move params.Ports to the instance package

This removes the state/api/params dependency inside instance.
The instance package only imports standard libraries now.

https://code.launchpad.net/~thumper/juju-core/move-params-port/+merge/169711

Requires:
https://code.launchpad.net/~thumper/juju-core/instance-id/+merge/169709

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M environs/azure/environ.go
   M environs/azure/instance.go
   M environs/dummy/environs.go
   M environs/ec2/ec2.go
   M environs/interface.go
   M environs/jujutest/livetests.go
   M environs/maas/environ.go
   M environs/maas/instance.go
   M environs/openstack/provider.go
   M instance/instance.go
   M state/api/params/params.go
   M state/api/params/params_test.go
   M state/megawatcher_internal_test.go
   M state/state_test.go
   M state/unit.go
   M state/unit_test.go
   M worker/firewaller/firewaller.go
   M worker/firewaller/firewaller_test.go

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/10327043/diff/1/environs/maas/instance.go
File environs/maas/instance.go (right):

https://codereview.appspot.com/10327043/diff/1/environs/maas/instance.go#newcode36
environs/maas/instance.go:36: func (this *maasInstance) DNSName()
(string, error) {
s/this/mi

https://codereview.appspot.com/10327043/

[Tim Penhey (thumper)]

On 2013/06/17 06:25:07, dfc wrote:
> Would you consider a type instead ?

> type Proto int

> const {
> TCP Proto = iota
> UDP
> }

> func (p Proto) String() string {
> switch p {
> case TCP: return "TCP"
> case UDP: return "UDP"
> default: return "unknown"
> }

Yes, but not in this branch.

The current changes here are very mechanical and limited in scope.

Changing the type of the protocol specifier would require more changes.

So, yes, I support this idea, just not right now.

https://codereview.appspot.com/10327043/

[Go Bot (go-bot)]

The prerequisite https://code.launchpad.net/~thumper/juju-core/instance-id has not yet been merged into https://code.launchpad.net/~go-bot/juju-core/trunk.

=== modified file 'environs/azure/environ.go'
--- environs/azure/environ.go	2013-06-17 21:41:29 +0000
+++ environs/azure/environ.go	2013-06-17 21:41:30 +0000
@@ -10,7 +10,6 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 type azureEnviron struct{}
@@ -84,17 +83,17 @@
 }
 
 // OpenPorts is specified in the Environ interface.
-func (env *azureEnviron) OpenPorts(ports []params.Port) error {
+func (env *azureEnviron) OpenPorts(ports []instance.Port) error {
 	panic("unimplemented")
 }
 
 // ClosePorts is specified in the Environ interface.
-func (env *azureEnviron) ClosePorts(ports []params.Port) error {
+func (env *azureEnviron) ClosePorts(ports []instance.Port) error {
 	panic("unimplemented")
 }
 
 // Ports is specified in the Environ interface.
-func (env *azureEnviron) Ports() ([]params.Port, error) {
+func (env *azureEnviron) Ports() ([]instance.Port, error) {
 	panic("unimplemented")
 }
 

=== modified file 'environs/azure/instance.go'
--- environs/azure/instance.go	2013-06-17 21:41:29 +0000
+++ environs/azure/instance.go	2013-06-17 21:41:30 +0000
@@ -5,7 +5,6 @@
 
 import (
 	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 type azureInstance struct{}
@@ -29,16 +28,16 @@
 }
 
 // OpenPorts is specified in the Instance interface.
-func (instance *azureInstance) OpenPorts(machineId string, ports []params.Port) error {
+func (instance *azureInstance) OpenPorts(machineId string, ports []instance.Port) error {
 	panic("unimplemented")
 }
 
 // ClosePorts is specified in the Instance interface.
-func (instance *azureInstance) ClosePorts(machineId string, ports []params.Port) error {
+func (instance *azureInstance) ClosePorts(machineId string, ports []instance.Port) error {
 	panic("unimplemented")
 }
 
 // Ports is specified in the Instance interface.
-func (instance *azureInstance) Ports(machineId string) ([]params.Port, error) {
+func (instance *azureInstance) Ports(machineId string) ([]instance.Port, error) {
 	panic("unimplemented")
 }

=== modified file 'environs/dummy/environs.go'
--- environs/dummy/environs.go	2013-06-17 21:41:29 +0000
+++ environs/dummy/environs.go	2013-06-17 21:41:30 +0000
@@ -34,7 +34,6 @@
 	"launchpad.net/juju-core/schema"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/utils"
@@ -92,14 +91,14 @@
 	Env        string
 	MachineId  string
 	InstanceId instance.Id
-	Ports      []params.Port
+	Ports      []instance.Port
 }
 
 type OpClosePorts struct {
 	Env        string
 	MachineId  string
 	InstanceId instance.Id
-	Ports      []params.Port
+	Ports      []instance.Port
 }
 
 type OpPutFile struct {
@@ -127,7 +126,7 @@
 	mu            sync.Mutex
 	maxId         int // maximum instance id allocated so far.
 	insts         map[instance.Id]*dummyInstance
-	globalPorts   map[params.Port]bool
+	globalPorts   map[instance.Port]bool
 	firewallMode  config.FirewallMode
 	bootstrapped  bool
 	storageDelay  time.Duration
@@ -229,7 +228,7 @@
 		name:         name,
 		ops:          ops,
 		insts:        make(map[instance.Id]*dummyInstance),
-		globalPorts:  make(map[params.Port]bool),
+		globalPorts:  make(map[instance.Port]bool),
 		firewallMode: fwmode,
 	}
 	s.storage = newStorage(s, "/"+name+"/private")
@@ -562,7 +561,7 @@
 	i := &dummyInstance{
 		state:     e.state,
 		id:        instance.Id(fmt.Sprintf("%s-%d", e.state.name, e.state.maxId)),
-		ports:     make(map[params.Port]bool),
+		ports:     make(map[instance.Port]bool),
 		machineId: machineId,
 		series:    series,
 	}
@@ -637,7 +636,7 @@
 	return insts, nil
 }
 
-func (e *environ) OpenPorts(ports []params.Port) error {
+func (e *environ) OpenPorts(ports []instance.Port) error {
 	e.state.mu.Lock()
 	defer e.state.mu.Unlock()
 	if e.state.firewallMode != config.FwGlobal {
@@ -650,7 +649,7 @@
 	return nil
 }
 
-func (e *environ) ClosePorts(ports []params.Port) error {
+func (e *environ) ClosePorts(ports []instance.Port) error {
 	e.state.mu.Lock()
 	defer e.state.mu.Unlock()
 	if e.state.firewallMode != config.FwGlobal {
@@ -663,7 +662,7 @@
 	return nil
 }
 
-func (e *environ) Ports() (ports []params.Port, err error) {
+func (e *environ) Ports() (ports []instance.Port, err error) {
 	e.state.mu.Lock()
 	defer e.state.mu.Unlock()
 	if e.state.firewallMode != config.FwGlobal {
@@ -683,7 +682,7 @@
 
 type dummyInstance struct {
 	state     *environState
-	ports     map[params.Port]bool
+	ports     map[instance.Port]bool
 	id        instance.Id
 	machineId string
 	series    string
@@ -702,7 +701,7 @@
 	return inst.DNSName()
 }
 
-func (inst *dummyInstance) OpenPorts(machineId string, ports []params.Port) error {
+func (inst *dummyInstance) OpenPorts(machineId string, ports []instance.Port) error {
 	defer delay()
 	log.Infof("environs/dummy: openPorts %s, %#v", machineId, ports)
 	if inst.state.firewallMode != config.FwInstance {
@@ -726,7 +725,7 @@
 	return nil
 }
 
-func (inst *dummyInstance) ClosePorts(machineId string, ports []params.Port) error {
+func (inst *dummyInstance) ClosePorts(machineId string, ports []instance.Port) error {
 	defer delay()
 	if inst.state.firewallMode != config.FwInstance {
 		return fmt.Errorf("invalid firewall mode for closing ports on instance: %q",
@@ -749,7 +748,7 @@
 	return nil
 }
 
-func (inst *dummyInstance) Ports(machineId string) (ports []params.Port, err error) {
+func (inst *dummyInstance) Ports(machineId string) (ports []instance.Port, err error) {
 	defer delay()
 	if inst.state.firewallMode != config.FwInstance {
 		return nil, fmt.Errorf("invalid firewall mode for retrieving ports from instance: %q",

=== modified file 'environs/ec2/ec2.go'
--- environs/ec2/ec2.go	2013-06-17 21:41:29 +0000
+++ environs/ec2/ec2.go	2013-06-17 21:41:30 +0000
@@ -21,7 +21,6 @@
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/utils"
 	"net/http"
 	"strings"
@@ -601,7 +600,7 @@
 	return st.deleteAll()
 }
 
-func portsToIPPerms(ports []params.Port) []ec2.IPPerm {
+func portsToIPPerms(ports []instance.Port) []ec2.IPPerm {
 	ipPerms := make([]ec2.IPPerm, len(ports))
 	for i, p := range ports {
 		ipPerms[i] = ec2.IPPerm{
@@ -614,7 +613,7 @@
 	return ipPerms
 }
 
-func (e *environ) openPortsInGroup(name string, ports []params.Port) error {
+func (e *environ) openPortsInGroup(name string, ports []instance.Port) error {
 	if len(ports) == 0 {
 		return nil
 	}
@@ -644,7 +643,7 @@
 	return nil
 }
 
-func (e *environ) closePortsInGroup(name string, ports []params.Port) error {
+func (e *environ) closePortsInGroup(name string, ports []instance.Port) error {
 	if len(ports) == 0 {
 		return nil
 	}
@@ -659,7 +658,7 @@
 	return nil
 }
 
-func (e *environ) portsInGroup(name string) (ports []params.Port, err error) {
+func (e *environ) portsInGroup(name string) (ports []instance.Port, err error) {
 	g := ec2.SecurityGroup{Name: name}
 	resp, err := e.ec2().SecurityGroups([]ec2.SecurityGroup{g}, nil)
 	if err != nil {
@@ -674,7 +673,7 @@
 			continue
 		}
 		for i := p.FromPort; i <= p.ToPort; i++ {
-			ports = append(ports, params.Port{
+			ports = append(ports, instance.Port{
 				Protocol: p.Protocol,
 				Number:   i,
 			})
@@ -684,7 +683,7 @@
 	return ports, nil
 }
 
-func (e *environ) OpenPorts(ports []params.Port) error {
+func (e *environ) OpenPorts(ports []instance.Port) error {
 	if e.Config().FirewallMode() != config.FwGlobal {
 		return fmt.Errorf("invalid firewall mode for opening ports on environment: %q",
 			e.Config().FirewallMode())
@@ -696,7 +695,7 @@
 	return nil
 }
 
-func (e *environ) ClosePorts(ports []params.Port) error {
+func (e *environ) ClosePorts(ports []instance.Port) error {
 	if e.Config().FirewallMode() != config.FwGlobal {
 		return fmt.Errorf("invalid firewall mode for closing ports on environment: %q",
 			e.Config().FirewallMode())
@@ -708,7 +707,7 @@
 	return nil
 }
 
-func (e *environ) Ports() ([]params.Port, error) {
+func (e *environ) Ports() ([]instance.Port, error) {
 	if e.Config().FirewallMode() != config.FwGlobal {
 		return nil, fmt.Errorf("invalid firewall mode for retrieving ports from environment: %q",
 			e.Config().FirewallMode())
@@ -767,7 +766,7 @@
 	return "juju-" + e.name
 }
 
-func (inst *ec2Instance) OpenPorts(machineId string, ports []params.Port) error {
+func (inst *ec2Instance) OpenPorts(machineId string, ports []instance.Port) error {
 	if inst.e.Config().FirewallMode() != config.FwInstance {
 		return fmt.Errorf("invalid firewall mode for opening ports on instance: %q",
 			inst.e.Config().FirewallMode())
@@ -780,7 +779,7 @@
 	return nil
 }
 
-func (inst *ec2Instance) ClosePorts(machineId string, ports []params.Port) error {
+func (inst *ec2Instance) ClosePorts(machineId string, ports []instance.Port) error {
 	if inst.e.Config().FirewallMode() != config.FwInstance {
 		return fmt.Errorf("invalid firewall mode for closing ports on instance: %q",
 			inst.e.Config().FirewallMode())
@@ -793,7 +792,7 @@
 	return nil
 }
 
-func (inst *ec2Instance) Ports(machineId string) ([]params.Port, error) {
+func (inst *ec2Instance) Ports(machineId string) ([]instance.Port, error) {
 	if inst.e.Config().FirewallMode() != config.FwInstance {
 		return nil, fmt.Errorf("invalid firewall mode for retrieving ports from instance: %q",
 			inst.e.Config().FirewallMode())

=== modified file 'environs/interface.go'
--- environs/interface.go	2013-06-17 21:41:29 +0000
+++ environs/interface.go	2013-06-17 21:41:30 +0000
@@ -11,7 +11,6 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 // A EnvironProvider represents a computing and storage provider.
@@ -172,17 +171,17 @@
 	// OpenPorts opens the given ports for the whole environment.
 	// Must only be used if the environment was setup with the
 	// FwGlobal firewall mode.
-	OpenPorts(ports []params.Port) error
+	OpenPorts(ports []instance.Port) error
 
 	// ClosePorts closes the given ports for the whole environment.
 	// Must only be used if the environment was setup with the
 	// FwGlobal firewall mode.
-	ClosePorts(ports []params.Port) error
+	ClosePorts(ports []instance.Port) error
 
 	// Ports returns the ports opened for the whole environment.
 	// Must only be used if the environment was setup with the
 	// FwGlobal firewall mode.
-	Ports() ([]params.Port, error)
+	Ports() ([]instance.Port, error)
 
 	// Provider returns the EnvironProvider that created this Environ.
 	Provider() EnvironProvider

=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2013-06-17 21:41:29 +0000
+++ environs/jujutest/livetests.go	2013-06-17 21:41:30 +0000
@@ -19,7 +19,6 @@
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api/params"
 	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
@@ -175,70 +174,70 @@
 	defer t.Env.StopInstances([]instance.Instance{inst2})
 
 	// Open some ports and check they're there.
-	err = inst1.OpenPorts("1", []params.Port{{"udp", 67}, {"tcp", 45}})
+	err = inst1.OpenPorts("1", []instance.Port{{"udp", 67}, {"tcp", 45}})
 	c.Assert(err, IsNil)
 	ports, err = inst1.Ports("1")
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 45}, {"udp", 67}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 45}, {"udp", 67}})
 	ports, err = inst2.Ports("2")
 	c.Assert(err, IsNil)
 	c.Assert(ports, HasLen, 0)
 
-	err = inst2.OpenPorts("2", []params.Port{{"tcp", 89}, {"tcp", 45}})
+	err = inst2.OpenPorts("2", []instance.Port{{"tcp", 89}, {"tcp", 45}})
 	c.Assert(err, IsNil)
 
 	// Check there's no crosstalk to another machine
 	ports, err = inst2.Ports("2")
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 45}, {"tcp", 89}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 45}, {"tcp", 89}})
 	ports, err = inst1.Ports("1")
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 45}, {"udp", 67}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 45}, {"udp", 67}})
 
 	// Check that opening the same port again is ok.
 	oldPorts, err := inst2.Ports("2")
 	c.Assert(err, IsNil)
-	err = inst2.OpenPorts("2", []params.Port{{"tcp", 45}})
+	err = inst2.OpenPorts("2", []instance.Port{{"tcp", 45}})
 	c.Assert(err, IsNil)
 	ports, err = inst2.Ports("2")
 	c.Assert(err, IsNil)
 	c.Assert(ports, DeepEquals, oldPorts)
 
 	// Check that opening the same port again and another port is ok.
-	err = inst2.OpenPorts("2", []params.Port{{"tcp", 45}, {"tcp", 99}})
+	err = inst2.OpenPorts("2", []instance.Port{{"tcp", 45}, {"tcp", 99}})
 	c.Assert(err, IsNil)
 	ports, err = inst2.Ports("2")
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 45}, {"tcp", 89}, {"tcp", 99}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 45}, {"tcp", 89}, {"tcp", 99}})
 
-	err = inst2.ClosePorts("2", []params.Port{{"tcp", 45}, {"tcp", 99}})
+	err = inst2.ClosePorts("2", []instance.Port{{"tcp", 45}, {"tcp", 99}})
 	c.Assert(err, IsNil)
 
 	// Check that we can close ports and that there's no crosstalk.
 	ports, err = inst2.Ports("2")
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 89}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 89}})
 	ports, err = inst1.Ports("1")
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 45}, {"udp", 67}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 45}, {"udp", 67}})
 
 	// Check that we can close multiple ports.
-	err = inst1.ClosePorts("1", []params.Port{{"tcp", 45}, {"udp", 67}})
+	err = inst1.ClosePorts("1", []instance.Port{{"tcp", 45}, {"udp", 67}})
 	c.Assert(err, IsNil)
 	ports, err = inst1.Ports("1")
 	c.Assert(ports, HasLen, 0)
 
 	// Check that we can close ports that aren't there.
-	err = inst2.ClosePorts("2", []params.Port{{"tcp", 111}, {"udp", 222}})
+	err = inst2.ClosePorts("2", []instance.Port{{"tcp", 111}, {"udp", 222}})
 	c.Assert(err, IsNil)
 	ports, err = inst2.Ports("2")
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 89}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 89}})
 
 	// Check errors when acting on environment.
-	err = t.Env.OpenPorts([]params.Port{{"tcp", 80}})
+	err = t.Env.OpenPorts([]instance.Port{{"tcp", 80}})
 	c.Assert(err, ErrorMatches, `invalid firewall mode for opening ports on environment: "instance"`)
 
-	err = t.Env.ClosePorts([]params.Port{{"tcp", 80}})
+	err = t.Env.ClosePorts([]instance.Port{{"tcp", 80}})
 	c.Assert(err, ErrorMatches, `invalid firewall mode for closing ports on environment: "instance"`)
 
 	_, err = t.Env.Ports()
@@ -273,34 +272,34 @@
 	c.Assert(ports, HasLen, 0)
 	defer t.Env.StopInstances([]instance.Instance{inst2})
 
-	err = t.Env.OpenPorts([]params.Port{{"udp", 67}, {"tcp", 45}, {"tcp", 89}, {"tcp", 99}})
+	err = t.Env.OpenPorts([]instance.Port{{"udp", 67}, {"tcp", 45}, {"tcp", 89}, {"tcp", 99}})
 	c.Assert(err, IsNil)
 
 	ports, err = t.Env.Ports()
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 45}, {"tcp", 89}, {"tcp", 99}, {"udp", 67}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 45}, {"tcp", 89}, {"tcp", 99}, {"udp", 67}})
 
 	// Check closing some ports.
-	err = t.Env.ClosePorts([]params.Port{{"tcp", 99}, {"udp", 67}})
+	err = t.Env.ClosePorts([]instance.Port{{"tcp", 99}, {"udp", 67}})
 	c.Assert(err, IsNil)
 
 	ports, err = t.Env.Ports()
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 45}, {"tcp", 89}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 45}, {"tcp", 89}})
 
 	// Check that we can close ports that aren't there.
-	err = t.Env.ClosePorts([]params.Port{{"tcp", 111}, {"udp", 222}})
+	err = t.Env.ClosePorts([]instance.Port{{"tcp", 111}, {"udp", 222}})
 	c.Assert(err, IsNil)
 
 	ports, err = t.Env.Ports()
 	c.Assert(err, IsNil)
-	c.Assert(ports, DeepEquals, []params.Port{{"tcp", 45}, {"tcp", 89}})
+	c.Assert(ports, DeepEquals, []instance.Port{{"tcp", 45}, {"tcp", 89}})
 
 	// Check errors when acting on instances.
-	err = inst1.OpenPorts("1", []params.Port{{"tcp", 80}})
+	err = inst1.OpenPorts("1", []instance.Port{{"tcp", 80}})
 	c.Assert(err, ErrorMatches, `invalid firewall mode for opening ports on instance: "global"`)
 
-	err = inst1.ClosePorts("1", []params.Port{{"tcp", 80}})
+	err = inst1.ClosePorts("1", []instance.Port{{"tcp", 80}})
 	c.Assert(err, ErrorMatches, `invalid firewall mode for closing ports on instance: "global"`)
 
 	_, err = inst1.Ports("1")

=== modified file 'environs/maas/environ.go'
--- environs/maas/environ.go	2013-06-17 21:41:29 +0000
+++ environs/maas/environ.go	2013-06-17 21:41:30 +0000
@@ -17,7 +17,6 @@
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/utils"
 	"net/url"
 	"sync"
@@ -490,19 +489,19 @@
 }
 
 // MAAS does not do firewalling so these port methods do nothing.
-func (*maasEnviron) OpenPorts([]params.Port) error {
+func (*maasEnviron) OpenPorts([]instance.Port) error {
 	log.Debugf("environs/maas: unimplemented OpenPorts() called")
 	return nil
 }
 
-func (*maasEnviron) ClosePorts([]params.Port) error {
+func (*maasEnviron) ClosePorts([]instance.Port) error {
 	log.Debugf("environs/maas: unimplemented ClosePorts() called")
 	return nil
 }
 
-func (*maasEnviron) Ports() ([]params.Port, error) {
+func (*maasEnviron) Ports() ([]instance.Port, error) {
 	log.Debugf("environs/maas: unimplemented Ports() called")
-	return []params.Port{}, nil
+	return []instance.Port{}, nil
 }
 
 func (*maasEnviron) Provider() environs.EnvironProvider {

=== modified file 'environs/maas/instance.go'
--- environs/maas/instance.go	2013-06-17 21:41:29 +0000
+++ environs/maas/instance.go	2013-06-17 21:41:30 +0000
@@ -7,7 +7,6 @@
 	"launchpad.net/gomaasapi"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 type maasInstance struct {
@@ -34,32 +33,32 @@
 	return nil
 }
 
-func (instance *maasInstance) DNSName() (string, error) {
-	hostname, err := (*instance.maasObject).GetField("hostname")
+func (mi *maasInstance) DNSName() (string, error) {
+	hostname, err := (*mi.maasObject).GetField("hostname")
 	if err != nil {
 		return "", err
 	}
 	return hostname, nil
 }
 
-func (instance *maasInstance) WaitDNSName() (string, error) {
+func (mi *maasInstance) WaitDNSName() (string, error) {
 	// A MAAS nodes gets his DNS name when it's created.  WaitDNSName,
 	// (same as DNSName) just returns the hostname of the node.
-	return instance.DNSName()
+	return mi.DNSName()
 }
 
 // MAAS does not do firewalling so these port methods do nothing.
-func (instance *maasInstance) OpenPorts(machineId string, ports []params.Port) error {
+func (mi *maasInstance) OpenPorts(machineId string, ports []instance.Port) error {
 	log.Debugf("environs/maas: unimplemented OpenPorts() called")
 	return nil
 }
 
-func (instance *maasInstance) ClosePorts(machineId string, ports []params.Port) error {
+func (mi *maasInstance) ClosePorts(machineId string, ports []instance.Port) error {
 	log.Debugf("environs/maas: unimplemented ClosePorts() called")
 	return nil
 }
 
-func (instance *maasInstance) Ports(machineId string) ([]params.Port, error) {
+func (mi *maasInstance) Ports(machineId string) ([]instance.Port, error) {
 	log.Debugf("environs/maas: unimplemented Ports() called")
-	return []params.Port{}, nil
+	return []instance.Port{}, nil
 }

=== modified file 'environs/openstack/provider.go'
--- environs/openstack/provider.go	2013-06-17 21:41:29 +0000
+++ environs/openstack/provider.go	2013-06-17 21:41:30 +0000
@@ -27,7 +27,6 @@
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/utils"
 	"net/http"
 	"strconv"
@@ -354,7 +353,7 @@
 
 // TODO: following 30 lines nearly verbatim from environs/ec2
 
-func (inst *openstackInstance) OpenPorts(machineId string, ports []params.Port) error {
+func (inst *openstackInstance) OpenPorts(machineId string, ports []instance.Port) error {
 	if inst.e.Config().FirewallMode() != config.FwInstance {
 		return fmt.Errorf("invalid firewall mode for opening ports on instance: %q",
 			inst.e.Config().FirewallMode())
@@ -367,7 +366,7 @@
 	return nil
 }
 
-func (inst *openstackInstance) ClosePorts(machineId string, ports []params.Port) error {
+func (inst *openstackInstance) ClosePorts(machineId string, ports []instance.Port) error {
 	if inst.e.Config().FirewallMode() != config.FwInstance {
 		return fmt.Errorf("invalid firewall mode for closing ports on instance: %q",
 			inst.e.Config().FirewallMode())
@@ -380,7 +379,7 @@
 	return nil
 }
 
-func (inst *openstackInstance) Ports(machineId string) ([]params.Port, error) {
+func (inst *openstackInstance) Ports(machineId string) ([]instance.Port, error) {
 	if inst.e.Config().FirewallMode() != config.FwInstance {
 		return nil, fmt.Errorf("invalid firewall mode for retrieving ports from instance: %q",
 			inst.e.Config().FirewallMode())
@@ -1001,7 +1000,7 @@
 	return filter
 }
 
-func (e *environ) openPortsInGroup(name string, ports []params.Port) error {
+func (e *environ) openPortsInGroup(name string, ports []instance.Port) error {
 	novaclient := e.nova()
 	group, err := novaclient.SecurityGroupByName(name)
 	if err != nil {
@@ -1023,7 +1022,7 @@
 	return nil
 }
 
-func (e *environ) closePortsInGroup(name string, ports []params.Port) error {
+func (e *environ) closePortsInGroup(name string, ports []instance.Port) error {
 	if len(ports) == 0 {
 		return nil
 	}
@@ -1050,14 +1049,14 @@
 	return nil
 }
 
-func (e *environ) portsInGroup(name string) (ports []params.Port, err error) {
+func (e *environ) portsInGroup(name string) (ports []instance.Port, err error) {
 	group, err := e.nova().SecurityGroupByName(name)
 	if err != nil {
 		return nil, err
 	}
 	for _, p := range (*group).Rules {
 		for i := *p.FromPort; i <= *p.ToPort; i++ {
-			ports = append(ports, params.Port{
+			ports = append(ports, instance.Port{
 				Protocol: *p.IPProtocol,
 				Number:   i,
 			})
@@ -1069,7 +1068,7 @@
 
 // TODO: following 30 lines nearly verbatim from environs/ec2
 
-func (e *environ) OpenPorts(ports []params.Port) error {
+func (e *environ) OpenPorts(ports []instance.Port) error {
 	if e.Config().FirewallMode() != config.FwGlobal {
 		return fmt.Errorf("invalid firewall mode for opening ports on environment: %q",
 			e.Config().FirewallMode())
@@ -1081,7 +1080,7 @@
 	return nil
 }
 
-func (e *environ) ClosePorts(ports []params.Port) error {
+func (e *environ) ClosePorts(ports []instance.Port) error {
 	if e.Config().FirewallMode() != config.FwGlobal {
 		return fmt.Errorf("invalid firewall mode for closing ports on environment: %q",
 			e.Config().FirewallMode())
@@ -1093,7 +1092,7 @@
 	return nil
 }
 
-func (e *environ) Ports() ([]params.Port, error) {
+func (e *environ) Ports() ([]instance.Port, error) {
 	if e.Config().FirewallMode() != config.FwGlobal {
 		return nil, fmt.Errorf("invalid firewall mode for retrieving ports from environment: %q",
 			e.Config().FirewallMode())

=== modified file 'instance/instance.go'
--- instance/instance.go	2013-06-17 21:41:29 +0000
+++ instance/instance.go	2013-06-17 21:41:30 +0000
@@ -5,8 +5,7 @@
 
 import (
 	"errors"
-
-	"launchpad.net/juju-core/state/api/params"
+	"fmt"
 )
 
 var ErrNoDNSName = errors.New("DNS name not allocated")
@@ -15,6 +14,16 @@
 // instance (physical or virtual machine allocated in the provider).
 type Id string
 
+// Port identifies a network port number for a particular protocol.
+type Port struct {
+	Protocol string
+	Number   int
+}
+
+func (p Port) String() string {
+	return fmt.Sprintf("%s:%d", p.Protocol, p.Number)
+}
+
 // Instance represents the the realization of a machine in state.
 type Instance interface {
 	// Id returns a provider-generated identifier for the Instance.
@@ -31,14 +40,14 @@
 
 	// OpenPorts opens the given ports on the instance, which
 	// should have been started with the given machine id.
-	OpenPorts(machineId string, ports []params.Port) error
+	OpenPorts(machineId string, ports []Port) error
 
 	// ClosePorts closes the given ports on the instance, which
 	// should have been started with the given machine id.
-	ClosePorts(machineId string, ports []params.Port) error
+	ClosePorts(machineId string, ports []Port) error
 
 	// Ports returns the set of ports open on the instance, which
 	// should have been started with the given machine id.
 	// The ports are returned as sorted by state.SortPorts.
-	Ports(machineId string) ([]params.Port, error)
+	Ports(machineId string) ([]Port, error)
 }

=== modified file 'state/api/params/params.go'
--- state/api/params/params.go	2013-06-12 18:19:17 +0000
+++ state/api/params/params.go	2013-06-17 21:41:30 +0000
@@ -9,6 +9,7 @@
 	"fmt"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/instance"
 )
 
 // Error holds the error result of a single operation.
@@ -280,16 +281,6 @@
 	CharmURL string
 }
 
-// Port identifies a network port number for a particular protocol.
-type Port struct {
-	Protocol string
-	Number   int
-}
-
-func (p Port) String() string {
-	return fmt.Sprintf("%s:%d", p.Protocol, p.Number)
-}
-
 // Delta holds details of a change to the environment.
 type Delta struct {
 	// If Removed is true, the entity has been removed;
@@ -435,7 +426,7 @@
 	PublicAddress  string
 	PrivateAddress string
 	MachineId      string
-	Ports          []Port
+	Ports          []instance.Port
 	Status         Status
 	StatusInfo     string
 }

=== modified file 'state/api/params/params_test.go'
--- state/api/params/params_test.go	2013-06-11 00:58:34 +0000
+++ state/api/params/params_test.go	2013-06-17 21:41:30 +0000
@@ -8,6 +8,7 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"testing"
@@ -63,7 +64,7 @@
 			Service:  "Shazam",
 			Series:   "precise",
 			CharmURL: "cs:~user/precise/wordpress-42",
-			Ports: []params.Port{
+			Ports: []instance.Port{
 				{
 					Protocol: "http",
 					Number:   80},

=== modified file 'state/megawatcher_internal_test.go'
--- state/megawatcher_internal_test.go	2013-06-17 21:41:29 +0000
+++ state/megawatcher_internal_test.go	2013-06-17 21:41:30 +0000
@@ -130,7 +130,7 @@
 			Service:   wordpress.Name(),
 			Series:    m.Series(),
 			MachineId: m.Id(),
-			Ports:     []params.Port{},
+			Ports:     []instance.Port{},
 			Status:    params.StatusPending,
 		})
 		pairs := map[string]string{"name": fmt.Sprintf("bar %d", i)}
@@ -176,7 +176,7 @@
 			Name:    fmt.Sprintf("logging/%d", i),
 			Service: "logging",
 			Series:  "series",
-			Ports:   []params.Port{},
+			Ports:   []instance.Port{},
 			Status:  params.StatusPending,
 		})
 	}
@@ -340,7 +340,7 @@
 				PublicAddress:  "public",
 				PrivateAddress: "private",
 				MachineId:      "0",
-				Ports:          []params.Port{{"tcp", 12345}},
+				Ports:          []instance.Port{{"tcp", 12345}},
 				Status:         params.StatusError,
 				StatusInfo:     "failure",
 			},
@@ -372,7 +372,7 @@
 				Service:       "wordpress",
 				Series:        "series",
 				PublicAddress: "public",
-				Ports:         []params.Port{{"udp", 17070}},
+				Ports:         []instance.Port{{"udp", 17070}},
 				Status:        params.StatusError,
 				StatusInfo:    "another failure",
 			},

=== modified file 'state/state_test.go'
--- state/state_test.go	2013-06-17 21:41:29 +0000
+++ state/state_test.go	2013-06-17 21:41:30 +0000
@@ -13,7 +13,6 @@
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing"
 	"net/url"
 	"sort"
@@ -903,15 +902,15 @@
 }
 
 var sortPortsTests = []struct {
-	have, want []params.Port
+	have, want []instance.Port
 }{
-	{nil, []params.Port{}},
-	{[]params.Port{{"b", 1}, {"a", 99}, {"a", 1}}, []params.Port{{"a", 1}, {"a", 99}, {"b", 1}}},
+	{nil, []instance.Port{}},
+	{[]instance.Port{{"b", 1}, {"a", 99}, {"a", 1}}, []instance.Port{{"a", 1}, {"a", 99}, {"b", 1}}},
 }
 
 func (*StateSuite) TestSortPorts(c *C) {
 	for _, t := range sortPortsTests {
-		p := make([]params.Port, len(t.have))
+		p := make([]instance.Port, len(t.have))
 		copy(p, t.have)
 		state.SortPorts(p)
 		c.Check(p, DeepEquals, t.want)

=== modified file 'state/unit.go'
--- state/unit.go	2013-06-12 00:02:00 +0000
+++ state/unit.go	2013-06-17 21:41:30 +0000
@@ -10,6 +10,7 @@
 	"labix.org/v2/mgo/txn"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/errors"
+	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/presence"
 	"launchpad.net/juju-core/utils"
@@ -67,7 +68,7 @@
 	MachineId      string
 	Resolved       ResolvedMode
 	Tools          *Tools `bson:",omitempty"`
-	Ports          []params.Port
+	Ports          []instance.Port
 	Life           Life
 	TxnRevno       int64 `bson:"txn-revno"`
 	PasswordHash   string
@@ -472,7 +473,7 @@
 
 // OpenPort sets the policy of the port with protocol and number to be opened.
 func (u *Unit) OpenPort(protocol string, number int) (err error) {
-	port := params.Port{Protocol: protocol, Number: number}
+	port := instance.Port{Protocol: protocol, Number: number}
 	defer utils.ErrorContextf(&err, "cannot open port %v for unit %q", port, u)
 	ops := []txn.Op{{
 		C:      u.st.units.Name,
@@ -498,7 +499,7 @@
 
 // ClosePort sets the policy of the port with protocol and number to be closed.
 func (u *Unit) ClosePort(protocol string, number int) (err error) {
-	port := params.Port{Protocol: protocol, Number: number}
+	port := instance.Port{Protocol: protocol, Number: number}
 	defer utils.ErrorContextf(&err, "cannot close port %v for unit %q", port, u)
 	ops := []txn.Op{{
 		C:      u.st.units.Name,
@@ -510,7 +511,7 @@
 	if err != nil {
 		return onAbort(err, errDead)
 	}
-	newPorts := make([]params.Port, 0, len(u.doc.Ports))
+	newPorts := make([]instance.Port, 0, len(u.doc.Ports))
 	for _, p := range u.doc.Ports {
 		if p != port {
 			newPorts = append(newPorts, p)
@@ -521,8 +522,8 @@
 }
 
 // OpenedPorts returns a slice containing the open ports of the unit.
-func (u *Unit) OpenedPorts() []params.Port {
-	ports := append([]params.Port{}, u.doc.Ports...)
+func (u *Unit) OpenedPorts() []instance.Port {
+	ports := append([]instance.Port{}, u.doc.Ports...)
 	SortPorts(ports)
 	return ports
 }
@@ -1008,7 +1009,7 @@
 	return nil
 }
 
-type portSlice []params.Port
+type portSlice []instance.Port
 
 func (p portSlice) Len() int      { return len(p) }
 func (p portSlice) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
@@ -1023,6 +1024,6 @@
 
 // SortPorts sorts the given ports, first by protocol,
 // then by number.
-func SortPorts(ports []params.Port) {
+func SortPorts(ports []instance.Port) {
 	sort.Sort(portSlice(ports))
 }

=== modified file 'state/unit_test.go'
--- state/unit_test.go	2013-06-11 00:58:34 +0000
+++ state/unit_test.go	2013-06-17 21:41:30 +0000
@@ -7,6 +7,7 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/errors"
+	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"sort"
@@ -635,14 +636,14 @@
 	err := s.unit.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
 	open := s.unit.OpenedPorts()
-	c.Assert(open, DeepEquals, []params.Port{
+	c.Assert(open, DeepEquals, []instance.Port{
 		{"tcp", 80},
 	})
 
 	err = s.unit.OpenPort("udp", 53)
 	c.Assert(err, IsNil)
 	open = s.unit.OpenedPorts()
-	c.Assert(open, DeepEquals, []params.Port{
+	c.Assert(open, DeepEquals, []instance.Port{
 		{"tcp", 80},
 		{"udp", 53},
 	})
@@ -650,7 +651,7 @@
 	err = s.unit.OpenPort("tcp", 53)
 	c.Assert(err, IsNil)
 	open = s.unit.OpenedPorts()
-	c.Assert(open, DeepEquals, []params.Port{
+	c.Assert(open, DeepEquals, []instance.Port{
 		{"tcp", 53},
 		{"tcp", 80},
 		{"udp", 53},
@@ -659,7 +660,7 @@
 	err = s.unit.OpenPort("tcp", 443)
 	c.Assert(err, IsNil)
 	open = s.unit.OpenedPorts()
-	c.Assert(open, DeepEquals, []params.Port{
+	c.Assert(open, DeepEquals, []instance.Port{
 		{"tcp", 53},
 		{"tcp", 80},
 		{"tcp", 443},
@@ -669,7 +670,7 @@
 	err = s.unit.ClosePort("tcp", 80)
 	c.Assert(err, IsNil)
 	open = s.unit.OpenedPorts()
-	c.Assert(open, DeepEquals, []params.Port{
+	c.Assert(open, DeepEquals, []instance.Port{
 		{"tcp", 53},
 		{"tcp", 443},
 		{"udp", 53},
@@ -678,7 +679,7 @@
 	err = s.unit.ClosePort("tcp", 80)
 	c.Assert(err, IsNil)
 	open = s.unit.OpenedPorts()
-	c.Assert(open, DeepEquals, []params.Port{
+	c.Assert(open, DeepEquals, []instance.Port{
 		{"tcp", 53},
 		{"tcp", 443},
 		{"udp", 53},

=== modified file 'worker/firewaller/firewaller.go'
--- worker/firewaller/firewaller.go	2013-06-17 21:41:29 +0000
+++ worker/firewaller/firewaller.go	2013-06-17 21:41:30 +0000
@@ -11,7 +11,6 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/watcher"
 	"launchpad.net/juju-core/worker"
 	"launchpad.net/tomb"
@@ -32,7 +31,7 @@
 	serviceds       map[string]*serviceData
 	exposedChange   chan *exposedChange
 	globalMode      bool
-	globalPortRef   map[params.Port]int
+	globalPortRef   map[instance.Port]int
 }
 
 // NewFirewaller returns a new Firewaller.
@@ -67,7 +66,7 @@
 	}
 	if fw.environ.Config().FirewallMode() == config.FwGlobal {
 		fw.globalMode = true
-		fw.globalPortRef = make(map[params.Port]int)
+		fw.globalPortRef = make(map[instance.Port]int)
 	}
 	for {
 		select {
@@ -136,7 +135,7 @@
 		fw:     fw,
 		id:     id,
 		unitds: make(map[string]*unitData),
-		ports:  make([]params.Port, 0),
+		ports:  make([]instance.Port, 0),
 	}
 	m, err := machined.machine()
 	if errors.IsNotFoundError(err) {
@@ -195,7 +194,7 @@
 	unitd.serviced = fw.serviceds[serviceName]
 	unitd.serviced.unitds[unitName] = unitd
 
-	ports := make([]params.Port, len(unitd.ports))
+	ports := make([]instance.Port, len(unitd.ports))
 	copy(ports, unitd.ports)
 
 	go unitd.watchLoop(ports)
@@ -224,7 +223,7 @@
 	if err != nil {
 		return err
 	}
-	collector := make(map[params.Port]bool)
+	collector := make(map[instance.Port]bool)
 	for _, unitd := range fw.unitds {
 		if unitd.serviced.exposed {
 			for _, port := range unitd.ports {
@@ -232,7 +231,7 @@
 			}
 		}
 	}
-	wantedPorts := []params.Port{}
+	wantedPorts := []instance.Port{}
 	for port := range collector {
 		wantedPorts = append(wantedPorts, port)
 	}
@@ -365,7 +364,7 @@
 // flushMachine opens and closes ports for the passed machine.
 func (fw *Firewaller) flushMachine(machined *machineData) error {
 	// Gather ports to open and close.
-	ports := map[params.Port]bool{}
+	ports := map[instance.Port]bool{}
 	for _, unitd := range machined.unitds {
 		if unitd.serviced.exposed {
 			for _, port := range unitd.ports {
@@ -373,7 +372,7 @@
 			}
 		}
 	}
-	want := []params.Port{}
+	want := []instance.Port{}
 	for port := range ports {
 		want = append(want, port)
 	}
@@ -389,9 +388,9 @@
 // flushGlobalPorts opens and closes global ports in the environment.
 // It keeps a reference count for ports so that only 0-to-1 and 1-to-0 events
 // modify the environment.
-func (fw *Firewaller) flushGlobalPorts(rawOpen, rawClose []params.Port) error {
+func (fw *Firewaller) flushGlobalPorts(rawOpen, rawClose []instance.Port) error {
 	// Filter which ports are really to open or close.
-	var toOpen, toClose []params.Port
+	var toOpen, toClose []instance.Port
 	for _, port := range rawOpen {
 		if fw.globalPortRef[port] == 0 {
 			toOpen = append(toOpen, port)
@@ -426,7 +425,7 @@
 }
 
 // flushGlobalPorts opens and closes ports global on the machine.
-func (fw *Firewaller) flushInstancePorts(machined *machineData, toOpen, toClose []params.Port) error {
+func (fw *Firewaller) flushInstancePorts(machined *machineData, toOpen, toClose []instance.Port) error {
 	// If there's nothing to do, do nothing.
 	// This is important because when a machine is first created,
 	// it will have no instance id but also no open ports -
@@ -583,7 +582,7 @@
 	fw     *Firewaller
 	id     string
 	unitds map[string]*unitData
-	ports  []params.Port
+	ports  []instance.Port
 }
 
 func (md *machineData) machine() (*state.Machine, error) {
@@ -624,7 +623,7 @@
 // portsChange contains the changed ports for one specific unit.
 type portsChange struct {
 	unitd *unitData
-	ports []params.Port
+	ports []instance.Port
 }
 
 // unitData holds unit details and watches port changes.
@@ -634,11 +633,11 @@
 	unit     *state.Unit
 	serviced *serviceData
 	machined *machineData
-	ports    []params.Port
+	ports    []instance.Port
 }
 
 // watchLoop watches the unit for port changes.
-func (ud *unitData) watchLoop(latestPorts []params.Port) {
+func (ud *unitData) watchLoop(latestPorts []instance.Port) {
 	defer ud.tomb.Done()
 	w := ud.unit.Watch()
 	defer watcher.Stop(w, &ud.tomb)
@@ -673,7 +672,7 @@
 
 // samePorts returns whether old and new contain the same set of ports.
 // Both old and new must be sorted.
-func samePorts(old, new []params.Port) bool {
+func samePorts(old, new []instance.Port) bool {
 	if len(old) != len(new) {
 		return false
 	}
@@ -747,7 +746,7 @@
 }
 
 // diff returns all the ports that exist in A but not B.
-func diff(A, B []params.Port) (missing []params.Port) {
+func diff(A, B []instance.Port) (missing []instance.Port) {
 next:
 	for _, a := range A {
 		for _, b := range B {

=== modified file 'worker/firewaller/firewaller_test.go'
--- worker/firewaller/firewaller_test.go	2013-06-14 01:23:48 +0000
+++ worker/firewaller/firewaller_test.go	2013-06-17 21:41:30 +0000
@@ -10,7 +10,6 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api/params"
 	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/worker"
 	"launchpad.net/juju-core/worker/firewaller"
@@ -33,7 +32,7 @@
 
 // assertPorts retrieves the open ports of the instance and compares them
 // to the expected.
-func (s *FirewallerSuite) assertPorts(c *C, inst instance.Instance, machineId string, expected []params.Port) {
+func (s *FirewallerSuite) assertPorts(c *C, inst instance.Instance, machineId string, expected []instance.Port) {
 	s.State.StartSync()
 	start := time.Now()
 	for {
@@ -59,7 +58,7 @@
 
 // assertEnvironPorts retrieves the open ports of environment and compares them
 // to the expected.
-func (s *FirewallerSuite) assertEnvironPorts(c *C, expected []params.Port) {
+func (s *FirewallerSuite) assertEnvironPorts(c *C, expected []instance.Port) {
 	s.State.StartSync()
 	start := time.Now()
 	for {
@@ -179,12 +178,12 @@
 	err = u.OpenPort("tcp", 8080)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	err = u.ClosePort("tcp", 80)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 8080}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 8080}})
 }
 
 func (s *FirewallerSuite) TestMultipleExposedServices(c *C) {
@@ -213,15 +212,15 @@
 	err = u2.OpenPort("tcp", 3306)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst1, m1.Id(), []params.Port{{"tcp", 80}, {"tcp", 8080}})
-	s.assertPorts(c, inst2, m2.Id(), []params.Port{{"tcp", 3306}})
+	s.assertPorts(c, inst1, m1.Id(), []instance.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertPorts(c, inst2, m2.Id(), []instance.Port{{"tcp", 3306}})
 
 	err = u1.ClosePort("tcp", 80)
 	c.Assert(err, IsNil)
 	err = u2.ClosePort("tcp", 3306)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst1, m1.Id(), []params.Port{{"tcp", 8080}})
+	s.assertPorts(c, inst1, m1.Id(), []instance.Port{{"tcp", 8080}})
 	s.assertPorts(c, inst2, m2.Id(), nil)
 }
 
@@ -242,12 +241,12 @@
 	inst2 := s.startInstance(c, m2)
 	err = u2.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
-	s.assertPorts(c, inst2, m2.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst2, m2.Id(), []instance.Port{{"tcp", 80}})
 
 	inst1 := s.startInstance(c, m1)
 	err = u1.OpenPort("tcp", 8080)
 	c.Assert(err, IsNil)
-	s.assertPorts(c, inst1, m1.Id(), []params.Port{{"tcp", 8080}})
+	s.assertPorts(c, inst1, m1.Id(), []instance.Port{{"tcp", 8080}})
 }
 
 func (s *FirewallerSuite) TestMultipleUnits(c *C) {
@@ -269,8 +268,8 @@
 	err = u2.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst1, m1.Id(), []params.Port{{"tcp", 80}})
-	s.assertPorts(c, inst2, m2.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst1, m1.Id(), []instance.Port{{"tcp", 80}})
+	s.assertPorts(c, inst2, m2.Id(), []instance.Port{{"tcp", 80}})
 
 	err = u1.ClosePort("tcp", 80)
 	c.Assert(err, IsNil)
@@ -301,7 +300,7 @@
 	fw := firewaller.NewFirewaller(s.State)
 	defer func() { c.Assert(fw.Stop(), IsNil) }()
 
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	err = svc.SetExposed()
 	c.Assert(err, IsNil)
@@ -331,7 +330,7 @@
 	err = u.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 80}})
 }
 
 func (s *FirewallerSuite) TestStartWithUnexposedService(c *C) {
@@ -357,7 +356,7 @@
 	// Expose service.
 	err = svc.SetExposed()
 	c.Assert(err, IsNil)
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 80}})
 }
 
 func (s *FirewallerSuite) TestSetClearExposedService(c *C) {
@@ -381,7 +380,7 @@
 	err = svc.SetExposed()
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	// ClearExposed closes the ports again.
 	err = svc.ClearExposed()
@@ -409,8 +408,8 @@
 	err = u2.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst1, m1.Id(), []params.Port{{"tcp", 80}})
-	s.assertPorts(c, inst2, m2.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst1, m1.Id(), []instance.Port{{"tcp", 80}})
+	s.assertPorts(c, inst2, m2.Id(), []instance.Port{{"tcp", 80}})
 
 	// Remove unit.
 	err = u1.EnsureDead()
@@ -419,7 +418,7 @@
 	c.Assert(err, IsNil)
 
 	s.assertPorts(c, inst1, m1.Id(), nil)
-	s.assertPorts(c, inst2, m2.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst2, m2.Id(), []instance.Port{{"tcp", 80}})
 }
 
 func (s *FirewallerSuite) TestRemoveService(c *C) {
@@ -436,7 +435,7 @@
 	err = u.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 80}})
 
 	// Remove service.
 	err = u.EnsureDead()
@@ -472,8 +471,8 @@
 	err = u2.OpenPort("tcp", 3306)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst1, m1.Id(), []params.Port{{"tcp", 80}})
-	s.assertPorts(c, inst2, m2.Id(), []params.Port{{"tcp", 3306}})
+	s.assertPorts(c, inst1, m1.Id(), []instance.Port{{"tcp", 80}})
+	s.assertPorts(c, inst2, m2.Id(), []instance.Port{{"tcp", 3306}})
 
 	// Remove services.
 	err = u2.EnsureDead()
@@ -508,7 +507,7 @@
 	err = u.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 80}})
 
 	// Remove unit and service, also tested without. Has no effect.
 	err = u.EnsureDead()
@@ -541,7 +540,7 @@
 	err = u.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
 
-	s.assertPorts(c, inst, m.Id(), []params.Port{{"tcp", 80}})
+	s.assertPorts(c, inst, m.Id(), []instance.Port{{"tcp", 80}})
 
 	// Remove unit.
 	err = u.EnsureDead()
@@ -591,17 +590,17 @@
 	err = u2.OpenPort("tcp", 80)
 	c.Assert(err, IsNil)
 
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	// Closing a port opened by a different unit won't touch the environment.
 	err = u1.ClosePort("tcp", 80)
 	c.Assert(err, IsNil)
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	// Closing a port used just once changes the environment.
 	err = u1.ClosePort("tcp", 8080)
 	c.Assert(err, IsNil)
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}})
 
 	// Closing the last port also modifies the environment.
 	err = u2.ClosePort("tcp", 80)
@@ -636,7 +635,7 @@
 	// Expose service.
 	err = svc.SetExposed()
 	c.Assert(err, IsNil)
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}})
 }
 
 func (s *FirewallerSuite) TestGlobalModeRestart(c *C) {
@@ -659,7 +658,7 @@
 	err = u.OpenPort("tcp", 8080)
 	c.Assert(err, IsNil)
 
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	// Stop firewall and close one and open a different port.
 	err = fw.Stop()
@@ -674,7 +673,7 @@
 	fw = firewaller.NewFirewaller(s.State)
 	defer func() { c.Assert(fw.Stop(), IsNil) }()
 
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}, {"tcp", 8888}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}, {"tcp", 8888}})
 }
 
 func (s *FirewallerSuite) TestGlobalModeRestartUnexposedService(c *C) {
@@ -697,7 +696,7 @@
 	err = u.OpenPort("tcp", 8080)
 	c.Assert(err, IsNil)
 
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	// Stop firewall and clear exposed flag on service.
 	err = fw.Stop()
@@ -733,7 +732,7 @@
 	err = u1.OpenPort("tcp", 8080)
 	c.Assert(err, IsNil)
 
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	// Stop firewall and add another service using the port.
 	err = fw.Stop()
@@ -753,17 +752,17 @@
 	fw = firewaller.NewFirewaller(s.State)
 	defer func() { c.Assert(fw.Stop(), IsNil) }()
 
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	// Closing a port opened by a different unit won't touch the environment.
 	err = u1.ClosePort("tcp", 80)
 	c.Assert(err, IsNil)
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}, {"tcp", 8080}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}, {"tcp", 8080}})
 
 	// Closing a port used just once changes the environment.
 	err = u1.ClosePort("tcp", 8080)
 	c.Assert(err, IsNil)
-	s.assertEnvironPorts(c, []params.Port{{"tcp", 80}})
+	s.assertEnvironPorts(c, []instance.Port{{"tcp", 80}})
 
 	// Closing the last port also modifies the environment.
 	err = u2.ClosePort("tcp", 80)