Revision bcd80cd9 snf-cyclades-app/synnefo/management/common.py
b/snf-cyclades-app/synnefo/management/common.py | ||
---|---|---|
35 | 35 |
from synnefo.db.models import Backend, VirtualMachine, Network, Flavor |
36 | 36 |
|
37 | 37 |
from snf_django.lib.api import faults |
38 |
from synnefo.api.util import get_image as backend_get_image |
|
39 |
from synnefo.api.util import validate_network_params |
|
38 |
from synnefo.api import util |
|
40 | 39 |
from synnefo.logic.rapi import GanetiApiError, GanetiRapiClient |
41 | 40 |
from synnefo.logic.utils import (id_from_instance_name, |
42 | 41 |
id_from_network_name) |
... | ... | |
59 | 58 |
gateway6 = options['gateway6'] |
60 | 59 |
|
61 | 60 |
try: |
62 |
validate_network_params(subnet, gateway) |
|
61 |
util.validate_network_params(subnet, gateway)
|
|
63 | 62 |
except (faults.BadRequest, faults.OverLimit) as e: |
64 | 63 |
raise CommandError(e) |
65 | 64 |
|
... | ... | |
81 | 80 |
def get_image(image_id, user_id): |
82 | 81 |
if image_id: |
83 | 82 |
try: |
84 |
return backend_get_image(image_id, user_id)
|
|
83 |
return util.get_image_dict(image_id, user_id)
|
|
85 | 84 |
except faults.ItemNotFound: |
86 | 85 |
raise CommandError("Image with ID %s not found." |
87 | 86 |
" Use snf-manage image-list to find" |
Also available in: Unified diff