diff options
| author | vladimir.p <vladimir@zadarastorage.com> | 2011-08-09 16:55:51 -0700 |
|---|---|---|
| committer | vladimir.p <vladimir@zadarastorage.com> | 2011-08-09 16:55:51 -0700 |
| commit | bd39829cc1908cb5ead899c9659a5c516b073a4f (patch) | |
| tree | 6301cef864635b6f5e6e45e6d464ba42240e72fc /nova/api | |
| parent | 48d9436ecde7d65699897f158247981fcbb65c72 (diff) | |
| download | nova-bd39829cc1908cb5ead899c9659a5c516b073a4f.tar.gz nova-bd39829cc1908cb5ead899c9659a5c516b073a4f.tar.xz nova-bd39829cc1908cb5ead899c9659a5c516b073a4f.zip | |
merge with nova-1411. fixed
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/contrib/floating_ips.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 9094f6b56..ac0ff713b 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1149,7 +1149,7 @@ class CloudController(object): return {'driveTypeSet': [dict(drive) for drive in drives]} @staticmethod - def _convert_to_set(self, lst, label): + def _convert_to_set(lst, label): if lst is None or lst == []: return None if not isinstance(lst, list): diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py index 52c9c6cf9..2aba1068a 100644 --- a/nova/api/openstack/contrib/floating_ips.py +++ b/nova/api/openstack/contrib/floating_ips.py @@ -102,7 +102,7 @@ class FloatingIPController(object): def delete(self, req, id): context = req.environ['nova.context'] ip = self.network_api.get_floating_ip(context, id) - + if 'fixed_ip' in ip: try: self.disassociate(req, id, '') |