Revision 4a769fc0 snf-cyclades-app/synnefo/management/common.py
b/snf-cyclades-app/synnefo/management/common.py | ||
---|---|---|
151 | 151 |
def get_port(port_id, for_update=True): |
152 | 152 |
"""Get a port object by its ID.""" |
153 | 153 |
try: |
154 |
port_id = int(port_id) |
|
155 |
except (ValueError, TypeError): |
|
156 |
raise CommandError("Invalid port ID: %s" % port_id) |
|
157 |
|
|
158 |
try: |
|
154 | 159 |
ports = NetworkInterface.objects |
155 | 160 |
if for_update: |
156 | 161 |
ports.select_for_update() |
... | ... | |
194 | 199 |
|
195 | 200 |
def get_floating_ip_by_id(floating_ip_id, for_update=False): |
196 | 201 |
try: |
202 |
floating_ip_id = int(floating_ip_id) |
|
203 |
except (ValueError, TypeError): |
|
204 |
raise CommandError("Invalid floating-ip ID: %s" % floating_ip_id) |
|
205 |
|
|
206 |
try: |
|
197 | 207 |
objects = IPAddress.objects |
198 | 208 |
if for_update: |
199 | 209 |
objects = objects.select_for_update() |
200 | 210 |
return objects.get(floating_ip=True, id=floating_ip_id, deleted=False) |
201 | 211 |
except IPAddress.DoesNotExist: |
202 |
raise CommandError("Floating IP does not exist.")
|
|
212 |
raise CommandError("Floating IP %s does not exist." % floating_ip_id)
|
|
203 | 213 |
|
204 | 214 |
|
205 | 215 |
def check_backend_credentials(clustername, port, username, password): |
Also available in: Unified diff