Merge lp:~dimitern/juju-core/400-lp-1307513-multiple-nics-same-mac into lp:~go-bot/juju-core/trunk

[Dimiter Naydenov]

various: Support multiple NICs with the same MAC

Fixes bug #1307513, allowing more than one network
interface with the same MAC address, and introduces
the concept of virtual and physical NIC.
This is needed because you can have more than one
network interface with the same MAC address on the
same machine (but it has to be on different networks):
one physical and multiple virtual NICs. Changes were
needed mostly in state to use a different primary
key for networkinterfaces collection. Also added a
unique index on "interfacename" and "networkname",
improved tests.

Fixed the MAAS provider to configure networks properly,
so that you can have more than one VLAN virtual NIC
on the same physical NIC.

Introduced environs/network package and defined an
Id type to make it apparent that network ids are
provider-specific (like instance.Id). Also moved
environs.NetworkInfo to network.Info.

In a follow-up, machine addresses and networks will
be integrated, so we can link a network interface's
name and MAC address to its network (IP) address.
Finally, networks and machine interfaces will be
visible in juju status.

https://codereview.appspot.com/89260044/

R=fwereade

various: Support multiple NICs with the same MAC

Fixes bug #1307513, allowing more than one network
interface with the same MAC address, and introduces
the concept of virtual and physical NIC.
This is needed because you can have more than one
network interface with the same MAC address on the
same machine (but it has to be on different networks):
one physical and multiple virtual NICs. Changes were
needed mostly in state to use a different primary
key for networkinterfaces collection. Also added a
unique index on "interfacename" and "networkname",
improved tests.

Fixed the MAAS provider to configure networks properly,
so that you can have more than one VLAN virtual NIC
on the same physical NIC.

Introduced environs/network package and defined an
Id type to make it apparent that network ids are
provider-specific (like instance.Id). Also moved
environs.NetworkInfo to network.Info.

In a follow-up, machine addresses and networks will
be integrated, so we can link a network interface's
name and MAC address to its network (IP) address.
Finally, networks and machine interfaces will be
visible in juju status.

https://codereview.appspot.com/89260044/

[Dimiter Naydenov (dimitern)]

Reviewers: mp+216453_code.launchpad.net,

Message:
Please take a look.

Description:
various: Support multiple NICs with the same MAC

Fixes bug #1307513, allowing more than one network
interface with the same MAC address, and introduces
the concept of virtual and physical network and NIC.
This is needed because you can have more than one
network interface with the same MAC address on the
same machine (but it has to be on different networks):
one physical and multiple virtual NICs. Changes were
needed mostly in state to use a different primary
key for networkinterfaces collection. Also added a
unique index on "interfacename" and "networkname",
improved tests.

Fixed the MAAS provider to configure networks properly,
so that you can have more than one VLAN virtual NIC
on the same physical NIC.

In a follow-up, machine addresses and networks will
be integrated, so we can link a network interface's
name and MAC address to its network (IP) address.
Finally, networks and machine interfaces will be
visible in juju status.

https://code.launchpad.net/~dimitern/juju-core/400-lp-1307513-multiple-nics-same-mac/+merge/216453

(do not edit description out of merge proposal)

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

Affected files (+408, -180 lines):
   A [revision details]
   M environs/broker.go
   M provider/dummy/environs.go
   M provider/maas/environ.go
   M provider/maas/environ_test.go
   M state/api/params/internal.go
   M state/api/provisioner/provisioner_test.go
   M state/apiserver/provisioner/provisioner.go
   M state/apiserver/provisioner/provisioner_test.go
   M state/machine.go
   M state/machine_test.go
   M state/networkinterfaces.go
   M state/networkinterfaces_test.go
   M state/networks.go
   M state/networks_test.go
   M state/open.go
   M state/state.go
   M state/state_test.go
   M worker/provisioner/provisioner_task.go
   M worker/provisioner/provisioner_test.go

[William Reade (fwereade)]

mostly looking good, but (1) IsVirtual on network still seems ill-formed
to me; and (2) are we explicitly ignoring compatibility with earlier
1.19? these new fields in state worry me a little, the people who want
to work with networks will likely be upgrading from there...

https://codereview.appspot.com/89260044/diff/1/environs/broker.go
File environs/broker.go (right):

https://codereview.appspot.com/89260044/diff/1/environs/broker.go#newcode51
environs/broker.go:51: ProviderId string
We could make this clearer if we had a type for it, like instance.Id --
as it is I think ProviderId is not much of a win over NetworkId. But
`NetworkId NetworkId` should be less confusing.

https://codereview.appspot.com/89260044/diff/1/state/api/params/internal.go
File state/api/params/internal.go (right):

https://codereview.appspot.com/89260044/diff/1/state/api/params/internal.go#newcode331
state/api/params/internal.go:331: IsVirtual bool
I'm less certain about this one. If it's possible for virtual/physical
interfaces to be mixed, this is meaningless; if it's not possible, it's
not necessary on the interface definition. Right?

https://codereview.appspot.com/89260044/diff/1/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/89260044/diff/1/state/machine.go#newcode570
state/machine.go:570: var doc networkInterfaceDoc
hey, I'm feeling more strongly about this now: please assert that the
machine is Dead in this method, just so that if (when) someone tries to
use it from elsewhere they get something pointing out the race with
adding interfaces.

https://codereview.appspot.com/89260044/diff/1/state/machine.go#newcode1077
state/machine.go:1077: panic("unknown error while adding network
interface")
This is on the state server, let's not panic even if it should never
happen.

https://codereview.appspot.com/89260044/

[Dimiter Naydenov (dimitern)]

On 2014/04/18 14:41:17, fwereade wrote:
> mostly looking good, but (1) IsVirtual on network still seems
ill-formed to me;
> and (2) are we explicitly ignoring compatibility with earlier 1.19?
these new
> fields in state worry me a little, the people who want to work with
networks
> will likely be upgrading from there...

1) I'll drop IsVirtual from networks and keep it on interfaces only.
2) 1.19.0 is a dev release which was out recently, so I think we can get
away with saying "if you used networks, please redeploy your environment
when upgrading to 1.19.1" - I'll add a note to the bug and ping sinzui.

https://codereview.appspot.com/89260044/

[Dimiter Naydenov (dimitern)]

Please take a look.

https://codereview.appspot.com/89260044/diff/1/environs/broker.go
File environs/broker.go (right):

https://codereview.appspot.com/89260044/diff/1/environs/broker.go#newcode51
environs/broker.go:51: ProviderId string
On 2014/04/18 14:41:18, fwereade wrote:
> We could make this clearer if we had a type for it, like instance.Id
-- as it is
> I think ProviderId is not much of a win over NetworkId. But `NetworkId
> NetworkId` should be less confusing.

I wanted to make the code use consistent naming - NetworkId is only used
here. I like the idea of type NetworkId string and then perhaps use
ProviderId NetworkId as a compromise?

https://codereview.appspot.com/89260044/diff/1/state/api/params/internal.go
File state/api/params/internal.go (right):

https://codereview.appspot.com/89260044/diff/1/state/api/params/internal.go#newcode331
state/api/params/internal.go:331: IsVirtual bool
On 2014/04/18 14:41:18, fwereade wrote:
> I'm less certain about this one. If it's possible for virtual/physical
> interfaces to be mixed, this is meaningless; if it's not possible,
it's not
> necessary on the interface definition. Right?

Frankly, I don't know whether it's possible to mix physical and virtual
interfaces on the same network, perhaps it is. But the actual flag makes
more sense for NICs, rather than networks.

I'll drop it from networks and leave it only on interfaces.

https://codereview.appspot.com/89260044/diff/1/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/89260044/diff/1/state/machine.go#newcode570
state/machine.go:570: var doc networkInterfaceDoc
On 2014/04/18 14:41:18, fwereade wrote:
> hey, I'm feeling more strongly about this now: please assert that the
machine is
> Dead in this method, just so that if (when) someone tries to use it
from
> elsewhere they get something pointing out the race with adding
interfaces.

Done.

https://codereview.appspot.com/89260044/diff/1/state/machine.go#newcode1077
state/machine.go:1077: panic("unknown error while adding network
interface")
On 2014/04/18 14:41:18, fwereade wrote:
> This is on the state server, let's not panic even if it should never
happen.

I'll log an error instead.

https://codereview.appspot.com/89260044/

[William Reade (fwereade)]

Thanks, LGTM with trivials.

https://codereview.appspot.com/89260044/diff/1/environs/broker.go
File environs/broker.go (right):

https://codereview.appspot.com/89260044/diff/1/environs/broker.go#newcode51
environs/broker.go:51: ProviderId string
On 2014/04/18 15:37:26, dimitern wrote:
> On 2014/04/18 14:41:18, fwereade wrote:
> > We could make this clearer if we had a type for it, like instance.Id
-- as it
> is
> > I think ProviderId is not much of a win over NetworkId. But
`NetworkId
> > NetworkId` should be less confusing.

> I wanted to make the code use consistent naming - NetworkId is only
used here. I
> like the idea of type NetworkId string and then perhaps use ProviderId
NetworkId
> as a compromise?

Yeah, that works for me. Thanks.

https://codereview.appspot.com/89260044/diff/1/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/89260044/diff/1/state/machine.go#newcode570
state/machine.go:570: var doc networkInterfaceDoc
On 2014/04/18 15:37:27, dimitern wrote:
> On 2014/04/18 14:41:18, fwereade wrote:
> > hey, I'm feeling more strongly about this now: please assert that
the machine
> is
> > Dead in this method, just so that if (when) someone tries to use it
from
> > elsewhere they get something pointing out the race with adding
interfaces.

> Done.

Sorry, I expressed myself poorly. The op is nice, and could/should
happily stay (other invariants *should* make it unnecessary, but +1 to
defence in depth), but what I'm really looking for is a quick check
against m.doc.Life so we can abort with an error before even running the
txn.

https://codereview.appspot.com/89260044/diff/10021/state/api/params/internal.go
File state/api/params/internal.go (right):

https://codereview.appspot.com/89260044/diff/10021/state/api/params/internal.go#newcode320
state/api/params/internal.go:320: ProviderId instance.NetworkId
hmm, instance.NetworkId doesn't feel quite right -- I'd say
environs.NetworkId, with the expectation that soon enough we'll want an
environs/network package and we can just call it network.Id.

Or if you want to start the package with a single type, and start
gradually migrating stuff over to it as you go in future CLs, that would
also work for me.

https://codereview.appspot.com/89260044/diff/10021/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/89260044/diff/10021/state/machine.go#newcode1063
state/machine.go:1063: if err =
m.st.networkInterfaces.FindId(doc.Id).One(nil); err == nil {
.One(&doc) perhaps? I suspect you're grabbing the data anyway, even if
you're not storing it, so you may as well return a doc that definitely
completely matches what's in the db.

I know it doesn't make a difference *now* but it feels like an
encouragement to subtle bugs.

https://codereview.appspot.com/89260044/

[Dimiter Naydenov (dimitern)]

Please take a look.

https://codereview.appspot.com/89260044/diff/1/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/89260044/diff/1/state/machine.go#newcode570
state/machine.go:570: var doc networkInterfaceDoc
On 2014/04/18 16:02:54, fwereade wrote:
> On 2014/04/18 15:37:27, dimitern wrote:
> > On 2014/04/18 14:41:18, fwereade wrote:
> > > hey, I'm feeling more strongly about this now: please assert that
the
> machine
> > is
> > > Dead in this method, just so that if (when) someone tries to use
it from
> > > elsewhere they get something pointing out the race with adding
interfaces.
> >
> > Done.

> Sorry, I expressed myself poorly. The op is nice, and could/should
happily stay
> (other invariants *should* make it unnecessary, but +1 to defence in
depth), but
> what I'm really looking for is a quick check against m.doc.Life so we
can abort
> with an error before even running the txn.

As discussed, I'm adding a check for m.doc.Life == Dead at the
beginning.

https://codereview.appspot.com/89260044/diff/10021/state/api/params/internal.go
File state/api/params/internal.go (right):

https://codereview.appspot.com/89260044/diff/10021/state/api/params/internal.go#newcode320
state/api/params/internal.go:320: ProviderId instance.NetworkId
On 2014/04/18 16:02:54, fwereade wrote:
> hmm, instance.NetworkId doesn't feel quite right -- I'd say
environs.NetworkId,
> with the expectation that soon enough we'll want an environs/network
package and
> we can just call it network.Id.

> Or if you want to start the package with a single type, and start
gradually
> migrating stuff over to it as you go in future CLs, that would also
work for me.

I tried adding it to environs, but there are import loops. I like the
idea of having environs/network package, so I added that and moved
environs.NetworkInfo there.

https://codereview.appspot.com/89260044/diff/10021/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/89260044/diff/10021/state/machine.go#newcode1063
state/machine.go:1063: if err =
m.st.networkInterfaces.FindId(doc.Id).One(nil); err == nil {
On 2014/04/18 16:02:54, fwereade wrote:
> .One(&doc) perhaps? I suspect you're grabbing the data anyway, even if
you're
> not storing it, so you may as well return a doc that definitely
completely
> matches what's in the db.

> I know it doesn't make a difference *now* but it feels like an
encouragement to
> subtle bugs.

Done.

https://codereview.appspot.com/89260044/

[Dimiter Naydenov (dimitern)]

Please take a look.

https://codereview.appspot.com/89260044/diff/1/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/89260044/diff/1/state/machine.go#newcode570
state/machine.go:570: var doc networkInterfaceDoc
On 2014/04/18 16:02:54, fwereade wrote:
> On 2014/04/18 15:37:27, dimitern wrote:
> > On 2014/04/18 14:41:18, fwereade wrote:
> > > hey, I'm feeling more strongly about this now: please assert that
the
> machine
> > is
> > > Dead in this method, just so that if (when) someone tries to use
it from
> > > elsewhere they get something pointing out the race with adding
interfaces.
> >
> > Done.

> Sorry, I expressed myself poorly. The op is nice, and could/should
happily stay
> (other invariants *should* make it unnecessary, but +1 to defence in
depth), but
> what I'm really looking for is a quick check against m.doc.Life so we
can abort
> with an error before even running the txn.

As discussed, I'm adding a check for m.doc.Life == Dead at the
beginning.

https://codereview.appspot.com/89260044/diff/10021/state/api/params/internal.go
File state/api/params/internal.go (right):

https://codereview.appspot.com/89260044/diff/10021/state/api/params/internal.go#newcode320
state/api/params/internal.go:320: ProviderId instance.NetworkId
On 2014/04/18 16:02:54, fwereade wrote:
> hmm, instance.NetworkId doesn't feel quite right -- I'd say
environs.NetworkId,
> with the expectation that soon enough we'll want an environs/network
package and
> we can just call it network.Id.

> Or if you want to start the package with a single type, and start
gradually
> migrating stuff over to it as you go in future CLs, that would also
work for me.

I tried adding it to environs, but there are import loops. I like the
idea of having environs/network package, so I added that and moved
environs.NetworkInfo there.

https://codereview.appspot.com/89260044/diff/10021/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/89260044/diff/10021/state/machine.go#newcode1063
state/machine.go:1063: if err =
m.st.networkInterfaces.FindId(doc.Id).One(nil); err == nil {
On 2014/04/18 16:02:54, fwereade wrote:
> .One(&doc) perhaps? I suspect you're grabbing the data anyway, even if
you're
> not storing it, so you may as well return a doc that definitely
completely
> matches what's in the db.

> I know it doesn't make a difference *now* but it feels like an
encouragement to
> subtle bugs.

Done.

https://codereview.appspot.com/89260044/

[Go Bot (go-bot)]

The attempt to merge lp:~dimitern/juju-core/400-lp-1307513-multiple-nics-same-mac into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 1.193s
ok launchpad.net/juju-core/agent/mongo 1.308s
ok launchpad.net/juju-core/agent/tools 0.217s
ok launchpad.net/juju-core/bzr 5.105s
ok launchpad.net/juju-core/cert 2.137s
ok launchpad.net/juju-core/charm 0.357s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.030s
ok launchpad.net/juju-core/cloudinit/sshinit 0.772s
ok launchpad.net/juju-core/cmd 0.177s
ok launchpad.net/juju-core/cmd/charm-admin 0.849s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.163s
ok launchpad.net/juju-core/cmd/juju 228.831s
ok launchpad.net/juju-core/cmd/jujud 76.425s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 6.412s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.164s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.021s
ok launchpad.net/juju-core/container 0.037s
ok launchpad.net/juju-core/container/factory 0.043s
ok launchpad.net/juju-core/container/kvm 0.230s
ok launchpad.net/juju-core/container/kvm/mock 0.040s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.326s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.245s
ok launchpad.net/juju-core/environs 2.474s
ok launchpad.net/juju-core/environs/bootstrap 12.744s
ok launchpad.net/juju-core/environs/cloudinit 0.446s
ok launchpad.net/juju-core/environs/config 2.050s
ok launchpad.net/juju-core/environs/configstore 0.032s
ok launchpad.net/juju-core/environs/filestorage 0.026s
ok launchpad.net/juju-core/environs/httpstorage 0.651s
ok launchpad.net/juju-core/environs/imagemetadata 0.488s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.041s
ok launchpad.net/juju-core/environs/jujutest 0.187s
ok launchpad.net/juju-core/environs/manual 10.221s
? launchpad.net/juju-core/environs/network [no test files]
ok launchpad.net/juju-core/environs/simplestreams 0.235s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.918s
ok launchpad.net/juju-core/environs/storage 0.861s
ok launchpad.net/juju-core/environs/sync 49.998s
ok launchpad.net/juju-core/environs/testing 0.140s
ok launchpad.net/juju-core/environs/tools 4.487s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.018s
ok launchpad.net/juju-core/instance 0.020s
? launchpad.net/juju...

=== modified file 'environs/broker.go'
--- environs/broker.go	2014-04-11 13:54:51 +0000
+++ environs/broker.go	2014-04-18 16:46:53 +0000
@@ -6,6 +6,7 @@
 import (
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/cloudinit"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/tools"
 )
@@ -33,32 +34,6 @@
 	DistributionGroup func() ([]instance.Id, error)
 }
 
-// NetworkInfo describes a single network interface available on an
-// instance. For providers that support networks, this will be
-// available at StartInstance() time.
-type NetworkInfo struct {
-	// MACAddress is the network interface's hardware MAC address
-	// (e.g. "aa:bb:cc:dd:ee:ff").
-	MACAddress string
-
-	// CIDR of the network, in 123.45.67.89/24 format.
-	CIDR string
-
-	// NetworkName is juju-internal name of the network.
-	NetworkName string
-
-	// NetworkId is a provider-specific network id.
-	NetworkId string
-
-	// VLANTag needs to be between 1 and 4094 for VLANs and 0 for
-	// normal networks. It's defined by IEEE 802.1Q standard.
-	VLANTag int
-
-	// InterfaceName is the OS-specific network device name (e.g.
-	// "eth0" or "eth1.42" for a VLAN virtual interface).
-	InterfaceName string
-}
-
 // TODO(wallyworld) - we want this in the environs/instance package but import loops
 // stop that from being possible right now.
 type InstanceBroker interface {
@@ -68,7 +43,7 @@
 	// unique within an environment, is used by juju to protect against the
 	// consequences of multiple instances being started with the same machine
 	// id.
-	StartInstance(args StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []NetworkInfo, error)
+	StartInstance(args StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error)
 
 	// StopInstances shuts down the given instances.
 	StopInstances([]instance.Instance) error

=== added directory 'environs/network'
=== added file 'environs/network/network.go'
--- environs/network/network.go	1970-01-01 00:00:00 +0000
+++ environs/network/network.go	2014-04-18 16:46:53 +0000
@@ -0,0 +1,37 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package network
+
+// Id defines a provider-specific network id.
+type Id string
+
+// Info describes a single network interface available on an instance.
+// For providers that support networks, this will be available at
+// StartInstance() time.
+type Info struct {
+	// MACAddress is the network interface's hardware MAC address
+	// (e.g. "aa:bb:cc:dd:ee:ff").
+	MACAddress string
+
+	// CIDR of the network, in 123.45.67.89/24 format.
+	CIDR string
+
+	// NetworkName is juju-internal name of the network.
+	NetworkName string
+
+	// ProviderId is a provider-specific network id.
+	ProviderId Id
+
+	// VLANTag needs to be between 1 and 4094 for VLANs and 0 for
+	// normal networks. It's defined by IEEE 802.1Q standard.
+	VLANTag int
+
+	// InterfaceName is the OS-specific network device name (e.g.
+	// "eth0" or "eth1.42" for a VLAN virtual interface).
+	InterfaceName string
+
+	// IsVirtual is true when the interface is a virtual device, as
+	// opposed to a physical device.
+	IsVirtual bool
+}

=== modified file 'juju/testing/instance.go'
--- juju/testing/instance.go	2014-04-14 16:41:28 +0000
+++ juju/testing/instance.go	2014-04-18 16:46:53 +0000
@@ -11,6 +11,7 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
@@ -60,7 +61,7 @@
 func StartInstance(
 	env environs.Environ, machineId string,
 ) (
-	instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error,
+	instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 ) {
 	return StartInstanceWithConstraints(env, machineId, constraints.Value{})
 }
@@ -84,7 +85,7 @@
 func StartInstanceWithConstraints(
 	env environs.Environ, machineId string, cons constraints.Value,
 ) (
-	instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error,
+	instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 ) {
 	return StartInstanceWithConstraintsAndNetworks(env, machineId, cons, nil, nil)
 }
@@ -111,7 +112,7 @@
 	env environs.Environ, machineId string, cons constraints.Value,
 	includeNetworks, excludeNetworks []string,
 ) (
-	instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error,
+	instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 ) {
 	series := config.PreferredSeries(env.Config())
 	agentVersion, ok := env.Config().AgentVersion()

=== modified file 'provider/azure/environ.go'
--- provider/azure/environ.go	2014-04-04 15:55:19 +0000
+++ provider/azure/environ.go	2014-04-18 16:46:53 +0000
@@ -19,6 +19,7 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
@@ -508,7 +509,7 @@
 }
 
 // StartInstance is specified in the InstanceBroker interface.
-func (env *azureEnviron) StartInstance(args environs.StartInstanceParams) (_ instance.Instance, _ *instance.HardwareCharacteristics, _ []environs.NetworkInfo, err error) {
+func (env *azureEnviron) StartInstance(args environs.StartInstanceParams) (_ instance.Instance, _ *instance.HardwareCharacteristics, _ []network.Info, err error) {
 	if args.MachineConfig.HasNetworks() {
 		return nil, nil, nil, fmt.Errorf("starting instances with networks is not supported yet.")
 	}

=== modified file 'provider/common/bootstrap_test.go'
--- provider/common/bootstrap_test.go	2014-04-11 10:12:20 +0000
+++ provider/common/bootstrap_test.go	2014-04-18 16:46:53 +0000
@@ -17,6 +17,7 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/storage"
 	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/instance"
@@ -80,7 +81,7 @@
 	startInstance := func(
 		cons constraints.Value, _, _ []string, possibleTools tools.List, mcfg *cloudinit.MachineConfig,
 	) (
-		instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error,
+		instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 	) {
 		c.Assert(cons, gc.DeepEquals, checkCons)
 		c.Assert(mcfg, gc.DeepEquals, environs.NewBootstrapMachineConfig(mcfg.SystemPrivateSSHKey))
@@ -105,7 +106,7 @@
 	startInstance := func(
 		_ constraints.Value, _, _ []string, _ tools.List, _ *cloudinit.MachineConfig,
 	) (
-		instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error,
+		instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 	) {
 		stor.putErr = fmt.Errorf("suddenly a wild blah")
 		return &mockInstance{id: "i-blah"}, nil, nil, nil
@@ -138,7 +139,7 @@
 	startInstance := func(
 		_ constraints.Value, _, _ []string, _ tools.List, _ *cloudinit.MachineConfig,
 	) (
-		instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error,
+		instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 	) {
 		stor.putErr = fmt.Errorf("suddenly a wild blah")
 		return &mockInstance{id: "i-blah"}, nil, nil, nil
@@ -179,7 +180,7 @@
 	startInstance := func(
 		_ constraints.Value, _, _ []string, _ tools.List, mcfg *cloudinit.MachineConfig,
 	) (
-		instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error,
+		instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 	) {
 		return &mockInstance{id: checkInstanceId}, &checkHardware, nil, nil
 	}

=== modified file 'provider/common/mock_test.go'
--- provider/common/mock_test.go	2014-04-04 15:55:19 +0000
+++ provider/common/mock_test.go	2014-04-18 16:46:53 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	"launchpad.net/juju-core/instance"
@@ -17,7 +18,7 @@
 )
 
 type allInstancesFunc func() ([]instance.Instance, error)
-type startInstanceFunc func(constraints.Value, []string, []string, tools.List, *cloudinit.MachineConfig) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error)
+type startInstanceFunc func(constraints.Value, []string, []string, tools.List, *cloudinit.MachineConfig) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error)
 type stopInstancesFunc func([]instance.Instance) error
 type getToolsSourcesFunc func() ([]simplestreams.DataSource, error)
 type configFunc func() *config.Config
@@ -49,7 +50,7 @@
 func (env *mockEnviron) AllInstances() ([]instance.Instance, error) {
 	return env.allInstances()
 }
-func (env *mockEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (env *mockEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 	return env.startInstance(
 		args.Constraints,
 		args.MachineConfig.IncludeNetworks,

=== modified file 'provider/dummy/environs.go'
--- provider/dummy/environs.go	2014-04-14 16:41:28 +0000
+++ provider/dummy/environs.go	2014-04-18 16:46:53 +0000
@@ -40,6 +40,7 @@
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/imagemetadata"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	"launchpad.net/juju-core/environs/tools"
@@ -115,7 +116,7 @@
 	Constraints     constraints.Value
 	IncludeNetworks []string
 	ExcludeNetworks []string
-	NetworkInfo     []environs.NetworkInfo
+	NetworkInfo     []network.Info
 	Info            *state.Info
 	APIInfo         *api.Info
 	Secret          string
@@ -693,7 +694,7 @@
 }
 
 // StartInstance is specified in the InstanceBroker interface.
-func (e *environ) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (e *environ) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 
 	defer delay()
 	machineId := args.MachineConfig.MachineId
@@ -766,23 +767,24 @@
 		}
 	}
 	// Simulate networks added when requested.
-	networkInfo := make([]environs.NetworkInfo, len(args.MachineConfig.IncludeNetworks))
-	for i, network := range args.MachineConfig.IncludeNetworks {
-		if strings.HasPrefix(network, "bad-") {
+	networkInfo := make([]network.Info, len(args.MachineConfig.IncludeNetworks))
+	for i, netName := range args.MachineConfig.IncludeNetworks {
+		if strings.HasPrefix(netName, "bad-") {
 			// Simulate we didn't get correct information for the network.
-			networkInfo[i] = environs.NetworkInfo{
-				NetworkId:   network,
-				NetworkName: network,
+			networkInfo[i] = network.Info{
+				ProviderId:  network.Id(netName),
+				NetworkName: netName,
 				CIDR:        "invalid",
 			}
 		} else {
-			networkInfo[i] = environs.NetworkInfo{
-				NetworkId:     network,
-				NetworkName:   network,
+			networkInfo[i] = network.Info{
+				ProviderId:    network.Id(netName),
+				NetworkName:   netName,
 				CIDR:          fmt.Sprintf("0.%d.2.0/24", i+1),
 				InterfaceName: fmt.Sprintf("eth%d", i),
 				VLANTag:       i,
 				MACAddress:    fmt.Sprintf("aa:bb:cc:dd:ee:f%d", i),
+				IsVirtual:     i > 0,
 			}
 		}
 	}

=== modified file 'provider/ec2/ec2.go'
--- provider/ec2/ec2.go	2014-04-09 16:36:12 +0000
+++ provider/ec2/ec2.go	2014-04-18 16:46:53 +0000
@@ -18,6 +18,7 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
@@ -393,7 +394,7 @@
 const ebsStorage = "ebs"
 
 // StartInstance is specified in the InstanceBroker interface.
-func (e *environ) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (e *environ) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 	if args.MachineConfig.HasNetworks() {
 		return nil, nil, nil, fmt.Errorf("starting instances with networks is not supported yet.")
 	}

=== modified file 'provider/joyent/environ_instance.go'
--- provider/joyent/environ_instance.go	2014-04-04 15:55:19 +0000
+++ provider/joyent/environ_instance.go	2014-04-18 16:46:53 +0000
@@ -15,6 +15,7 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
@@ -50,7 +51,7 @@
 	return fmt.Sprintf("juju-%s-%s", env.Name(), names.MachineTag(machineId))
 }
 
-func (env *joyentEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (env *joyentEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 
 	if args.MachineConfig.HasNetworks() {
 		return nil, nil, nil, fmt.Errorf("starting instances with networks is not supported yet.")

=== modified file 'provider/local/environ.go'
--- provider/local/environ.go	2014-04-14 16:41:28 +0000
+++ provider/local/environ.go	2014-04-18 16:46:53 +0000
@@ -30,6 +30,7 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/httpstorage"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
@@ -301,7 +302,7 @@
 }
 
 // StartInstance is specified in the InstanceBroker interface.
-func (env *localEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (env *localEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 	if args.MachineConfig.HasNetworks() {
 		return nil, nil, nil, fmt.Errorf("starting instances with networks is not supported yet.")
 	}

=== modified file 'provider/maas/environ.go'
--- provider/maas/environ.go	2014-04-11 15:20:32 +0000
+++ provider/maas/environ.go	2014-04-18 16:46:53 +0000
@@ -22,6 +22,7 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/imagemetadata"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
@@ -331,56 +332,54 @@
 	return `sed -i "s/iface eth0 inet dhcp/source \/etc\/network\/eth0.config/" /etc/network/interfaces`
 }
 
-// setupNetworks prepares a []environs.NetworkInfo for the given instance.
-func (environ *maasEnviron) setupNetworks(inst instance.Instance) ([]environs.NetworkInfo, error) {
+// setupNetworks prepares a []network.Info for the given instance.
+func (environ *maasEnviron) setupNetworks(inst instance.Instance) ([]network.Info, error) {
 	// Get the instance network interfaces first.
 	interfaces, err := environ.getInstanceNetworkInterfaces(inst)
 	if err != nil {
 		return nil, fmt.Errorf("getInstanceNetworkInterfaces failed: %v", err)
 	}
 	logger.Debugf("node %q has network interfaces %v", inst.Id(), interfaces)
-	networkInfoMap := make(map[string]environs.NetworkInfo)
-	for macAddress, interfaceName := range interfaces {
-		networkInfoMap[macAddress] = environs.NetworkInfo{
-			MACAddress:    macAddress,
-			InterfaceName: interfaceName,
-		}
-	}
 	networks, err := environ.getInstanceNetworks(inst)
 	if err != nil {
 		return nil, fmt.Errorf("getInstanceNetworks failed: %v", err)
 	}
 	logger.Debugf("node %q has networks %v", inst.Id(), networks)
-	for _, network := range networks {
+	var tempNetworkInfo []network.Info
+	for _, netw := range networks {
 		netCIDR := &net.IPNet{
-			IP:   net.ParseIP(network.IP),
-			Mask: net.IPMask(net.ParseIP(network.Mask)),
+			IP:   net.ParseIP(netw.IP),
+			Mask: net.IPMask(net.ParseIP(netw.Mask)),
 		}
-		macs, err := environ.getNetworkMACs(network.Name)
+		macs, err := environ.getNetworkMACs(netw.Name)
 		if err != nil {
 			return nil, fmt.Errorf("getNetworkMACs failed: %v", err)
 		}
+		logger.Debugf("network %q has MACs: %v", netw.Name, macs)
 		for _, mac := range macs {
-			if _, ok := interfaces[mac]; ok {
-				info := networkInfoMap[mac]
-				info.CIDR = netCIDR.String()
-				info.VLANTag = network.VLANTag
-				info.NetworkId = network.Name
-				info.NetworkName = network.Name
-				networkInfoMap[mac] = info
+			if interfaceName, ok := interfaces[mac]; ok {
+				tempNetworkInfo = append(tempNetworkInfo, network.Info{
+					MACAddress:    mac,
+					InterfaceName: interfaceName,
+					CIDR:          netCIDR.String(),
+					VLANTag:       netw.VLANTag,
+					ProviderId:    network.Id(netw.Name),
+					NetworkName:   netw.Name,
+					IsVirtual:     netw.VLANTag > 0,
+				})
 			}
 		}
 	}
 	// Verify we filled-in everything for all networks/interfaces
 	// and drop incomplete records.
-	var networkInfo []environs.NetworkInfo
-	for _, info := range networkInfoMap {
-		if info.NetworkId == "" || info.NetworkName == "" || info.CIDR == "" {
+	var networkInfo []network.Info
+	for _, info := range tempNetworkInfo {
+		if info.ProviderId == "" || info.NetworkName == "" || info.CIDR == "" {
 			logger.Warningf("ignoring network interface %q: missing network information", info.InterfaceName)
 			continue
 		}
 		if info.MACAddress == "" || info.InterfaceName == "" {
-			logger.Warningf("ignoring network %q: missing network interface information", info.NetworkId)
+			logger.Warningf("ignoring network %q: missing network interface information", info.ProviderId)
 			continue
 		}
 		networkInfo = append(networkInfo, info)
@@ -391,7 +390,7 @@
 
 // StartInstance is specified in the InstanceBroker interface.
 func (environ *maasEnviron) StartInstance(args environs.StartInstanceParams) (
-	instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error,
+	instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 ) {
 	var inst *maasInstance
 	var err error
@@ -413,7 +412,7 @@
 			}
 		}
 	}()
-	var networkInfo []environs.NetworkInfo
+	var networkInfo []network.Info
 	if args.MachineConfig.HasNetworks() {
 		networkInfo, err = environ.setupNetworks(inst)
 		if err != nil {
@@ -454,7 +453,7 @@
 
 // newCloudinitConfig creates a cloudinit.Config structure
 // suitable as a base for initialising a MAAS node.
-func newCloudinitConfig(hostname string, networkInfo []environs.NetworkInfo) (*cloudinit.Config, error) {
+func newCloudinitConfig(hostname string, networkInfo []network.Info) (*cloudinit.Config, error) {
 	info := machineInfo{hostname}
 	runCmd, err := info.cloudinitRunCmd()
 	if err != nil {
@@ -477,11 +476,7 @@
 
 // setupNetworksOnBoot prepares a script to enable and start all given
 // networks on boot.
-//
-// TODO(dimitern) To support more than one VLAN on the same physical
-// interface, we need model changes to allow muliple NICs with the
-// same MAC address, but different network name.
-func setupNetworksOnBoot(cloudcfg *cloudinit.Config, networkInfo []environs.NetworkInfo) {
+func setupNetworksOnBoot(cloudcfg *cloudinit.Config, networkInfo []network.Info) {
 	const ifaceConfig = `cat >> /etc/network/interfaces << EOF
 
 auto %s
@@ -494,6 +489,10 @@
 	script := func(line string, args ...interface{}) {
 		cloudcfg.AddScripts(fmt.Sprintf(line, args...))
 	}
+	// Because eth0 is already configured in the br0 bridge, we
+	// don't want to break that.
+	configured := set.NewStrings("eth0")
+
 	// In order to support VLANs, we need to include 8021q module
 	// configure vconfig's set_name_type
 	script("modprobe 8021q")
@@ -501,14 +500,12 @@
 	script("vconfig set_name_type DEV_PLUS_VID_NO_PAD")
 	// Now prepare each interface configuration
 	for _, info := range networkInfo {
-		// Because eth0 is already configured in the br0 bridge, we
-		// don't want to break that.
-		if info.InterfaceName == "eth0" {
-			continue
+		if !configured.Contains(info.InterfaceName) {
+			// Register and bring up the physical interface.
+			script(ifaceConfig, info.InterfaceName, info.InterfaceName)
+			script("ifup %s", info.InterfaceName)
+			configured.Add(info.InterfaceName)
 		}
-		// Register and bring up the interface.
-		script(ifaceConfig, info.InterfaceName, info.InterfaceName)
-		script("ifup %s", info.InterfaceName)
 		if info.VLANTag > 0 {
 			// We have a VLAN and need to create and register it after
 			// its parent interface was brought up.

=== modified file 'provider/maas/environ_test.go'
--- provider/maas/environ_test.go	2014-04-10 17:46:52 +0000
+++ provider/maas/environ_test.go	2014-04-18 16:46:53 +0000
@@ -10,8 +10,8 @@
 	gc "launchpad.net/gocheck"
 	"launchpad.net/gomaasapi"
 
-	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/environs/network"
 	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/provider/maas"
 	coretesting "launchpad.net/juju-core/testing"
@@ -197,10 +197,17 @@
 }
 
 func (*environSuite) TestNewCloudinitConfig(c *gc.C) {
-	nwInfo := []environs.NetworkInfo{
+	nwInfo := []network.Info{
+		// physical eth0 won't be touched, but it can have VLANs on it.
 		{InterfaceName: "eth0", VLANTag: 0},
+		{InterfaceName: "eth0", VLANTag: 99},
+		// physical NIC given explicitly, then a couple of virtual ones using it.
+		{InterfaceName: "eth1", VLANTag: 0},
 		{InterfaceName: "eth1", VLANTag: 42},
+		{InterfaceName: "eth1", VLANTag: 69},
 		{InterfaceName: "eth2", VLANTag: 0},
+		// physical NIC not given, ensure it gets brought up first, before the virtual one.
+		{InterfaceName: "eth3", VLANTag: 123},
 	}
 	cloudcfg, err := maas.NewCloudinitConfig("testing.invalid", nwInfo)
 	c.Assert(err, gc.IsNil)
@@ -216,12 +223,23 @@
 		"modprobe 8021q",
 		"sh -c 'grep -q 8021q /etc/modules || echo 8021q >> /etc/modules'",
 		"vconfig set_name_type DEV_PLUS_VID_NO_PAD",
+		"vconfig add eth0 99",
+		"cat >> /etc/network/interfaces << EOF\n\nauto eth0.99\niface eth0.99 inet dhcp\nEOF\n",
+		"ifup eth0.99",
 		"cat >> /etc/network/interfaces << EOF\n\nauto eth1\niface eth1 inet dhcp\nEOF\n",
 		"ifup eth1",
 		"vconfig add eth1 42",
 		"cat >> /etc/network/interfaces << EOF\n\nauto eth1.42\niface eth1.42 inet dhcp\nEOF\n",
 		"ifup eth1.42",
+		"vconfig add eth1 69",
+		"cat >> /etc/network/interfaces << EOF\n\nauto eth1.69\niface eth1.69 inet dhcp\nEOF\n",
+		"ifup eth1.69",
 		"cat >> /etc/network/interfaces << EOF\n\nauto eth2\niface eth2 inet dhcp\nEOF\n",
 		"ifup eth2",
+		"cat >> /etc/network/interfaces << EOF\n\nauto eth3\niface eth3 inet dhcp\nEOF\n",
+		"ifup eth3",
+		"vconfig add eth3 123",
+		"cat >> /etc/network/interfaces << EOF\n\nauto eth3.123\niface eth3.123 inet dhcp\nEOF\n",
+		"ifup eth3.123",
 	})
 }

=== modified file 'provider/manual/environ.go'
--- provider/manual/environ.go	2014-04-11 17:51:58 +0000
+++ provider/manual/environ.go	2014-04-18 16:46:53 +0000
@@ -21,6 +21,7 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/httpstorage"
 	"launchpad.net/juju-core/environs/manual"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/sshstorage"
 	"launchpad.net/juju-core/environs/storage"
@@ -65,7 +66,7 @@
 var errNoStartInstance = errors.New("manual provider cannot start instances")
 var errNoStopInstance = errors.New("manual provider cannot stop instances")
 
-func (*manualEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (*manualEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 	return nil, nil, nil, errNoStartInstance
 }
 

=== modified file 'provider/openstack/provider.go'
--- provider/openstack/provider.go	2014-04-12 05:53:58 +0000
+++ provider/openstack/provider.go	2014-04-18 16:46:53 +0000
@@ -27,6 +27,7 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
@@ -745,7 +746,7 @@
 }
 
 // StartInstance is specified in the InstanceBroker interface.
-func (e *environ) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (e *environ) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 
 	if args.MachineConfig.HasNetworks() {
 		return nil, nil, nil, fmt.Errorf("starting instances with networks is not supported yet.")

=== modified file 'state/api/params/internal.go'
--- state/api/params/internal.go	2014-04-11 15:16:00 +0000
+++ state/api/params/internal.go	2014-04-18 16:46:53 +0000
@@ -7,6 +7,7 @@
 	"time"
 
 	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils/exec"
@@ -317,7 +318,7 @@
 	Tag string
 
 	// ProviderId is the provider-specific network id.
-	ProviderId string
+	ProviderId network.Id
 
 	// CIDR of the network, in "123.45.67.89/12" format.
 	CIDR string
@@ -340,6 +341,10 @@
 
 	// NetworkTag is this interface's network tag.
 	NetworkTag string
+
+	// IsVirtual is true when the interface is a virtual device, as
+	// opposed to a physical device.
+	IsVirtual bool
 }
 
 // InstanceInfo holds a machine tag, provider-specific instance id, a

=== modified file 'state/api/provisioner/provisioner_test.go'
--- state/api/provisioner/provisioner_test.go	2014-04-14 12:36:13 +0000
+++ state/api/provisioner/provisioner_test.go	2014-04-18 16:46:53 +0000
@@ -230,6 +230,11 @@
 		CIDR:       "0.2.2.0/24",
 		VLANTag:    42,
 	}, {
+		Tag:        "network-vlan69",
+		ProviderId: "vlan69",
+		CIDR:       "0.3.2.0/24",
+		VLANTag:    69,
+	}, {
 		Tag:        "network-vlan42", // duplicated; ignored
 		ProviderId: "vlan42",
 		CIDR:       "0.2.2.0/24",
@@ -239,18 +244,32 @@
 		MACAddress:    "aa:bb:cc:dd:ee:f0",
 		NetworkTag:    "network-net1",
 		InterfaceName: "eth0",
+		IsVirtual:     false,
 	}, {
 		MACAddress:    "aa:bb:cc:dd:ee:f1",
 		NetworkTag:    "network-net1",
 		InterfaceName: "eth1",
-	}, {
-		MACAddress:    "aa:bb:cc:dd:ee:f2",
-		NetworkTag:    "network-vlan42",
-		InterfaceName: "eth2",
-	}, {
-		MACAddress:    "aa:bb:cc:dd:ee:f2", // duplicated; ignored
-		NetworkTag:    "network-vlan42",
-		InterfaceName: "eth2",
+		IsVirtual:     false,
+	}, {
+		MACAddress:    "aa:bb:cc:dd:ee:f1",
+		NetworkTag:    "network-vlan42",
+		InterfaceName: "eth1.42",
+		IsVirtual:     true,
+	}, {
+		MACAddress:    "aa:bb:cc:dd:ee:f1",
+		NetworkTag:    "network-vlan69",
+		InterfaceName: "eth1.69",
+		IsVirtual:     true,
+	}, {
+		MACAddress:    "aa:bb:cc:dd:ee:f1", // duplicated mac+net; ignored
+		NetworkTag:    "network-vlan42",
+		InterfaceName: "eth2",
+		IsVirtual:     true,
+	}, {
+		MACAddress:    "aa:bb:cc:dd:ee:f4",
+		NetworkTag:    "network-net1",
+		InterfaceName: "eth1", // duplicated name+machine id; ignored
+		IsVirtual:     false,
 	}}
 
 	err = apiMachine.SetInstanceInfo("i-will", "fake_nonce", &hwChars, networks, ifaces)
@@ -273,7 +292,7 @@
 
 	// Check the networks are created.
 	for i, _ := range networks {
-		if i == 2 {
+		if i == 3 {
 			// Last one was ignored, so skip it.
 			break
 		}
@@ -291,16 +310,17 @@
 	// And the network interfaces as well.
 	ifacesMachine, err = notProvisionedMachine.NetworkInterfaces()
 	c.Assert(err, gc.IsNil)
-	c.Assert(ifacesMachine, gc.HasLen, 3)
+	c.Assert(ifacesMachine, gc.HasLen, 4)
 	actual := make([]params.NetworkInterface, len(ifacesMachine))
 	for i, iface := range ifacesMachine {
 		actual[i].InterfaceName = iface.InterfaceName()
 		actual[i].NetworkTag = iface.NetworkTag()
 		actual[i].MACAddress = iface.MACAddress()
+		actual[i].IsVirtual = iface.IsVirtual()
 		c.Check(iface.MachineTag(), gc.Equals, notProvisionedMachine.Tag())
 		c.Check(iface.MachineId(), gc.Equals, notProvisionedMachine.Id())
 	}
-	c.Assert(actual, jc.SameContents, ifaces[:3]) // skip [3] as it's ignored.
+	c.Assert(actual, jc.SameContents, ifaces[:4]) // skip the rest as they are ignored.
 }
 
 func (s *provisionerSuite) TestSeries(c *gc.C) {

=== modified file 'state/apiserver/provisioner/provisioner.go'
--- state/apiserver/provisioner/provisioner.go	2014-04-11 15:10:48 +0000
+++ state/apiserver/provisioner/provisioner.go	2014-04-18 16:46:53 +0000
@@ -435,6 +435,7 @@
 			MACAddress:    iface.MACAddress,
 			NetworkName:   networkName,
 			InterfaceName: iface.InterfaceName,
+			IsVirtual:     iface.IsVirtual,
 		}
 	}
 	return stateNetworks, stateInterfaces, nil

=== modified file 'state/apiserver/provisioner/provisioner_test.go'
--- state/apiserver/provisioner/provisioner_test.go	2014-04-17 12:53:23 +0000
+++ state/apiserver/provisioner/provisioner_test.go	2014-04-18 16:46:53 +0000
@@ -862,6 +862,11 @@
 		CIDR:       "0.2.2.0/24",
 		VLANTag:    42,
 	}, {
+		Tag:        "network-vlan69",
+		ProviderId: "vlan69",
+		CIDR:       "0.3.2.0/24",
+		VLANTag:    69,
+	}, {
 		Tag:        "network-vlan42", // duplicated; ignored
 		ProviderId: "vlan42",
 		CIDR:       "0.2.2.0/24",
@@ -871,18 +876,32 @@
 		MACAddress:    "aa:bb:cc:dd:ee:f0",
 		NetworkTag:    "network-net1",
 		InterfaceName: "eth0",
+		IsVirtual:     false,
 	}, {
 		MACAddress:    "aa:bb:cc:dd:ee:f1",
 		NetworkTag:    "network-net1",
 		InterfaceName: "eth1",
+		IsVirtual:     false,
+	}, {
+		MACAddress:    "aa:bb:cc:dd:ee:f1",
+		NetworkTag:    "network-vlan42",
+		InterfaceName: "eth1.42",
+		IsVirtual:     true,
+	}, {
+		MACAddress:    "aa:bb:cc:dd:ee:f0",
+		NetworkTag:    "network-vlan69",
+		InterfaceName: "eth0.69",
+		IsVirtual:     true,
+	}, {
+		MACAddress:    "aa:bb:cc:dd:ee:f1", // duplicated mac+net; ignored
+		NetworkTag:    "network-vlan42",
+		InterfaceName: "eth2",
+		IsVirtual:     true,
 	}, {
 		MACAddress:    "aa:bb:cc:dd:ee:f2",
-		NetworkTag:    "network-vlan42",
-		InterfaceName: "eth2",
-	}, {
-		MACAddress:    "aa:bb:cc:dd:ee:f2", // duplicated; ignored
-		NetworkTag:    "network-vlan42",
-		InterfaceName: "eth2",
+		NetworkTag:    "network-net1",
+		InterfaceName: "eth1", // duplicated name+machine id; ignored for machine 1.
+		IsVirtual:     false,
 	}}
 	args := params.InstancesInfo{Machines: []params.InstanceInfo{{
 		Tag:        s.machines[0].Tag(),
@@ -939,21 +958,26 @@
 	c.Check(gotHardware, gc.DeepEquals, &hwChars)
 	ifacesMachine1, err := s.machines[1].NetworkInterfaces()
 	c.Assert(err, gc.IsNil)
-	c.Assert(ifacesMachine1, gc.HasLen, 3)
+	c.Assert(ifacesMachine1, gc.HasLen, 4)
 	actual := make([]params.NetworkInterface, len(ifacesMachine1))
 	for i, iface := range ifacesMachine1 {
 		actual[i].InterfaceName = iface.InterfaceName()
 		actual[i].NetworkTag = iface.NetworkTag()
 		actual[i].MACAddress = iface.MACAddress()
+		actual[i].IsVirtual = iface.IsVirtual()
 		c.Check(iface.MachineId(), gc.Equals, s.machines[1].Id())
 		c.Check(iface.MachineTag(), gc.Equals, s.machines[1].Tag())
 	}
-	c.Assert(actual, jc.SameContents, ifaces[:3])
+	c.Assert(actual, jc.SameContents, ifaces[:4])
 	ifacesMachine2, err := s.machines[2].NetworkInterfaces()
 	c.Assert(err, gc.IsNil)
-	c.Assert(ifacesMachine2, gc.HasLen, 0)
+	c.Assert(ifacesMachine2, gc.HasLen, 1)
+	c.Assert(ifacesMachine2[0].InterfaceName(), gc.Equals, ifaces[5].InterfaceName)
+	c.Assert(ifacesMachine2[0].MACAddress(), gc.Equals, ifaces[5].MACAddress)
+	c.Assert(ifacesMachine2[0].NetworkTag(), gc.Equals, ifaces[5].NetworkTag)
+	c.Assert(ifacesMachine2[0].MachineId(), gc.Equals, s.machines[2].Id())
 	for i, _ := range networks {
-		if i == 2 {
+		if i == 3 {
 			// Last one was ignored, so don't check.
 			break
 		}

=== modified file 'state/machine.go'
--- state/machine.go	2014-04-17 16:18:46 +0000
+++ state/machine.go	2014-04-18 16:46:53 +0000
@@ -567,16 +567,21 @@
 }
 
 func (m *Machine) removeNetworkInterfacesOps() ([]txn.Op, error) {
-	var doc struct {
-		MACAddress string `bson:"_id"`
+	if m.doc.Life != Dead {
+		return nil, fmt.Errorf("machine is not dead")
 	}
-	ops := []txn.Op{}
+	var doc networkInterfaceDoc
+	ops := []txn.Op{{
+		C:      m.st.machines.Name,
+		Id:     m.doc.Id,
+		Assert: isDeadDoc,
+	}}
 	sel := bson.D{{"machineid", m.doc.Id}}
 	iter := m.st.networkInterfaces.Find(sel).Select(bson.D{{"_id", 1}}).Iter()
 	for iter.Next(&doc) {
 		ops = append(ops, txn.Op{
 			C:      m.st.networkInterfaces.Name,
-			Id:     doc.MACAddress,
+			Id:     doc.Id,
 			Remove: true,
 		})
 	}
@@ -842,7 +847,7 @@
 
 	// Add the networks and interfaces first.
 	for _, network := range networks {
-		_, err := m.st.AddNetwork(network.Name, network.ProviderId, network.CIDR, network.VLANTag)
+		_, err := m.st.AddNetwork(network)
 		if err != nil && errors.IsAlreadyExists(err) {
 			// Ignore already existing networks.
 			continue
@@ -851,7 +856,7 @@
 		}
 	}
 	for _, iface := range interfaces {
-		_, err := m.AddNetworkInterface(iface.MACAddress, iface.InterfaceName, iface.NetworkName)
+		_, err := m.AddNetworkInterface(iface)
 		if err != nil && errors.IsAlreadyExists(err) {
 			// Ignore already existing network interfaces.
 			continue
@@ -996,34 +1001,31 @@
 	return ifaces, nil
 }
 
-// AddNetworkInterface creates a new network interface on the given
-// network for the machine. The machine must be alive and not yet
+// AddNetworkInterface creates a new network interface with the given
+// args for this machine. The machine must be alive and not yet
 // provisioned, and there must be no other interface with the same MAC
-// address or the same name on that machine for this to succeed. If a
-// network interface already exists, the returned error satisfies
-// errors.IsAlreadyExists.
-func (m *Machine) AddNetworkInterface(macAddress, interfaceName, networkName string) (iface *NetworkInterface, err error) {
-	defer errors.Contextf(&err, "cannot add network interface %q to machine %q", interfaceName, m.doc.Id)
+// address on the same network, or the same name on that machine for
+// this to succeed. If a network interface already exists, the
+// returned error satisfies errors.IsAlreadyExists.
+func (m *Machine) AddNetworkInterface(args NetworkInterfaceInfo) (iface *NetworkInterface, err error) {
+	defer errors.Contextf(&err, "cannot add network interface %q to machine %q", args.InterfaceName, m.doc.Id)
 
-	if macAddress == "" {
+	if args.MACAddress == "" {
 		return nil, fmt.Errorf("MAC address must be not empty")
 	}
-	if _, err = net.ParseMAC(macAddress); err != nil {
+	if _, err = net.ParseMAC(args.MACAddress); err != nil {
 		return nil, err
 	}
-	if interfaceName == "" {
+	if args.InterfaceName == "" {
 		return nil, fmt.Errorf("interface name must be not empty")
 	}
 	aliveAndNotProvisioned := append(isAliveDoc, bson.D{{"nonce", ""}}...)
-	doc := &networkInterfaceDoc{
-		MACAddress:    macAddress,
-		InterfaceName: interfaceName,
-		NetworkName:   networkName,
-		MachineId:     m.doc.Id,
-	}
+	doc := newNetworkInterfaceDoc(args)
+	doc.MachineId = m.doc.Id
+	doc.Id = bson.NewObjectId()
 	ops := []txn.Op{{
 		C:      m.st.networks.Name,
-		Id:     networkName,
+		Id:     args.NetworkName,
 		Assert: txn.DocExists,
 	}, {
 		C:      m.st.machines.Name,
@@ -1031,7 +1033,7 @@
 		Assert: aliveAndNotProvisioned,
 	}, {
 		C:      m.st.networkInterfaces.Name,
-		Id:     macAddress,
+		Id:     doc.Id,
 		Assert: txn.DocMissing,
 		Insert: doc,
 	}}
@@ -1039,10 +1041,7 @@
 	err = m.st.runTransaction(ops)
 	switch err {
 	case txn.ErrAborted:
-		if err = m.st.networkInterfaces.FindId(macAddress).One(nil); err == nil {
-			return nil, errors.AlreadyExistsf("interface with MAC address %q", macAddress)
-		}
-		if _, err = m.st.Network(networkName); err != nil {
+		if _, err = m.st.Network(args.NetworkName); err != nil {
 			return nil, err
 		}
 		if err = m.Refresh(); err != nil {
@@ -1053,17 +1052,30 @@
 			msg := "machine already provisioned: dynamic network interfaces not currently supported"
 			return nil, fmt.Errorf(msg)
 		}
+		// Should never happen.
+		logger.Errorf("unhandled assert while adding network interface doc %#v", doc)
 	case nil:
-		// We have a unique key restriction on the InterfaceName
-		// field, which will cause the insert to fail if there is
-		// another record with the same interface name in the table.
+		// We have a unique key restrictions on the following fields:
+		// - InterfaceName, MachineId
+		// - MACAddress, NetworkName
+		// These will cause the insert to fail if there is another record
+		// with the same combination of values in the table.
 		// The txn logic does not report insertion errors, so we check
 		// that the record has actually been inserted correctly before
 		// reporting success.
-		if err = m.st.networkInterfaces.FindId(macAddress).One(nil); err != nil {
-			return nil, errors.AlreadyExistsf("%q on machine %q", interfaceName, m.doc.Id)
-		}
-		return newNetworkInterface(m.st, doc), nil
+		if err = m.st.networkInterfaces.FindId(doc.Id).One(&doc); err == nil {
+			return newNetworkInterface(m.st, doc), nil
+		}
+		sel := bson.D{{"interfacename", args.InterfaceName}, {"machineid", m.doc.Id}}
+		if err = m.st.networkInterfaces.Find(sel).One(nil); err == nil {
+			return nil, errors.AlreadyExistsf("%q on machine %q", args.InterfaceName, m.doc.Id)
+		}
+		sel = bson.D{{"macaddress", args.MACAddress}, {"networkname", args.NetworkName}}
+		if err = m.st.networkInterfaces.Find(sel).One(nil); err == nil {
+			return nil, errors.AlreadyExistsf("MAC address %q on network %q", args.MACAddress, args.NetworkName)
+		}
+		// Should never happen.
+		logger.Errorf("unknown error while adding network interface doc %#v", doc)
 	}
 	return nil, err
 }

=== modified file 'state/machine_test.go'
--- state/machine_test.go	2014-04-14 12:36:13 +0000
+++ state/machine_test.go	2014-04-18 16:46:53 +0000
@@ -12,6 +12,7 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
@@ -389,12 +390,22 @@
 }
 
 func addNetworkAndInterface(c *gc.C, st *state.State, machine *state.Machine,
-	networkName, providerId, cidr string, vlanTag int,
+	networkName, providerId, cidr string, vlanTag int, isVirtual bool,
 	mac, ifaceName string,
 ) (*state.Network, *state.NetworkInterface) {
-	net, err := st.AddNetwork(networkName, providerId, cidr, vlanTag)
+	net, err := st.AddNetwork(state.NetworkInfo{
+		Name:       networkName,
+		ProviderId: network.Id(providerId),
+		CIDR:       cidr,
+		VLANTag:    vlanTag,
+	})
 	c.Assert(err, gc.IsNil)
-	iface, err := machine.AddNetworkInterface(mac, ifaceName, networkName)
+	iface, err := machine.AddNetworkInterface(state.NetworkInterfaceInfo{
+		MACAddress:    mac,
+		InterfaceName: ifaceName,
+		NetworkName:   networkName,
+		IsVirtual:     isVirtual,
+	})
 	c.Assert(err, gc.IsNil)
 	return net, iface
 }
@@ -419,11 +430,11 @@
 
 	net1, _ := addNetworkAndInterface(
 		c, s.State, machine,
-		"net1", "net1", "0.1.2.0/24", 0,
+		"net1", "net1", "0.1.2.0/24", 0, false,
 		"aa:bb:cc:dd:ee:f0", "eth0")
 	net2, _ := addNetworkAndInterface(
 		c, s.State, machine,
-		"net2", "net2", "0.2.2.0/24", 0,
+		"net2", "net2", "0.2.2.0/24", 0, false,
 		"aa:bb:cc:dd:ee:f1", "eth1")
 
 	nets, err = machine.Networks()
@@ -448,15 +459,15 @@
 	// And a few networks and NICs.
 	_, iface0 := addNetworkAndInterface(
 		c, s.State, machine,
-		"net1", "net1", "0.1.2.0/24", 0,
+		"net1", "net1", "0.1.2.0/24", 0, false,
 		"aa:bb:cc:dd:ee:f0", "eth0")
 	_, iface1 := addNetworkAndInterface(
 		c, s.State, machine,
-		"vlan42", "vlan42", "0.1.2.0/30", 42,
+		"vlan42", "vlan42", "0.1.2.0/30", 42, true,
 		"aa:bb:cc:dd:ee:f1", "eth0.42")
 	_, iface2 := addNetworkAndInterface(
 		c, s.State, machine,
-		"net2", "net2", "0.2.2.0/24", 0,
+		"net2", "net2", "0.2.2.0/24", 0, false,
 		"aa:bb:cc:dd:ee:f2", "eth1")
 
 	ifaces, err = machine.NetworkInterfaces()
@@ -476,49 +487,47 @@
 }
 
 var addNetworkInterfaceErrorsTests = []struct {
-	macAddress    string
-	interfaceName string
-	networkName   string
-	beforeAdding  func(*gc.C, *state.Machine)
-	expectErr     string
+	args         state.NetworkInterfaceInfo
+	beforeAdding func(*gc.C, *state.Machine)
+	expectErr    string
 }{{
-	"", "eth1", "net1",
+	state.NetworkInterfaceInfo{"", "eth1", "net1", false},
 	nil,
 	`cannot add network interface "eth1" to machine "2": MAC address must be not empty`,
 }, {
-	"invalid", "eth1", "net1",
+	state.NetworkInterfaceInfo{"invalid", "eth1", "net1", false},
 	nil,
 	`cannot add network interface "eth1" to machine "2": invalid MAC address: invalid`,
 }, {
-	"aa:bb:cc:dd:ee:f0", "eth1", "net1",
+	state.NetworkInterfaceInfo{"aa:bb:cc:dd:ee:f0", "eth1", "net1", false},
 	nil,
-	`cannot add network interface "eth1" to machine "2": interface with MAC address "aa:bb:cc:dd:ee:f0" already exists`,
+	`cannot add network interface "eth1" to machine "2": MAC address "aa:bb:cc:dd:ee:f0" on network "net1" already exists`,
 }, {
-	"aa:bb:cc:dd:ee:ff", "", "net1",
+	state.NetworkInterfaceInfo{"aa:bb:cc:dd:ee:ff", "", "net1", false},
 	nil,
 	`cannot add network interface "" to machine "2": interface name must be not empty`,
 }, {
-	"aa:bb:cc:dd:ee:ff", "eth0", "net1",
+	state.NetworkInterfaceInfo{"aa:bb:cc:dd:ee:ff", "eth0", "net1", false},
 	nil,
 	`cannot add network interface "eth0" to machine "2": "eth0" on machine "2" already exists`,
 }, {
-	"aa:bb:cc:dd:ee:ff", "eth1", "missing",
+	state.NetworkInterfaceInfo{"aa:bb:cc:dd:ee:ff", "eth1", "missing", false},
 	nil,
 	`cannot add network interface "eth1" to machine "2": network "missing" not found`,
 }, {
-	"aa:bb:cc:dd:ee:f1", "eth1", "net1",
+	state.NetworkInterfaceInfo{"aa:bb:cc:dd:ee:f1", "eth1", "net1", false},
 	func(c *gc.C, m *state.Machine) {
 		c.Check(m.SetProvisioned("i-am", "fake_nonce", nil), gc.IsNil)
 	},
 	`cannot add network interface "eth1" to machine "2": machine already provisioned: dynamic network interfaces not currently supported`,
 }, {
-	"aa:bb:cc:dd:ee:f1", "eth1", "net1",
+	state.NetworkInterfaceInfo{"aa:bb:cc:dd:ee:f1", "eth1", "net1", false},
 	func(c *gc.C, m *state.Machine) {
 		c.Check(m.EnsureDead(), gc.IsNil)
 	},
 	`cannot add network interface "eth1" to machine "2": machine is not alive`,
 }, {
-	"aa:bb:cc:dd:ee:f1", "eth1", "net1",
+	state.NetworkInterfaceInfo{"aa:bb:cc:dd:ee:f1", "eth1", "net1", false},
 	func(c *gc.C, m *state.Machine) {
 		c.Check(m.Remove(), gc.IsNil)
 	},
@@ -534,18 +543,20 @@
 	c.Assert(err, gc.IsNil)
 	addNetworkAndInterface(
 		c, s.State, machine,
-		"net1", "provider-net1", "0.1.2.0/24", 0,
+		"net1", "provider-net1", "0.1.2.0/24", 0, false,
 		"aa:bb:cc:dd:ee:f0", "eth0")
+	ifaces, err := machine.NetworkInterfaces()
+	c.Assert(err, gc.IsNil)
+	c.Assert(ifaces, gc.HasLen, 1)
 
 	for i, test := range addNetworkInterfaceErrorsTests {
-		c.Logf("test %d: mac=%q, name=%q, network=%q",
-			i, test.macAddress, test.interfaceName, test.networkName)
+		c.Logf("test %d: %#v", i, test.args)
 
 		if test.beforeAdding != nil {
 			test.beforeAdding(c, machine)
 		}
 
-		_, err = machine.AddNetworkInterface(test.macAddress, test.interfaceName, test.networkName)
+		_, err = machine.AddNetworkInterface(test.args)
 		c.Check(err, gc.ErrorMatches, test.expectErr)
 		if strings.Contains(test.expectErr, "not found") {
 			c.Check(err, jc.Satisfies, errors.IsNotFound)
@@ -685,9 +696,11 @@
 
 func (s *MachineSuite) TestMachineSetInstanceInfoSuccess(c *gc.C) {
 	c.Assert(s.machine.CheckProvisioned("fake_nonce"), gc.Equals, false)
-	networks := []state.NetworkInfo{{Name: "net1", ProviderId: "net1", CIDR: "0.1.2.0/24", VLANTag: 0}}
+	networks := []state.NetworkInfo{
+		{Name: "net1", ProviderId: "net1", CIDR: "0.1.2.0/24", VLANTag: 0},
+	}
 	interfaces := []state.NetworkInterfaceInfo{
-		{MACAddress: "aa:bb:cc:dd:ee:ff", NetworkName: "net1", InterfaceName: "eth0"},
+		{MACAddress: "aa:bb:cc:dd:ee:ff", NetworkName: "net1", InterfaceName: "eth0", IsVirtual: false},
 	}
 	err := s.machine.SetInstanceInfo("umbrella/0", "fake_nonce", nil, networks, interfaces)
 	c.Assert(err, gc.IsNil)
@@ -705,6 +718,7 @@
 	c.Check(ifaces[0].NetworkName(), gc.Equals, interfaces[0].NetworkName)
 	c.Check(ifaces[0].MACAddress(), gc.Equals, interfaces[0].MACAddress)
 	c.Check(ifaces[0].MachineTag(), gc.Equals, s.machine.Tag())
+	c.Check(ifaces[0].IsVirtual(), gc.Equals, interfaces[0].IsVirtual)
 }
 
 func (s *MachineSuite) TestMachineSetProvisionedWhenNotAlive(c *gc.C) {

=== modified file 'state/networkinterfaces.go'
--- state/networkinterfaces.go	2014-04-11 15:10:48 +0000
+++ state/networkinterfaces.go	2014-04-18 16:46:53 +0000
@@ -4,6 +4,10 @@
 package state
 
 import (
+	"fmt"
+
+	"labix.org/v2/mgo/bson"
+
 	"launchpad.net/juju-core/names"
 )
 
@@ -27,25 +31,49 @@
 
 	// NetworkName is this interface's network name.
 	NetworkName string
+
+	// IsVirtual is true when the interface is a virtual device, as
+	// opposed to a physical device.
+	IsVirtual bool
 }
 
 // networkInterfaceDoc represents a network interface for a machine on
 // a given network.
-//
-// TODO(dimitern) To allow multiple virtual (e.g. VLAN) interfaces on
-// the same MAC address, we need to change the key and uniqueness
-// constraints.
 type networkInterfaceDoc struct {
-	MACAddress    string `bson:"_id"`
+	Id            bson.ObjectId `bson:"_id"`
+	MACAddress    string
 	InterfaceName string
 	NetworkName   string
 	MachineId     string
+	IsVirtual     bool
 }
 
 func newNetworkInterface(st *State, doc *networkInterfaceDoc) *NetworkInterface {
 	return &NetworkInterface{st, *doc}
 }
 
+func newNetworkInterfaceDoc(args NetworkInterfaceInfo) *networkInterfaceDoc {
+	// This does not set the machine id.
+	return &networkInterfaceDoc{
+		MACAddress:    args.MACAddress,
+		InterfaceName: args.InterfaceName,
+		NetworkName:   args.NetworkName,
+		IsVirtual:     args.IsVirtual,
+	}
+}
+
+// GoString implements fmt.GoStringer.
+func (ni *NetworkInterface) GoString() string {
+	return fmt.Sprintf(
+		"&state.NetworkInterface{machineId: %q, mac: %q, name: %q, networkName: %q, isVirtual: %v}",
+		ni.MachineId(), ni.MACAddress(), ni.InterfaceName(), ni.NetworkName(), ni.IsVirtual())
+}
+
+// Id returns the internal juju-specific id of the interface.
+func (ni *NetworkInterface) Id() string {
+	return ni.doc.Id.String()
+}
+
 // MACAddress returns the MAC address of the interface.
 func (ni *NetworkInterface) MACAddress() string {
 	return ni.doc.MACAddress
@@ -56,7 +84,7 @@
 	return ni.doc.InterfaceName
 }
 
-// NetworkId returns the network name of the interface.
+// NetworkName returns the network name of the interface.
 func (ni *NetworkInterface) NetworkName() string {
 	return ni.doc.NetworkName
 }
@@ -75,3 +103,15 @@
 func (ni *NetworkInterface) MachineTag() string {
 	return names.MachineTag(ni.doc.MachineId)
 }
+
+// IsVirtual returns whether the interface represents a virtual
+// device.
+func (ni *NetworkInterface) IsVirtual() bool {
+	return ni.doc.IsVirtual
+}
+
+// IsPhysical returns whether the interface represents a physical
+// device.
+func (ni *NetworkInterface) IsPhysical() bool {
+	return !ni.doc.IsVirtual
+}

=== modified file 'state/networkinterfaces_test.go'
--- state/networkinterfaces_test.go	2014-04-10 14:40:34 +0000
+++ state/networkinterfaces_test.go	2014-04-18 16:46:53 +0000
@@ -4,6 +4,7 @@
 package state_test
 
 import (
+	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/state"
@@ -23,17 +24,25 @@
 	var err error
 	s.machine, err = s.State.AddMachine("quantal", state.JobHostUnits)
 	c.Assert(err, gc.IsNil)
-	s.network, err = s.State.AddNetwork("net1", "net1", "0.1.2.3/24", 42)
+	s.network, err = s.State.AddNetwork(state.NetworkInfo{"net1", "net1", "0.1.2.3/24", 42})
 	c.Assert(err, gc.IsNil)
-	s.iface, err = s.machine.AddNetworkInterface("aa:bb:cc:dd:ee:ff", "eth0", "net1")
+	s.iface, err = s.machine.AddNetworkInterface(state.NetworkInterfaceInfo{
+		MACAddress:    "aa:bb:cc:dd:ee:ff",
+		InterfaceName: "eth0",
+		NetworkName:   "net1",
+		IsVirtual:     true,
+	})
 	c.Assert(err, gc.IsNil)
 }
 
 func (s *NetworkInterfaceSuite) TestGetterMethods(c *gc.C) {
+	c.Assert(s.iface.Id(), gc.Not(gc.Equals), "")
 	c.Assert(s.iface.MACAddress(), gc.Equals, "aa:bb:cc:dd:ee:ff")
 	c.Assert(s.iface.InterfaceName(), gc.Equals, "eth0")
 	c.Assert(s.iface.NetworkName(), gc.Equals, s.network.Name())
 	c.Assert(s.iface.NetworkTag(), gc.Equals, s.network.Tag())
 	c.Assert(s.iface.MachineId(), gc.Equals, s.machine.Id())
 	c.Assert(s.iface.MachineTag(), gc.Equals, s.machine.Tag())
+	c.Assert(s.iface.IsVirtual(), jc.IsTrue)
+	c.Assert(s.iface.IsPhysical(), jc.IsFalse)
 }

=== modified file 'state/networks.go'
--- state/networks.go	2014-04-11 15:10:48 +0000
+++ state/networks.go	2014-04-18 16:46:53 +0000
@@ -4,8 +4,11 @@
 package state
 
 import (
+	"fmt"
+
 	"labix.org/v2/mgo/bson"
 
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/names"
 )
 
@@ -21,7 +24,7 @@
 	Name string
 
 	// ProviderId is a provider-specific network id.
-	ProviderId string
+	ProviderId network.Id
 
 	// CIDR of the network, in 123.45.67.89/24 format.
 	CIDR string
@@ -38,7 +41,7 @@
 	// included networks.
 	Name string `bson:"_id"`
 
-	ProviderId string
+	ProviderId network.Id
 	CIDR       string
 	VLANTag    int
 }
@@ -47,13 +50,29 @@
 	return &Network{st, *doc}
 }
 
+func newNetworkDoc(args NetworkInfo) *networkDoc {
+	return &networkDoc{
+		Name:       args.Name,
+		ProviderId: args.ProviderId,
+		CIDR:       args.CIDR,
+		VLANTag:    args.VLANTag,
+	}
+}
+
+// GoString implements fmt.GoStringer.
+func (n *Network) GoString() string {
+	return fmt.Sprintf(
+		"&state.Network{name: %q, providerId: %q, cidr: %q, vlanTag: %v}",
+		n.Name(), n.ProviderId(), n.CIDR(), n.VLANTag())
+}
+
 // Name returns the network name.
 func (n *Network) Name() string {
 	return n.doc.Name
 }
 
 // ProviderId returns the provider-specific id of the network.
-func (n *Network) ProviderId() string {
+func (n *Network) ProviderId() network.Id {
 	return n.doc.ProviderId
 }
 

=== modified file 'state/networks_test.go'
--- state/networks_test.go	2014-04-10 14:40:34 +0000
+++ state/networks_test.go	2014-04-18 16:46:53 +0000
@@ -24,15 +24,15 @@
 	var err error
 	s.machine, err = s.State.AddMachine("quantal", state.JobHostUnits)
 	c.Assert(err, gc.IsNil)
-	s.network, err = s.State.AddNetwork("net1", "net1", "0.1.2.3/24", 0)
+	s.network, err = s.State.AddNetwork(state.NetworkInfo{"net1", "net1", "0.1.2.3/24", 0})
 	c.Assert(err, gc.IsNil)
-	s.vlan, err = s.State.AddNetwork("vlan", "vlan", "0.1.2.3/30", 42)
+	s.vlan, err = s.State.AddNetwork(state.NetworkInfo{"vlan", "vlan", "0.1.2.3/30", 42})
 	c.Assert(err, gc.IsNil)
 }
 
 func (s *NetworkSuite) TestGetterMethods(c *gc.C) {
 	c.Assert(s.network.Name(), gc.Equals, "net1")
-	c.Assert(s.network.ProviderId(), gc.Equals, "net1")
+	c.Assert(string(s.network.ProviderId()), gc.Equals, "net1")
 	c.Assert(s.network.Tag(), gc.Equals, "network-net1")
 	c.Assert(s.network.CIDR(), gc.Equals, "0.1.2.3/24")
 	c.Assert(s.network.VLANTag(), gc.Equals, 0)
@@ -46,9 +46,19 @@
 	c.Assert(err, gc.IsNil)
 	c.Assert(ifaces, gc.HasLen, 0)
 
-	iface0, err := s.machine.AddNetworkInterface("aa:bb:cc:dd:ee:f0", "eth0", "net1")
+	iface0, err := s.machine.AddNetworkInterface(state.NetworkInterfaceInfo{
+		MACAddress:    "aa:bb:cc:dd:ee:f0",
+		InterfaceName: "eth0",
+		NetworkName:   "net1",
+		IsVirtual:     false,
+	})
 	c.Assert(err, gc.IsNil)
-	iface1, err := s.machine.AddNetworkInterface("aa:bb:cc:dd:ee:f1", "eth1", "net1")
+	iface1, err := s.machine.AddNetworkInterface(state.NetworkInterfaceInfo{
+		MACAddress:    "aa:bb:cc:dd:ee:f1",
+		InterfaceName: "eth1",
+		NetworkName:   "net1",
+		IsVirtual:     false,
+	})
 	c.Assert(err, gc.IsNil)
 
 	ifaces, err = s.network.Interfaces()

=== modified file 'state/open.go'
--- state/open.go	2014-04-17 17:30:48 +0000
+++ state/open.go	2014-04-18 16:46:53 +0000
@@ -209,6 +209,7 @@
 	{"users", []string{"name"}, false},
 	{"networks", []string{"providerid"}, true},
 	{"networkinterfaces", []string{"interfacename", "machineid"}, true},
+	{"networkinterfaces", []string{"macaddress", "networkname"}, true},
 	{"networkinterfaces", []string{"networkname"}, false},
 	{"networkinterfaces", []string{"machineid"}, false},
 }

=== modified file 'state/state.go'
--- state/state.go	2014-04-17 16:18:46 +0000
+++ state/state.go	2014-04-18 16:46:53 +0000
@@ -1014,47 +1014,41 @@
 	return svc, nil
 }
 
-// AddNetwork creates a new network with the given name,
-// provider-specific id, CIDR and VLAN tag. If a network with the same
-// name or provider id already exists in state, an error satisfying
-// errors.IsAlreadyExists is returned.
-func (st *State) AddNetwork(name, providerId, cidr string, vlanTag int) (n *Network, err error) {
-	defer errors.Contextf(&err, "cannot add network %q", name)
-	if cidr != "" {
-		_, _, err := net.ParseCIDR(cidr)
+// AddNetwork creates a new network with the given params. If a
+// network with the same name or provider id already exists in state,
+// an error satisfying errors.IsAlreadyExists is returned.
+func (st *State) AddNetwork(args NetworkInfo) (n *Network, err error) {
+	defer errors.Contextf(&err, "cannot add network %q", args.Name)
+	if args.CIDR != "" {
+		_, _, err := net.ParseCIDR(args.CIDR)
 		if err != nil {
 			return nil, err
 		}
 	}
-	if name == "" {
+	if args.Name == "" {
 		return nil, fmt.Errorf("name must be not empty")
 	}
-	if !names.IsNetwork(name) {
+	if !names.IsNetwork(args.Name) {
 		return nil, fmt.Errorf("invalid name")
 	}
-	if providerId == "" {
+	if args.ProviderId == "" {
 		return nil, fmt.Errorf("provider id must be not empty")
 	}
-	if vlanTag < 0 || vlanTag > 4094 {
-		return nil, fmt.Errorf("invalid VLAN tag %d: must be between 0 and 4094", vlanTag)
-	}
-	doc := &networkDoc{
-		Name:       name,
-		ProviderId: providerId,
-		CIDR:       cidr,
-		VLANTag:    vlanTag,
-	}
+	if args.VLANTag < 0 || args.VLANTag > 4094 {
+		return nil, fmt.Errorf("invalid VLAN tag %d: must be between 0 and 4094", args.VLANTag)
+	}
+	doc := newNetworkDoc(args)
 	ops := []txn.Op{{
 		C:      st.networks.Name,
-		Id:     name,
+		Id:     args.Name,
 		Assert: txn.DocMissing,
 		Insert: doc,
 	}}
 	err = st.runTransaction(ops)
 	switch err {
 	case txn.ErrAborted:
-		if _, err = st.Network(name); err == nil {
-			return nil, errors.AlreadyExistsf("network %q", name)
+		if _, err = st.Network(args.Name); err == nil {
+			return nil, errors.AlreadyExistsf("network %q", args.Name)
 		} else if err != nil {
 			return nil, err
 		}
@@ -1065,8 +1059,8 @@
 		// logic does not report insertion errors, so we check that
 		// the record has actually been inserted correctly before
 		// reporting success.
-		if _, err = st.Network(name); err != nil {
-			return nil, errors.AlreadyExistsf("network with provider id %q", providerId)
+		if _, err = st.Network(args.Name); err != nil {
+			return nil, errors.AlreadyExistsf("network with provider id %q", args.ProviderId)
 		}
 		return newNetwork(st, doc), nil
 	}

=== modified file 'state/state_test.go'
--- state/state_test.go	2014-04-17 15:32:49 +0000
+++ state/state_test.go	2014-04-18 16:46:53 +0000
@@ -963,34 +963,31 @@
 }
 
 var addNetworkErrorsTests = []struct {
-	name       string
-	providerId string
-	cidr       string
-	vlanTag    int
-	expectErr  string
+	args      state.NetworkInfo
+	expectErr string
 }{{
-	"", "provider-id", "0.3.1.0/24", 0,
+	state.NetworkInfo{"", "provider-id", "0.3.1.0/24", 0},
 	`cannot add network "": name must be not empty`,
 }, {
-	"-invalid-", "provider-id", "0.3.1.0/24", 0,
+	state.NetworkInfo{"-invalid-", "provider-id", "0.3.1.0/24", 0},
 	`cannot add network "-invalid-": invalid name`,
 }, {
-	"net2", "", "0.3.1.0/24", 0,
+	state.NetworkInfo{"net2", "", "0.3.1.0/24", 0},
 	`cannot add network "net2": provider id must be not empty`,
 }, {
-	"net2", "provider-id", "invalid", 0,
+	state.NetworkInfo{"net2", "provider-id", "invalid", 0},
 	`cannot add network "net2": invalid CIDR address: invalid`,
 }, {
-	"net2", "provider-id", "0.3.1.0/24", -1,
+	state.NetworkInfo{"net2", "provider-id", "0.3.1.0/24", -1},
 	`cannot add network "net2": invalid VLAN tag -1: must be between 0 and 4094`,
 }, {
-	"net2", "provider-id", "0.3.1.0/24", 9999,
+	state.NetworkInfo{"net2", "provider-id", "0.3.1.0/24", 9999},
 	`cannot add network "net2": invalid VLAN tag 9999: must be between 0 and 4094`,
 }, {
-	"net1", "provider-id", "0.3.1.0/24", 0,
+	state.NetworkInfo{"net1", "provider-id", "0.3.1.0/24", 0},
 	`cannot add network "net1": network "net1" already exists`,
 }, {
-	"net2", "provider-net1", "0.3.1.0/24", 0,
+	state.NetworkInfo{"net2", "provider-net1", "0.3.1.0/24", 0},
 	`cannot add network "net2": network with provider id "provider-net1" already exists`,
 }}
 
@@ -1005,22 +1002,21 @@
 
 	net1, _ := addNetworkAndInterface(
 		c, s.State, machine,
-		"net1", "provider-net1", "0.1.2.0/24", 0,
+		"net1", "provider-net1", "0.1.2.0/24", 0, false,
 		"aa:bb:cc:dd:ee:f0", "eth0")
 
 	net, err := s.State.Network("net1")
 	c.Assert(err, gc.IsNil)
 	c.Assert(net, gc.DeepEquals, net1)
 	c.Assert(net.Name(), gc.Equals, "net1")
-	c.Assert(net.ProviderId(), gc.Equals, "provider-net1")
+	c.Assert(string(net.ProviderId()), gc.Equals, "provider-net1")
 	_, err = s.State.Network("missing")
 	c.Assert(err, jc.Satisfies, errors.IsNotFound)
 	c.Assert(err, gc.ErrorMatches, `network "missing" not found`)
 
 	for i, test := range addNetworkErrorsTests {
-		c.Logf("test %d: name=%q, providerId=%q, cidr=%q, vlanTag=%d",
-			i, test.name, test.providerId, test.cidr, test.vlanTag)
-		_, err := s.State.AddNetwork(test.name, test.providerId, test.cidr, test.vlanTag)
+		c.Logf("test %d: %#v", i, test.args)
+		_, err := s.State.AddNetwork(test.args)
 		c.Check(err, gc.ErrorMatches, test.expectErr)
 		if strings.Contains(test.expectErr, "already exists") {
 			c.Check(err, jc.Satisfies, errors.IsAlreadyExists)
@@ -2280,10 +2276,15 @@
 	rel, err := s.State.AddRelation(eps...)
 	c.Assert(err, gc.IsNil)
 	c.Assert(rel.String(), gc.Equals, "wordpress:db ser-vice2:server")
-	net1, err := s.State.AddNetwork("net1", "provider-id", "0.1.2.0/24", 0)
+	net1, err := s.State.AddNetwork(state.NetworkInfo{
+		Name:       "net1",
+		ProviderId: "provider-id",
+		CIDR:       "0.1.2.0/24",
+		VLANTag:    0,
+	})
 	c.Assert(err, gc.IsNil)
 	c.Assert(net1.Tag(), gc.Equals, "network-net1")
-	c.Assert(net1.ProviderId(), gc.Equals, "provider-id")
+	c.Assert(string(net1.ProviderId()), gc.Equals, "provider-id")
 
 	// environment tag is dynamically generated
 	env, err := s.State.Environment()
@@ -2375,7 +2376,12 @@
 	c.Assert(err, gc.IsNil)
 
 	// Parse a network name.
-	net1, err := s.State.AddNetwork("net1", "provider-id", "0.1.2.0/24", 0)
+	net1, err := s.State.AddNetwork(state.NetworkInfo{
+		Name:       "net1",
+		ProviderId: "provider-id",
+		CIDR:       "0.1.2.0/24",
+		VLANTag:    0,
+	})
 	c.Assert(err, gc.IsNil)
 	coll, id, err = state.ParseTag(s.State, net1.Tag())
 	c.Assert(coll, gc.Equals, "networks")

=== modified file 'worker/provisioner/kvm-broker.go'
--- worker/provisioner/kvm-broker.go	2014-04-08 03:37:14 +0000
+++ worker/provisioner/kvm-broker.go	2014-04-18 16:46:53 +0000
@@ -12,6 +12,7 @@
 	"launchpad.net/juju-core/container"
 	"launchpad.net/juju-core/container/kvm"
 	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/tools"
 )
@@ -54,7 +55,7 @@
 }
 
 // StartInstance is specified in the Broker interface.
-func (broker *kvmBroker) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (broker *kvmBroker) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 	if args.MachineConfig.HasNetworks() {
 		return nil, nil, nil, fmt.Errorf("starting kvm containers with networks is not supported yet.")
 	}

=== modified file 'worker/provisioner/lxc-broker.go'
--- worker/provisioner/lxc-broker.go	2014-04-08 03:37:14 +0000
+++ worker/provisioner/lxc-broker.go	2014-04-18 16:46:53 +0000
@@ -12,6 +12,7 @@
 	"launchpad.net/juju-core/container"
 	"launchpad.net/juju-core/container/lxc"
 	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/tools"
@@ -55,7 +56,7 @@
 }
 
 // StartInstance is specified in the Broker interface.
-func (broker *lxcBroker) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (broker *lxcBroker) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 	if args.MachineConfig.HasNetworks() {
 		return nil, nil, nil, fmt.Errorf("starting lxc containers with networks is not supported yet.")
 	}

=== modified file 'worker/provisioner/provisioner_task.go'
--- worker/provisioner/provisioner_task.go	2014-04-17 13:21:44 +0000
+++ worker/provisioner/provisioner_task.go	2014-04-18 16:46:53 +0000
@@ -11,6 +11,7 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
@@ -421,7 +422,7 @@
 	return nil
 }
 
-func (task *provisionerTask) prepareNetworkAndInterfaces(networkInfo []environs.NetworkInfo) (
+func (task *provisionerTask) prepareNetworkAndInterfaces(networkInfo []network.Info) (
 	networks []params.Network, ifaces []params.NetworkInterface) {
 	if len(networkInfo) == 0 {
 		return nil, nil
@@ -429,19 +430,20 @@
 	visitedNetworks := set.NewStrings()
 	for _, info := range networkInfo {
 		networkTag := names.NetworkTag(info.NetworkName)
-		if !visitedNetworks.Contains(info.NetworkId) {
+		if !visitedNetworks.Contains(networkTag) {
 			networks = append(networks, params.Network{
 				Tag:        networkTag,
-				ProviderId: info.NetworkId,
+				ProviderId: info.ProviderId,
 				CIDR:       info.CIDR,
 				VLANTag:    info.VLANTag,
 			})
-			visitedNetworks.Add(info.NetworkId)
+			visitedNetworks.Add(networkTag)
 		}
 		ifaces = append(ifaces, params.NetworkInterface{
 			InterfaceName: info.InterfaceName,
 			MACAddress:    info.MACAddress,
 			NetworkTag:    networkTag,
+			IsVirtual:     info.IsVirtual,
 		})
 	}
 	return networks, ifaces

=== modified file 'worker/provisioner/provisioner_test.go'
--- worker/provisioner/provisioner_test.go	2014-04-14 12:36:13 +0000
+++ worker/provisioner/provisioner_test.go	2014-04-18 16:46:53 +0000
@@ -14,6 +14,7 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/errors"
@@ -165,7 +166,7 @@
 	return s.checkStartInstanceCustom(c, m, "pork", s.defaultConstraints, nil, nil, nil, true)
 }
 
-func (s *CommonProvisionerSuite) checkStartInstanceCustom(c *gc.C, m *state.Machine, secret string, cons constraints.Value, includeNetworks, excludeNetworks []string, networkInfo []environs.NetworkInfo, waitInstanceId bool) (inst instance.Instance) {
+func (s *CommonProvisionerSuite) checkStartInstanceCustom(c *gc.C, m *state.Machine, secret string, cons constraints.Value, includeNetworks, excludeNetworks []string, networkInfo []network.Info, waitInstanceId bool) (inst instance.Instance) {
 	s.BackingState.StartSync()
 	for {
 		select {
@@ -473,20 +474,22 @@
 	// Add and provision a machine with networks specified.
 	includeNetworks := []string{"net1", "net2"}
 	excludeNetworks := []string{"net3", "net4"}
-	expectNetworkInfo := []environs.NetworkInfo{{
+	expectNetworkInfo := []network.Info{{
 		MACAddress:    "aa:bb:cc:dd:ee:f0",
 		InterfaceName: "eth0",
-		NetworkId:     "net1",
+		ProviderId:    "net1",
 		NetworkName:   "net1",
 		VLANTag:       0,
 		CIDR:          "0.1.2.0/24",
+		IsVirtual:     false,
 	}, {
 		MACAddress:    "aa:bb:cc:dd:ee:f1",
 		InterfaceName: "eth1",
-		NetworkId:     "net2",
+		ProviderId:    "net2",
 		NetworkName:   "net2",
 		VLANTag:       1,
 		CIDR:          "0.2.2.0/24",
+		IsVirtual:     true,
 	}}
 	m, err := s.addMachineWithRequestedNetworks(includeNetworks, excludeNetworks)
 	c.Assert(err, gc.IsNil)
@@ -519,9 +522,9 @@
 	// Add and provision a machine with networks specified.
 	includeNetworks := []string{"bad-net1"}
 	// "bad-" prefix for networks causes dummy provider to report
-	// invalid NetworkInfo.
-	expectNetworkInfo := []environs.NetworkInfo{
-		{NetworkId: "bad-net1", NetworkName: "bad-net1", CIDR: "invalid"},
+	// invalid network.Info.
+	expectNetworkInfo := []network.Info{
+		{ProviderId: "bad-net1", NetworkName: "bad-net1", CIDR: "invalid"},
 	}
 	m, err := s.addMachineWithRequestedNetworks(includeNetworks, nil)
 	c.Assert(err, gc.IsNil)
@@ -924,7 +927,7 @@
 	retryCount map[string]int
 }
 
-func (b *mockBroker) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []environs.NetworkInfo, error) {
+func (b *mockBroker) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 	// All machines except machines 3, 4 are provisioned successfully the first time.
 	// Machines 3 is provisioned after some attempts have been made.
 	// Machine 4 is never provisioned.