diff options
| author | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-12 02:15:09 -0500 |
|---|---|---|
| committer | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-12 02:15:09 -0500 |
| commit | c14425541a1e77eb2049b94060bc0c4cd1df578f (patch) | |
| tree | f6ebc35014d22385cf409c7a5d3b721478093d8c /nova/utils.py | |
| parent | f85eba86b04253612e2272b3eb6a9fd79fab6567 (diff) | |
| download | nova-c14425541a1e77eb2049b94060bc0c4cd1df578f.tar.gz nova-c14425541a1e77eb2049b94060bc0c4cd1df578f.tar.xz nova-c14425541a1e77eb2049b94060bc0c4cd1df578f.zip | |
changed exception class
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nova/utils.py b/nova/utils.py index afe7422d9..888ebfd81 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -219,10 +219,13 @@ def get_my_linklocal(interface): if address[0] is not None: return address[0] else: - return None - except RuntimeError as ex: - logging.warn(_("Couldn't get Link Local IP of %s :%s"), interface, ex) - return 'fe00::' + return 'fe00::' + except IndexError as ex: + logging.warn(_("Couldn't parse command from get Link Local IP of %s :%s"), interface, ex) + except ProcessExecutionError as ex: + logging.warn(_("Couldn't execute command to get Link Local IP of %s :%s"), interface, ex) + except: + return 'fe00::' def to_global_ipv6(prefix, mac): |