Revision 30d92d1e snf-astakos-app/astakos/im/endpoints/qh.py
| b/snf-astakos-app/astakos/im/endpoints/qh.py | ||
|---|---|---|
| 38 | 38 |
|
| 39 | 39 |
from django.utils.translation import ugettext as _ |
| 40 | 40 |
|
| 41 |
from astakos.im.settings import QUOTA_HOLDER_URL, LOGGING_LEVEL |
|
| 41 |
from astakos.im.settings import ( |
|
| 42 |
QUOTAHOLDER_URL, QUOTAHOLDER_TOKEN, LOGGING_LEVEL) |
|
| 42 | 43 |
|
| 43 |
if QUOTA_HOLDER_URL:
|
|
| 44 |
if QUOTAHOLDER_URL: |
|
| 44 | 45 |
from kamaki.clients.quotaholder import QuotaholderClient |
| 45 | 46 |
|
| 46 | 47 |
ENTITY_KEY = '1' |
| ... | ... | |
| 59 | 60 |
if not entities: |
| 60 | 61 |
return client, () |
| 61 | 62 |
|
| 62 |
if not QUOTA_HOLDER_URL:
|
|
| 63 |
if not QUOTAHOLDER_URL: |
|
| 63 | 64 |
return client, () |
| 64 | 65 |
|
| 65 |
c = client or QuotaholderClient(QUOTA_HOLDER_URL)
|
|
| 66 |
c = client or QuotaholderClient(QUOTAHOLDER_URL, token=QUOTAHOLDER_TOKEN)
|
|
| 66 | 67 |
func = c.__dict__.get(func_name) |
| 67 | 68 |
if not func: |
| 68 | 69 |
return c, () |
| ... | ... | |
| 285 | 286 |
m = 'charge type %s not supported' % charge_type |
| 286 | 287 |
raise ValueError(m) |
| 287 | 288 |
|
| 288 |
quotaholder = QuotaholderClient(QUOTA_HOLDER_URL)
|
|
| 289 |
quotaholder = QuotaholderClient(QUOTAHOLDER_URL, token=QUOTAHOLDER_TOKEN)
|
|
| 289 | 290 |
timeline = quotaholder.get_timeline( |
| 290 | 291 |
context={},
|
| 291 | 292 |
after=after, |
Also available in: Unified diff