Merge lp:~stevenwilkin/snapweb/fetch-services-from-snapd-api into lp:~snappy-dev/snapweb/trunk

[Steven Wilkin]

Fetch services from snapd API

Fetch services from snapd API. Re-proposed to take into consideration a now-merged prerequisite branch.

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'snappy/common_test.go'
--- snappy/common_test.go	2016-01-27 14:16:35 +0000
+++ snappy/common_test.go	2016-01-27 18:32:39 +0000
@@ -18,6 +18,7 @@
 package snappy
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/ubuntu-core/snappy/client"
@@ -40,11 +41,6 @@
 	snapType    snap.Type
 }
 
-type fakeSnappyPartServices struct {
-	fakeSnappyPart
-	serviceYamls []snappy.ServiceYaml
-}
-
 func newDefaultFakePart() *fakeSnappyPart {
 	return &fakeSnappyPart{
 		name:        "camlistore",
@@ -66,31 +62,6 @@
 	}
 }
 
-func newParametrizedFake(name, version string, installed bool, snapType snap.Type) *fakeSnappyPart {
-	return &fakeSnappyPart{
-		name:      name,
-		version:   version,
-		installed: installed,
-		snapType:  snapType,
-	}
-}
-
-func newDefaultFakeServices() *fakeSnappyPartServices {
-	return &fakeSnappyPartServices{
-		fakeSnappyPart: fakeSnappyPart{
-			name:      "camlistore",
-			origin:    "sergiusens",
-			version:   "2.0",
-			installed: true,
-			snapType:  snap.TypeApp,
-		},
-	}
-}
-
-func (p fakeSnappyPartServices) ServiceYamls() []snappy.ServiceYaml {
-	return p.serviceYamls
-}
-
 func (p fakeSnappyPart) IsInstalled() bool {
 	return p.installed
 }
@@ -135,50 +106,6 @@
 	return p.description
 }
 
-func newFakeServicesNoExternalUI() []snappy.ServiceYaml {
-	services := make([]snappy.ServiceYaml, 0, 2)
-
-	internal1 := map[string]snappy.Port{"ui": snappy.Port{Port: "200/tcp"}}
-	external1 := map[string]snappy.Port{"web": snappy.Port{Port: "1024/tcp"}}
-	s1 := snappy.ServiceYaml{
-		Name: "s1",
-		Ports: &snappy.Ports{
-			Internal: internal1,
-			External: external1,
-		},
-	}
-	services = append(services, s1)
-
-	s2 := snappy.ServiceYaml{
-		Name: "s2",
-	}
-	services = append(services, s2)
-
-	return services
-}
-
-func newFakeServicesWithExternalUI() []snappy.ServiceYaml {
-	services := make([]snappy.ServiceYaml, 0, 2)
-
-	s1 := snappy.ServiceYaml{
-		Name: "s2",
-	}
-	services = append(services, s1)
-
-	internal2 := map[string]snappy.Port{"ui": snappy.Port{Port: "200/tcp"}}
-	external2 := map[string]snappy.Port{"ui": snappy.Port{Port: "1024/tcp"}}
-	s2 := snappy.ServiceYaml{
-		Name: "s1",
-		Ports: &snappy.Ports{
-			Internal: internal2,
-			External: external2,
-		},
-	}
-	services = append(services, s2)
-
-	return services
-}
-
 type fakeSnapdClient struct{}
 
 func (f *fakeSnapdClient) Icon(pkgID string) (*client.Icon, error) {
@@ -189,4 +116,60 @@
 	return icon, nil
 }
 
+func (f *fakeSnapdClient) Services(pkg string) (map[string]*client.Service, error) {
+	return nil, errors.New("the package has no services")
+}
+
 var _ snapdClient = (*fakeSnapdClient)(nil)
+
+type fakeSnapdClientServicesNoExternalUI struct {
+	fakeSnapdClient
+}
+
+func (f *fakeSnapdClientServicesNoExternalUI) Services(pkg string) (map[string]*client.Service, error) {
+	internal := map[string]client.ServicePort{"ui": client.ServicePort{Port: "200/tcp"}}
+	external := map[string]client.ServicePort{"web": client.ServicePort{Port: "1024/tcp"}}
+	s1 := &client.Service{
+		Spec: client.ServiceSpec{
+			Ports: client.ServicePorts{
+				Internal: internal,
+				External: external,
+			},
+		},
+	}
+
+	s2 := &client.Service{}
+
+	services := map[string]*client.Service{
+		"s1": s1,
+		"s2": s2,
+	}
+
+	return services, nil
+}
+
+type fakeSnapdClientServicesExternalUI struct {
+	fakeSnapdClient
+}
+
+func (f *fakeSnapdClientServicesExternalUI) Services(pkg string) (map[string]*client.Service, error) {
+	s1 := &client.Service{}
+
+	internal := map[string]client.ServicePort{"ui": client.ServicePort{Port: "200/tcp"}}
+	external := map[string]client.ServicePort{"ui": client.ServicePort{Port: "1024/tcp"}}
+	s2 := &client.Service{
+		Spec: client.ServiceSpec{
+			Ports: client.ServicePorts{
+				Internal: internal,
+				External: external,
+			},
+		},
+	}
+
+	services := map[string]*client.Service{
+		"s1": s1,
+		"s2": s2,
+	}
+
+	return services, nil
+}
 
=== modified file 'snappy/converge.go'
--- snappy/converge.go	2016-01-27 14:16:35 +0000
+++ snappy/converge.go	2016-01-27 18:32:39 +0000
@@ -25,6 +25,7 @@
 
 	"log"
 
+	"github.com/ubuntu-core/snappy/client"
 	"github.com/ubuntu-core/snappy/snap"
 	"github.com/ubuntu-core/snappy/snappy"
 	"launchpad.net/webdm/webprogress"
@@ -239,8 +240,8 @@
 	}
 
 	if hasPortInformation(snapQ) {
-		if snapInstalled, ok := snapQ.(snappy.ServiceYamler); ok {
-			snap.UIPort = uiAccess(snapInstalled.ServiceYamls())
+		if services, err := h.snapdClient.Services(snap.ID); err == nil {
+			snap.UIPort = uiAccess(services)
 		}
 	}
 
@@ -280,13 +281,13 @@
 	return snap
 }
 
-func uiAccess(services []snappy.ServiceYaml) uint64 {
+func uiAccess(services map[string]*client.Service) uint64 {
 	for i := range services {
-		if services[i].Ports == nil {
+		if services[i].Spec.Ports.External == nil {
 			continue
 		}
 
-		if ui, ok := services[i].Ports.External["ui"]; ok {
+		if ui, ok := services[i].Spec.Ports.External["ui"]; ok {
 			ui := strings.Split(ui.Port, "/")
 			if len(ui) == 2 {
 				port, err := strconv.ParseUint(ui[0], 0, 64)
 
=== modified file 'snappy/converge_test.go'
--- snappy/converge_test.go	2016-01-27 14:16:35 +0000
+++ snappy/converge_test.go	2016-01-27 18:32:39 +0000
@@ -52,8 +52,9 @@
 }
 
 func (s *PayloadSuite) TestPayloadWithServicesButNoUI(c *C) {
-	fakeSnap := newDefaultFakeServices()
-	fakeSnap.serviceYamls = newFakeServicesNoExternalUI()
+	s.h.setClient(&fakeSnapdClientServicesNoExternalUI{})
+
+	fakeSnap := newDefaultFakePart()
 	q := s.h.snapQueryToPayload(fakeSnap)
 
 	c.Assert(q.Name, Equals, fakeSnap.name)
@@ -64,8 +65,9 @@
 }
 
 func (s *PayloadSuite) TestPayloadWithServicesUI(c *C) {
-	fakeSnap := newDefaultFakeServices()
-	fakeSnap.serviceYamls = newFakeServicesWithExternalUI()
+	s.h.setClient(&fakeSnapdClientServicesExternalUI{})
+
+	fakeSnap := newDefaultFakePart()
 	q := s.h.snapQueryToPayload(fakeSnap)
 
 	c.Assert(q.Name, Equals, fakeSnap.name)
@@ -75,9 +77,10 @@
 	c.Assert(q.UIPort, Equals, uint64(1024))
 }
 
-func (s *PayloadSuite) TestPayloadTypeOem(c *C) {
-	fakeSnap := newDefaultFakeServices()
-	fakeSnap.serviceYamls = newFakeServicesWithExternalUI()
+func (s *PayloadSuite) TestPayloadTypeGadget(c *C) {
+	s.h.setClient(&fakeSnapdClientServicesExternalUI{})
+
+	fakeSnap := newDefaultFakePart()
 	fakeSnap.snapType = snap.TypeGadget
 
 	q := s.h.snapQueryToPayload(fakeSnap)
 
=== modified file 'snappy/snapd_client.go'
--- snappy/snapd_client.go	2016-01-27 14:16:35 +0000
+++ snappy/snapd_client.go	2016-01-27 18:32:39 +0000
@@ -23,4 +23,5 @@
 
 type snapdClient interface {
 	Icon(pkgID string) (*client.Icon, error)
+	Services(pkg string) (map[string]*client.Service, error)
 }