Merge lp:~wallyworld/goose/simplestreams-endpoint into lp:goose

[Ian Booth]

Add product-streams endpoint to test service

The keystone catalog of the service double needs to have the product streams
endpoint included so that juju-core tests can use it.

https://codereview.appspot.com/9295043/

Add product-streams endpoint to test service

The keystone catalog of the service double needs to have the product streams
endpoint included so that juju-core tests can use it.

https://codereview.appspot.com/9295043/

[Ian Booth (wallyworld)]

Reviewers: mp+162918_code.launchpad.net,

Message:
Please take a look.

Description:
Add product-streams endpoint to test service

The keystone catalog of the service double needs to have the product
streams
endpoint included so that juju-core tests can use it.

https://code.launchpad.net/~wallyworld/goose/simplestreams-endpoint/+merge/162918

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M identity/local_test.go
   M testservices/openstackservice/openstack.go

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

Index: identity/local_test.go
=== modified file 'identity/local_test.go'
--- identity/local_test.go 2013-02-12 01:47:38 +0000
+++ identity/local_test.go 2013-05-08 02:25:45 +0000
@@ -6,6 +6,8 @@
   "launchpad.net/goose/testservices/openstackservice"
   "net/http"
   "net/http/httptest"
+ "net/url"
+ "strings"
  )

  func registerLocalTests() {
@@ -61,3 +63,13 @@
  }

  // Additional tests to be run against the service double only go here.
+
+func (s *localLiveSuite) TestProductStreamsEndpoint(c *C) {
+ err := s.client.Authenticate()
+ c.Assert(err, IsNil)
+ serviceURL, err := s.client.MakeServiceURL("product-streams", nil)
+ c.Assert(err, IsNil)
+ _, err = url.Parse(serviceURL)
+ c.Assert(err, IsNil)
+ c.Assert(strings.HasSuffix(serviceURL, "/imagemetadata"), Equals, true)
+}

Index: testservices/openstackservice/openstack.go
=== modified file 'testservices/openstackservice/openstack.go'
--- testservices/openstackservice/openstack.go 2013-02-08 02:23:27 +0000
+++ testservices/openstackservice/openstack.go 2013-05-08 02:26:12 +0000
@@ -1,6 +1,7 @@
  package openstackservice

  import (
+ "fmt"
   "launchpad.net/goose/identity"
   "launchpad.net/goose/testservices/identityservice"
   "launchpad.net/goose/testservices/novaservice"
@@ -31,6 +32,17 @@
   regionParts := strings.Split(cred.Region, ".")
   baseRegion := regionParts[len(regionParts)-1]
   openstack.Swift = swiftservice.New(cred.URL, "v1", userInfo.TenantId,
baseRegion, openstack.Identity)
+ // Create container and add image metadata endpoint so that
product-streams URLs are included
+ // in the keystone catalog.
+ err := openstack.Swift.AddContainer("imagemetadata")
+ if err != nil {
+ panic(fmt.Errorf("setting up image metadata container: %v", err))
+ }
+ url := openstack.Swift.Endpoints()[0].PublicURL
+ serviceDef := identityservice.Service{"simplestreams", "product-streams",
[]identityservice.Endpoint{
+ identityservice.Endpoint{PublicURL: url + "/imagemetadata", Region:
cred.Region},
+ }}
+ openstack.Identity.(*identityservice.UserPass).AddService(serviceDef)
   return &openstack
  }

[John A Meinel (jameinel)]

LGTM

https://codereview.appspot.com/9295043/

[lp:~wallyworld/goose/simplestreams-endpoint]

92. By Ian Booth on 2013-05-09

Merge trunk

=== modified file 'identity/local_test.go'
--- identity/local_test.go	2013-04-24 11:08:15 +0000
+++ identity/local_test.go	2013-05-09 15:26:23 +0000
@@ -6,6 +6,8 @@
 	"launchpad.net/goose/testservices/openstackservice"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
+	"strings"
 )
 
 func registerLocalTests() {
@@ -61,3 +63,13 @@
 }
 
 // Additional tests to be run against the service double only go here.
+
+func (s *localLiveSuite) TestProductStreamsEndpoint(c *C) {
+	err := s.client.Authenticate()
+	c.Assert(err, IsNil)
+	serviceURL, err := s.client.MakeServiceURL("product-streams", nil)
+	c.Assert(err, IsNil)
+	_, err = url.Parse(serviceURL)
+	c.Assert(err, IsNil)
+	c.Assert(strings.HasSuffix(serviceURL, "/imagemetadata"), Equals, true)
+}

=== modified file 'testservices/openstackservice/openstack.go'
--- testservices/openstackservice/openstack.go	2013-04-29 08:09:21 +0000
+++ testservices/openstackservice/openstack.go	2013-05-09 15:26:23 +0000
@@ -1,6 +1,7 @@
 package openstackservice
 
 import (
+	"fmt"
 	"launchpad.net/goose/identity"
 	"launchpad.net/goose/testservices/identityservice"
 	"launchpad.net/goose/testservices/novaservice"
@@ -38,6 +39,17 @@
 	regionParts := strings.Split(cred.Region, ".")
 	baseRegion := regionParts[len(regionParts)-1]
 	openstack.Swift = swiftservice.New(cred.URL, "v1", userInfo.TenantId, baseRegion, openstack.Identity)
+	// Create container and add image metadata endpoint so that product-streams URLs are included
+	// in the keystone catalog.
+	err := openstack.Swift.AddContainer("imagemetadata")
+	if err != nil {
+		panic(fmt.Errorf("setting up image metadata container: %v", err))
+	}
+	url := openstack.Swift.Endpoints()[0].PublicURL
+	serviceDef := identityservice.Service{"simplestreams", "product-streams", []identityservice.Endpoint{
+		identityservice.Endpoint{PublicURL: url + "/imagemetadata", Region: cred.Region},
+	}}
+	openstack.Identity.(*identityservice.UserPass).AddService(serviceDef)
 	return &openstack
 }