Wire up new simplestreams metadata for prod use

Wire up new simplestreams metadata for prod use

This branch migrates the ec2 and openstack providers to use the new simplestreams
metadata. As a side effect, refactoring is done to consolidate the test data used
for ec2 tests so that there is only one copy, rather than copies in local_test and
image_test.

https://code.launchpad.net/~wallyworld/juju-core/oxygen-image-metadata/+merge/163345

Requires: https://code.launchpad.net/~wallyworld/juju-core/simplestreams-multiple-indices/+merge/162919

(do not edit description out of merge proposal)

[wallyworld, 2013-05-10 17:27:18]

Please take a look.

[wallyworld, 2013-05-16 01:01:59]

Please take a look.

[wallyworld, 2013-05-17 02:13:08]

Please take a look.

[fwereade, 2013-05-17 08:44:51]

LGTM modulo early storage-filtering and a couple of comments.

https://codereview.appspot.com/9130044/diff/7001/environs/ec2/image.go
File environs/ec2/image.go (right):

https://codereview.appspot.com/9130044/diff/7001/environs/ec2/image.go#newcode30
environs/ec2/image.go:30: imageConstraint.Storage = &ebs
Please can we preserve the storage information and filter it later? There's an
open bug for "enable instance-storage" and I'd prefer to make a fix for that a
bit convenient.

https://codereview.appspot.com/9130044/diff/7001/environs/imagemetadata/simpl...
File environs/imagemetadata/simplestreams.go (left):

https://codereview.appspot.com/9130044/diff/7001/environs/imagemetadata/simpl...
environs/imagemetadata/simplestreams.go:44: version, err :=
seriesVersion(ic.Series)
I'm still not really convinced by this... I think that, honestly, product IDs
are useless for juju because they just introduce a failure path. We should suck
it up and use release names across the board... but that doesn't need to happen
in this CL.

https://codereview.appspot.com/9130044/diff/7001/environs/imagemetadata/simpl...
File environs/imagemetadata/simplestreams.go (right):

https://codereview.appspot.com/9130044/diff/7001/environs/imagemetadata/simpl...
environs/imagemetadata/simplestreams.go:315: func containsString(values
[]string, element string) bool {
How many of these do we have now, I wonder? :)

https://codereview.appspot.com/9130044/diff/7001/environs/imagemetadata/simpl...
environs/imagemetadata/simplestreams.go:469: func
findMatchingImages(matchingImages []*ImageMetadata, images
map[string]*ImageMetadata, ic *ImageConstraint) []*ImageMetadata {
maybe appendMatchingImages? just a thought

[wallyworld, 2013-05-22 00:31:32]

Please take a look.

https://codereview.appspot.com/9130044/diff/7001/environs/ec2/image.go
File environs/ec2/image.go (right):

https://codereview.appspot.com/9130044/diff/7001/environs/ec2/image.go#newcode30
environs/ec2/image.go:30: imageConstraint.Storage = &ebs
On 2013/05/17 08:44:52, fwereade wrote:
> Please can we preserve the storage information and filter it later? There's an
> open bug for "enable instance-storage" and I'd prefer to make a fix for that a
> bit convenient.

Done.

https://codereview.appspot.com/9130044/diff/7001/environs/imagemetadata/simpl...
File environs/imagemetadata/simplestreams.go (right):

https://codereview.appspot.com/9130044/diff/7001/environs/imagemetadata/simpl...
environs/imagemetadata/simplestreams.go:469: func
findMatchingImages(matchingImages []*ImageMetadata, images
map[string]*ImageMetadata, ic *ImageConstraint) []*ImageMetadata {
On 2013/05/17 08:44:52, fwereade wrote:
> maybe appendMatchingImages? just a thought

Done.

[jameinel, 2013-05-22 10:43:12]

LGTM

https://codereview.appspot.com/9130044/diff/14001/environs/ec2/image.go
File environs/ec2/image.go (right):

https://codereview.appspot.com/9130044/diff/14001/environs/ec2/image.go#newco...
environs/ec2/image.go:67: return spec, nil
I'm curious why you changed this, given it has identical semantics (I think). I
guess if FindInstanceSpec doesn't return nil for spec when there is an error it
is different.
Or maybe you just prefer the common idiom.

[wallyworld, 2013-05-22 10:54:45]

https://codereview.appspot.com/9130044/diff/14001/environs/ec2/image.go
File environs/ec2/image.go (right):

https://codereview.appspot.com/9130044/diff/14001/environs/ec2/image.go#newco...
environs/ec2/image.go:67: return spec, nil
On 2013/05/22 10:43:12, jameinel wrote:
> I'm curious why you changed this, given it has identical semantics (I think).
I
> guess if FindInstanceSpec doesn't return nil for spec when there is an error
it
> is different.
> Or maybe you just prefer the common idiom.

I think it is left over cruft from a few rounds of previous changes. I'll revert
it as I agree it is superfluous.

[wallyworld, 2013-05-22 23:49:50]

*** Submitted:

Wire up new simplestreams metadata for prod use

This branch migrates the ec2 and openstack providers to use the new
simplestreams
metadata. As a side effect, refactoring is done to consolidate the test data
used
for ec2 tests so that there is only one copy, rather than copies in local_test
and
image_test.

R=fwereade, jameinel
CC=
https://codereview.appspot.com/9130044