Rename ServiceRelation to RelatedService

state/service.go

 // launchpad.net/juju/state
 //
 // Copyright (c) 2011-2012 Canonical Ltd.
 
 package state
 
 import (
         "errors"
         "fmt"
         "launchpad.net/goyaml"
@@ skipping 202 matching lines @@
                 units = append(units, &Unit{
                         st:          s.st,
                         key:         key,
                         serviceName: s.name,
                         isPrincipal: tunit.isPrincipal(),
                 })
         }
         return units, nil
 }
 
-// Relations returns a ServiceRelation for every relation the service is in.
-func (s *Service) Relations() (serviceRelation []*ServiceRelation, err error) {
+// RelatedServices returns all services currently related to this service.
+func (s *Service) RelatedServices() (services []*RelatedService, err error) {
         defer errorContextf(&err, "can't get relations for service %q", s.name)
         t, err := readTopology(s.st.zk)
         if err != nil {
-                return nil, err
+                return
         }
         relations, err := t.RelationsForService(s.key)
         if err != nil {
-                return nil, err
+                return
         }
-        serviceRelations := []*ServiceRelation{}
         for key, relation := range relations {
                 rs := relation.Services[s.key]
-                serviceRelations = append(serviceRelations, &ServiceRelation{
+                services = append(services, &RelatedService{
                         st: s.st, serviceKey: s.key, relationKey: key,
-                        relationName: rs.Name, scope: relation.Scope, role: rs.Role,
+                        relationName: rs.Name, scope: relation.Scope,
+                        role: rs.Role.RelatedRole(),
                 })
         }
-        return serviceRelations, nil
+        return
 }
 
 // IsExposed returns whether this service is exposed.
 // The explicitly open ports (with open-port) for exposed
 // services may be accessed from machines outside of the
 // local deployment network. See SetExposed and ClearExposed.
 func (s *Service) IsExposed() (bool, error) {
         stat, err := s.st.zk.Exists(s.zkExposedPath())
         if err != nil {
                 return false, err
@@ skipping 40 matching lines @@
 // zkConfigPath returns the ZooKeeper path for the service configuration.
 func (s *Service) zkConfigPath() string {
         return s.zkPath() + "/config"
 }
 
 // zkExposedPath, if exists in ZooKeeper, indicates, that a
 // service is exposed.
 func (s *Service) zkExposedPath() string {
         return s.zkPath() + "/exposed"
 }