Revision 493f5877 kamaki/clients/astakos/__init__.py

b/kamaki/clients/astakos/__init__.py
214 214

  
215 215
        :returns: (dict) {name:..., type:..., endpoints:[...]}
216 216

  
217
        :raises ClientError: (600) if service_type not in service catalog
217
        :raises AstakosClientError: if service_type not in service catalog
218 218
        """
219 219
        services = self.get_services(token)
220 220
        for service in services:
......
223 223
                    return service
224 224
            except KeyError:
225 225
                self.log.warning('Misformated service %s' % service)
226
        raise ClientError(
227
            'Service type "%s" not in service catalog' % service_type, 600)
226
        raise AstakosClientError(
227
            'Service type "%s" not in service catalog' % service_type)
228 228

  
229 229
    def get_service_endpoints(self, service_type, version=None, token=None):
230 230
        """
......
234 234

  
235 235
        :returns: (dict) {SNF:uiURL, adminURL, internalURL, publicURL, ...}
236 236

  
237
        :raises ClientError: (600) if service_type not in service catalog
238

  
239
        :raises ClientError: (601) if #matching endpoints != 1
237
        :raises AstakosClientError: if service_type not in service catalog, or
238
            if #matching endpoints != 1
240 239
        """
241 240
        service = self.get_service_details(service_type, token)
242 241
        matches = []
......
245 244
                    endpoint['versionId'].lower() == version.lower()):
246 245
                matches.append(endpoint)
247 246
        if len(matches) != 1:
248
            raise ClientError(
247
            raise AstakosClientError(
249 248
                '%s endpoints match type %s %s' % (
250 249
                    len(matches), service_type,
251 250
                    ('and versionId %s' % version) if version else ''),

Also available in: Unified diff