← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/gopkg.in/goose.v1/testservices/identityservice/keypair.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gopkg.in/goose.v1/testservices/identityservice/keypair.go
24
24
type KeyPair struct {
25
25
        hook.TestService
26
26
        Users
27
 
        services []Service
 
27
        services []V2Service
28
28
}
29
29
 
30
30
func NewKeyPair() *KeyPair {
37
37
}
38
38
 
39
39
func (u *KeyPair) RegisterServiceProvider(name, serviceType string, serviceProvider ServiceProvider) {
40
 
        service := Service{name, serviceType, serviceProvider.Endpoints()}
41
 
        u.AddService(service)
 
40
        service := V2Service{name, serviceType, serviceProvider.Endpoints()}
 
41
        u.AddService(Service{V2: service})
42
42
}
43
43
 
44
44
func (u *KeyPair) AddService(service Service) {
45
 
        u.services = append(u.services, service)
 
45
        u.services = append(u.services, service.V2)
46
46
}
47
47
 
48
48
func (u *KeyPair) ReturnFailure(w http.ResponseWriter, status int, message string) {