Revision bd40abfa snf-cyclades-app/synnefo/management/common.py
| b/snf-cyclades-app/synnefo/management/common.py | ||
|---|---|---|
| 33 | 33 |
|
| 34 | 34 |
from django.core.management import CommandError |
| 35 | 35 |
from synnefo.db.models import Backend, VirtualMachine, Network, Flavor |
| 36 |
from synnefo.api.util import get_image as backend_get_image |
|
| 37 |
from synnefo.api.faults import ItemNotFound, BadRequest, OverLimit |
|
| 38 | 36 |
|
| 37 |
from snf_django.lib.api import faults |
|
| 38 |
from synnefo.api.util import get_image as backend_get_image |
|
| 39 | 39 |
from synnefo.api.util import validate_network_params |
| 40 |
from synnefo.settings import (CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN, |
|
| 41 |
ASTAKOS_URL) |
|
| 42 | 40 |
from synnefo.logic.rapi import GanetiApiError, GanetiRapiClient |
| 43 | 41 |
from synnefo.logic.utils import (id_from_instance_name, |
| 44 | 42 |
id_from_network_name) |
| 45 |
from synnefo.lib import astakos |
|
| 46 | 43 |
|
| 47 | 44 |
import logging |
| 48 | 45 |
log = logging.getLogger(__name__) |
| ... | ... | |
| 63 | 60 |
|
| 64 | 61 |
try: |
| 65 | 62 |
validate_network_params(subnet, gateway) |
| 66 |
except (BadRequest, OverLimit) as e:
|
|
| 63 |
except (faults.BadRequest, faults.OverLimit) as e:
|
|
| 67 | 64 |
raise CommandError(e) |
| 68 | 65 |
|
| 69 | 66 |
return subnet, gateway, subnet6, gateway6 |
| ... | ... | |
| 85 | 82 |
if image_id: |
| 86 | 83 |
try: |
| 87 | 84 |
return backend_get_image(image_id, user_id) |
| 88 |
except ItemNotFound: |
|
| 85 |
except faults.ItemNotFound:
|
|
| 89 | 86 |
raise CommandError("Image with ID %s not found."
|
| 90 | 87 |
" Use snf-manage image-list to find" |
| 91 | 88 |
" out available image IDs." % image_id) |
Also available in: Unified diff