← Back to branch summary

~stub/juju-relinfo/trunk

« back to all changes in this revision

Viewing changes to juju_relinfo/__init__.py

  • Committer: Stuart Bishop
  • Date: 2014-09-03 14:08:05 UTC
  • Revision ID: stuart@stuartbishop.net-20140903140805-65lcgp9akd4mnn2s
A service might have no relations, part 2

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju_relinfo/__init__.py
100
100
        else:
101
101
            relnames = []
102
102
            relnames.extend(
103
 
                status['services'][service]['relations'].keys())
 
103
                status['services'][service].get('relations', {}).keys())
104
104
 
105
105
        for relname in relnames:
106
106
            if relname in status['services'][service]['relations']:
137
137
    else:
138
138
        relations = []
139
139
        for service in status['services']:
140
 
            relations.extend(status['services'][service]['relations'].keys())
 
140
            relations.extend(status['services'][service].get(
 
141
                'relations', {}).keys())
141
142
 
142
143
    relunits = {}
143
144
    relfound = set()
153
154
            relids = []
154
155
            if ':' in relation and relation[-1] != ':':
155
156
                relname = relation.split(':', 1)[0]
156
 
                if relname in status['services'][service]['relations']:
 
157
                if relname in status['services'][service].get('relations', {}):
157
158
                    relids = [relation]
158
159
            else:
159
160
                relname = relation
160
 
                if relname in status['services'][service]['relations']:
 
161
                if relname in status['services'][service].get('relations', {}):
161
162
                    relids = get_relation_ids(unit, relname)
162
163
            for relid in relids:
163
164
                if relid in relunits: